5567 Commits

Author SHA1 Message Date
Hannes Heine
07d4bcf258
Merge branch 'master' into 1145-refactor-admin-resolver-from-master 2021-12-14 08:06:30 +01:00
Hannes Heine
d2ba68de72
Merge branch 'master' into wrong_login_is_not_password_reset 2021-12-14 07:45:42 +01:00
Hannes Heine
eee0964158
Merge branch 'master' into 1165-refactor-admin-interface 2021-12-14 05:39:24 +01:00
Hannes Heine
1e62972a91
Merge pull request #1182 from gradido/fix-coin-creation-balanceDate-entry
state-balance balanceDate can't get the date of the last transaction
2021-12-13 17:14:03 +01:00
Hannes Heine
ae8636de09
Merge branch 'master' into fix-coin-creation-balanceDate-entry 2021-12-13 17:05:41 +01:00
Hannes Heine
7f7076a87c
Merge branch 'master' into wrong_login_is_not_password_reset 2021-12-13 17:04:54 +01:00
Hannes Heine
fcefa20d6c
Merge branch 'master' into 1165-refactor-admin-interface 2021-12-13 16:20:36 +01:00
elweyn
3d1df54c69 Adding test for successful confirm. 2021-12-13 16:19:39 +01:00
Moriz Wahl
136dc97af1
Merge pull request #1186 from gradido/frontend-refactor-and-tests
feat: Frontend Refactor and Tests
2021-12-13 16:17:10 +01:00
Moriz Wahl
abe8817696 feat: Catch No Cookies 2021-12-13 16:09:47 +01:00
Moriz Wahl
d2fb2e86e2 coverage frontend to 94% 2021-12-13 15:29:04 +01:00
elweyn
51333155c9 Needs to have another logic to remove item from list if remove or if confirmed was successful. 2021-12-13 13:19:00 +01:00
elweyn
67a9f2d0e0 Change the amount argument type to float for updatePendingCreation. 2021-12-13 13:17:04 +01:00
elweyn
4c9ebea6b6 Change the amount argument to float for creation of pending creation 2021-12-13 13:16:27 +01:00
elweyn
f787a7470f Moved reverse of the getPendingCreations to the AdminResolver instead to do it in the CreationConfirm page. 2021-12-13 12:33:36 +01:00
Moriz Wahl
041c5a7024 Test global directives 2021-12-13 12:29:26 +01:00
Moriz Wahl
c9581196da test admin and setVisible methods, test elopage links 2021-12-13 12:16:13 +01:00
elweyn
7341515dad Send to /thx/login not /reset/login so the user get's a message to check to validate his account. 2021-12-13 12:02:21 +01:00
Moriz Wahl
fa245d0b64 feat: Frontend Tests and Optimization 2021-12-13 11:52:20 +01:00
Hannes Heine
8d88e72246
Merge branch 'master' into 1078-GDD-Calculate-Decay-Tool-clear 2021-12-13 11:36:16 +01:00
Hannes Heine
54ecb92d6c
Merge branch 'master' into 1145-refactor-admin-resolver-from-master 2021-12-13 11:34:30 +01:00
Hannes Heine
f58225df4f
Merge branch 'master' into fix-coin-creation-balanceDate-entry 2021-12-13 11:27:46 +01:00
elweyn
fb001b8886 Change emplacement of receivedDate after possible errors so we don't create the object when we don't need it. 2021-12-13 11:26:30 +01:00
elweyn
284984c296 When creating coins we store the receivedDate at the start of the call and write this value in each date field. 2021-12-13 11:24:09 +01:00
elweyn
a0f6ec65d8 Merge master resolve merge conflict. 2021-12-13 11:19:06 +01:00
Moriz Wahl
7b8426593e Test redirect when no password is present 2021-12-13 10:38:05 +01:00
Moriz Wahl
052a031aaa Merge branch 'master' into wrong_login_is_not_password_reset 2021-12-13 10:24:15 +01:00
Moriz Wahl
64109b2903
Merge pull request #1167 from gradido/database-without-nodemon
fix: No Nodemon in Database Scripts
2021-12-13 10:22:12 +01:00
Alexander Friedland
236df67746
Merge branch 'master' into Error-handling-in-GddTransactionList 2021-12-13 10:14:07 +01:00
Moriz Wahl
ef4b13ff37 Merge branch 'master' into database-without-nodemon 2021-12-13 10:12:52 +01:00
Moriz Wahl
6f1d99c7a3
Merge pull request #1172 from gradido/test-admin-creation
feat: Test Creation in Admin Interface
2021-12-13 10:12:17 +01:00
Moriz Wahl
92b481b4e0 Merge branch 'test-admin-creation' of github.com:gradido/gradido into test-admin-creation 2021-12-13 10:03:15 +01:00
Moriz Wahl
21247cecbd Merge branch 'master' into test-admin-creation 2021-12-13 10:02:54 +01:00
Moriz Wahl
4c3b10b893
Update admin/src/pages/Creation.spec.js
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2021-12-13 09:55:05 +01:00
Alexander Friedland
2e51781ac8
Merge pull request #1162 from gradido/533-Refactor-menu-remove-tim
533 refactor menu remove tim
2021-12-13 08:42:59 +01:00
Alexander Friedland
50effee00b
no async 2021-12-13 08:02:18 +01:00
Hannes Heine
7d62db39bb
Merge branch 'master' into 1078-GDD-Calculate-Decay-Tool-clear 2021-12-13 04:31:33 +01:00
Alexander Friedland
1180f28d21
Merge branch 'master' into 533-Refactor-menu-remove-tim 2021-12-12 11:06:59 +01:00
acb1aefd42
Merge pull request #1176 from gradido/database_docker_fixes
database_docker_fixes
2021-12-12 05:18:40 +01:00
3d0cdf5562
Merge branch 'master' into database_docker_fixes 2021-12-12 04:50:27 +01:00
Alexander Friedland
5370a969b5
Merge branch 'master' into 533-Refactor-menu-remove-tim 2021-12-11 23:38:36 +01:00
34521aaeb1
Merge pull request #1184 from gradido/naming_conventions_pending_tasks
naming_conventions_pending_tasks
2021-12-11 23:04:12 +01:00
Hannes Heine
610d9cf039
Merge branch 'master' into 1145-refactor-admin-resolver-from-master 2021-12-11 11:11:53 +01:00
ogerly
7bd952a14a remove shallowMount from Navbar.vue 2021-12-11 10:31:10 +01:00
ogerly
2cf7de2e4b test watch function for visible 2021-12-11 10:27:47 +01:00
ogerly
b7a1b2da69 sidebar change paddings for b-nav 2021-12-11 09:42:39 +01:00
ogerly
1dff467b10 Add style .bg-lightgrey in AccountOverview.vue 2021-12-11 09:38:32 +01:00
Hannes Heine
f58f61fd41
Merge branch 'master' into onboarding_process 2021-12-11 06:27:51 +01:00
Hannes Heine
1b9f432c71
Merge branch 'master' into test-admin-creation 2021-12-11 06:23:49 +01:00
Hannes Heine
1080c9d341
Merge branch 'master' into database_docker_fixes 2021-12-11 06:18:28 +01:00