5569 Commits

Author SHA1 Message Date
elweyn
6c5b4a3738 Merge adminPendingCreationQuery in here. 2021-11-30 10:19:31 +01:00
elweyn
4167bafdee Change note to memo. 2021-11-30 10:14:38 +01:00
elweyn
ea9bf54c16 Merge changes from last branch. 2021-11-30 10:13:42 +01:00
elweyn
3a5999ffe5 Change note to memo. 2021-11-30 10:11:28 +01:00
elweyn
ffed004b1a Merge branch 'admin_pending_creation' into adminPendingCreationQueries 2021-11-30 10:10:15 +01:00
Moriz Wahl
0b67da3d2c update README 2021-11-30 10:08:59 +01:00
elweyn
e2743b979e Change note to memo. 2021-11-30 10:08:12 +01:00
elweyn
fd54f34855 Remove comment in logout. 2021-11-30 09:55:27 +01:00
Hannes Heine
718763a884
Update admin/src/components/CreationFormular.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2021-11-30 09:42:09 +01:00
Hannes Heine
bdad4197a3
fix logo import
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2021-11-30 09:41:44 +01:00
elweyn
84be6ae369 Remove empty and unused file. 2021-11-30 09:35:33 +01:00
elweyn
bd5aebbfd5 Coverage upgraded to 53% in admin. 2021-11-30 09:30:37 +01:00
Moriz Wahl
cf3260b21e
Merge pull request #1121 from gradido/setup-seeding
feat: Setup Data Seeding
2021-11-30 09:29:15 +01:00
elweyn
da649868cc Removed the remove test that removes all creations, Test that the server sends error. 2021-11-30 09:28:59 +01:00
Moriz Wahl
6eedde23af recover reset to get CI running again 2021-11-30 09:18:57 +01:00
elweyn
5a3fb2bd80 Merge branch 'admin_pending_creation' into adminPendingCreationQueries 2021-11-30 08:52:17 +01:00
elweyn
1b48589933 Change backend coverage to 39. 2021-11-30 08:51:47 +01:00
Moriz Wahl
50e98bdc46 disbale create admin user 2021-11-30 08:51:40 +01:00
Moriz Wahl
0d2cf7da48 Merge branch 'master' into setup-seeding 2021-11-30 08:46:24 +01:00
elweyn
a2053a05c3 Merge branch 'adminDeletePendingCreationQuery' into adminEditPendingCreationQueries 2021-11-30 08:30:27 +01:00
elweyn
c0bcff73a2 Merge branch 'adminPendingCreationQueries' into adminDeletePendingCreationQuery 2021-11-30 08:29:57 +01:00
elweyn
65461130bb Merge branch 'admin_pending_creation' into adminPendingCreationQueries 2021-11-30 08:29:26 +01:00
Moriz Wahl
0c74fa2970 remove broken test 2021-11-29 21:57:10 +01:00
Moriz Wahl
dbdd25293b test new navbar elements, raise coverage to 52% 2021-11-29 21:47:49 +01:00
14704a7536
Merge branch 'master' into docu_release 2021-11-29 16:40:16 +01:00
a8a1f9cff4
Merge pull request #1139 from gradido/fix_admin_token_renewal
fix_admin_token_renewal
2021-11-29 16:38:50 +01:00
fa14d165e9
reduced coverage - this functionality is too existential not to merge and too complex to test at the given moment 2021-11-29 16:28:41 +01:00
1b8e132190
redirect to logout, since we have that page actually 2021-11-29 14:40:56 +01:00
Hannes Heine
5f7e502f05 Clean calculation of openCreation when updating an open creation 2021-11-29 14:39:24 +01:00
ogerly
f9113abc75 Selected radioButton automatically. 2021-11-29 12:08:53 +01:00
ogerly
5523b1a5e9 Adden selectedOpenCreationAmount to differenciate the used datas. 2021-11-29 12:07:33 +01:00
ogerly
e744d7c7e0 Added scripts to EditCreationFormular created query for updatePendingCreations. 2021-11-29 11:37:01 +01:00
ogerly
304395b6c8 Logic has been moved to EditCreationFormular. 2021-11-29 11:35:57 +01:00
ogerly
5c06ab256f Change format. 2021-11-29 11:35:26 +01:00
ogerly
e03637d3e4 Change format. 2021-11-29 11:34:50 +01:00
ogerly
7cf898f72c Add switch between creationFormular and updateCreationFormular in UserTable. 2021-11-29 10:06:56 +01:00
ogerly
d3c42e4a5d Add EditCreationFormular to differenciate Edit vue from Creation Vue. 2021-11-29 09:59:17 +01:00
ogerly
17a2feeb72 Edit updateRadioSelected so that we have two entry points massCreation or singleCreation. 2021-11-29 09:58:29 +01:00
ogerly
4c8c0678b1 radio buttion cecked bei edit from pending creation 2021-11-29 09:34:46 +01:00
ogerly
ac555f7835 Display of the form in the mass creation 2021-11-28 17:03:35 +01:00
ogerly
babb504824 edit pending creation, fill the form and extrapolate the range and the creation[index] 2021-11-28 17:02:43 +01:00
ogerly
7d7277d475 if creation is edited, insert text in form 2021-11-28 09:56:02 +01:00
ogerly
9f7eecc49d Unused points currently deleted 2021-11-27 11:18:21 +01:00
ogerly
392993b415 Logo version changed, replaced with white font 2021-11-27 11:06:45 +01:00
ogerly
33b001f056 Add gradido logo white writing version 2021-11-27 11:05:04 +01:00
Moriz Wahl
1a22520429 Merge branch 'setup-seeding' of github.com:gradido/gradido into setup-seeding 2021-11-26 20:11:29 +01:00
Moriz Wahl
556debe984 change yarn reset to yarn dev_reset in database up 2021-11-26 20:08:44 +01:00
Moriz Wahl
ff704bd9f4
Update database/src/factories/login-user-backup.factory.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2021-11-26 19:31:16 +01:00
Moriz Wahl
0f22a2fe1c remove run reset on production 2021-11-26 19:29:17 +01:00
ogerly
38da2dcdfd Remove hint text for test creations on CreationConfirm Table. 2021-11-26 18:09:10 +01:00