12310 Commits

Author SHA1 Message Date
elweyn
191d86beee Add tests for decline button 2023-01-17 15:40:28 +01:00
ogerly
808eee7ae2 session extend , remove creation from query verifyLogin 2023-01-17 15:39:01 +01:00
elweyn
9438cefb04 Fix small merge error, and verifyLogin query. 2023-01-17 15:24:41 +01:00
elweyn
b8b6753677 Reviewed change requests. 2023-01-17 14:44:18 +01:00
Hannes Heine
576241f22d
Update admin/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-01-17 14:29:31 +01:00
mahula
e607d60962 adapt unit tests for creation confirmation page to changes 2023-01-17 14:20:39 +01:00
mahula
ca92123209 re-introduce cancel emit to open creations overlay 2023-01-17 14:19:57 +01:00
Moriz Wahl
7768710f27
Merge branch 'master' into statistics-with-field-resolvers 2023-01-17 14:15:08 +01:00
Moriz Wahl
a028222dc8
Merge branch 'master' into fix-semaphore-deadlock-on-error 2023-01-17 13:57:57 +01:00
Hannes Heine
bba5d4a193
Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-17 13:25:12 +01:00
ogerly
7829785799 resolve conflicts 2023-01-17 13:07:49 +01:00
Alexander Friedland
ba59364d9c
Merge branch 'master' into 2547-normalized-amount-transaction-is-processed-again 2023-01-17 12:57:04 +01:00
Alexander Friedland
b31f6f7a7a
Merge pull request #2552 from gradido/mobil-menu-transparent-bg-color
fix(frontend): mobile design
2023-01-17 12:53:46 +01:00
cd203ab2c2
removed if possible comment 2023-01-17 12:31:55 +01:00
Hannes Heine
149eddfb91
Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-17 12:31:12 +01:00
a3a69bc012
removed comment 2023-01-17 12:29:28 +01:00
elweyn
121130175c Add tests for OpenCreationsTable to have 100% coverage. 2023-01-17 12:27:40 +01:00
82fd6a9c5b
implement moriz requirements for test 2023-01-17 12:24:41 +01:00
ogerly
5dec52f508 add icon for deleted in crontibution list 2023-01-17 11:58:26 +01:00
Alexander Friedland
c623ff1294
Update frontend/src/components/Inputs/InputHour.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-01-17 11:42:08 +01:00
Alexander Friedland
81fee35064
Update frontend/src/components/Inputs/InputHour.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-01-17 11:41:58 +01:00
Alexander Friedland
7bcb3c915e
Update frontend/src/components/Inputs/InputHour.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-01-17 11:41:46 +01:00
ogerly
e062fc6288 fix lint 2023-01-17 11:33:53 +01:00
mahula
b52162320d fix unit tests for amout input component 2023-01-17 11:32:22 +01:00
ogerly
4f0a78022a fix tests 2023-01-17 11:10:06 +01:00
ogerly
07dc5cf5d4 test first example 2023-01-17 10:56:17 +01:00
ogerly
f4729e4984 navbar name add router link 2023-01-17 09:48:08 +01:00
Moriz Wahl
e39b829ad8 coverage to 92% 2023-01-17 09:37:24 +01:00
Moriz Wahl
044e10c972 feat(frontend): test transaction page 2023-01-17 09:36:46 +01:00
ogerly
3c86d523a8 mobil navbar set sheet image 2023-01-17 08:37:02 +01:00
ogerly
5203644283 mobil navbar fix and transparent 2023-01-17 07:36:34 +01:00
Alexander Friedland
5e61079e4b
Merge branch 'master' into 2547-normalized-amount-transaction-is-processed-again 2023-01-17 07:02:20 +01:00
9b773217be
Merge branch 'master' into fix-semaphore-deadlock-on-error 2023-01-17 01:07:00 +01:00
clauspeterhuebner
8af4d2fb91
Merge branch 'master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints 2023-01-16 22:23:26 +01:00
ogerly
8c033842fb placeholder in InputHoures.vue 2023-01-16 20:08:49 +01:00
Moriz Wahl
b66372bd90 change name of dynamic statitics fields 2023-01-16 19:42:01 +01:00
Moriz Wahl
1e66cda707 change name of dynamic statitics fields 2023-01-16 19:41:34 +01:00
ogerly
01093d026f current date custom in datepicker 2023-01-16 19:39:22 +01:00
ogerly
f3ae7a02e9 mobil navbar avatar and name displayed 2023-01-16 19:17:09 +01:00
3bf69814ca
test error cases for semaphore 2023-01-16 16:47:33 +01:00
ogerly
c0a889a5b3 fix stylelint and locales 2023-01-16 15:43:30 +01:00
ogerly
5c5ecc84e3 fix lint 2023-01-16 15:42:46 +01:00
Alexander Friedland
60ca3485c3
Merge branch 'master' into mobil-menu-transparent-bg-color 2023-01-16 15:37:28 +01:00
ogerly
067ed3652b settings header data style 2023-01-16 15:34:29 +01:00
Moriz Wahl
9f3c43426d clean up 2023-01-16 15:28:20 +01:00
Moriz Wahl
6b1497a988 statistics for field resolvers 2023-01-16 15:23:17 +01:00
Moriz Wahl
7781011b1a refactor(backend): field resolvers in statistics 2023-01-16 15:22:45 +01:00
ogerly
51d20d4d5b mobil navbar toggler no border 2023-01-16 15:03:09 +01:00
ogerly
fae97dd786 mobile starttext change style 2023-01-16 14:54:35 +01:00
ogerly
41f7dfe56f remove last month label, matching stands and button size 2023-01-16 14:24:02 +01:00