IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,568 Commits 1 Branch 0 Tags
Commit Graph

4568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ogerly
6e250cb63b Remove console.log. 2021-12-03 16:49:03 +01:00
ogerly
df393c4ea8 Fixe calculation of the new balance. 2021-12-03 16:46:14 +01:00
ogerly
0da5c3d2c8 Store the right amount in the database. 2021-12-03 16:27:01 +01:00
elweyn
9834e96d23 Merge branch 'master' into adminConfirmPendingCreation 2021-12-03 15:19:34 +01:00
elweyn
a07d34d827 Added a state_user_transaction row. withdrew / 10000 from frontend. 2021-12-03 14:25:00 +01:00
elweyn
7b3096a88b Change mutation id from int to float and changed the findOrFail parameter to simply id. 2021-12-03 12:41:24 +01:00
ogerly
a93792cab8 Mutation for confirmPendingCreation. 2021-12-02 10:55:39 +01:00
Alexander Friedland
1605cea902
Merge pull request #1147 from gradido/1137-PublisherId-as-input-field-on-register 
1137 publisher id as input field on register
 2021-12-02 10:31:21 +01:00
Alexander Friedland
e5d24fee35
Merge branch 'master' into 1137-PublisherId-as-input-field-on-register 2021-12-02 09:40:43 +01:00
Alexander Friedland
ed7c702d0e
Merge pull request #1135 from gradido/admin_pending_creation 
Admin pending creation
 2021-12-02 09:39:19 +01:00
ogerly
36d3850c3f yarn lint --fix 2021-12-02 09:20:38 +01:00
ogerly
fc799a78eb test von store commit publisherId, test store isAdmin 2021-12-02 09:19:35 +01:00
elweyn
2192863377 --author=ogerly <fridolin@tutanota.com> 
creation store prepared
 2021-12-02 09:06:54 +01:00
ogerly
e09121d854 Admin sends confirmPendingCreation to apollo. 2021-12-02 08:17:56 +01:00
elweyn
d8a6ac8638 Test the EditCreationFormular & add verifyLogin to it. 2021-12-02 07:53:44 +01:00
elweyn
a8919a0b08 Merge branch 'adminPendingCreationQueries' into adminEditPendingCreationQueries 2021-12-02 07:07:13 +01:00
elweyn
6e38477be8 Merge branch 'admin_pending_creation' into adminPendingCreationQueries 2021-12-02 07:06:54 +01:00
elweyn
4e1baeae2e Test the apollo query for verifyLogin so we get the moderator before an creation. 2021-12-02 07:06:38 +01:00
elweyn
2d2409b65d Added moderator query to the creationFormular so we can send the right moderator id. 2021-12-02 06:35:35 +01:00
elweyn
640109d8bf Merge moderator search from admin_pending_creation. 2021-12-02 06:32:00 +01:00
elweyn
1004718892 Added moderator query to the creationFormular so we can send the right moderator id. 2021-12-02 06:30:41 +01:00
ogerly
21b8110f57 jest test for input publisherId commit to store 2021-12-01 18:51:12 +01:00
ogerly
31adf5d6e2 jest test for input publisherId 2021-12-01 18:39:25 +01:00
ogerly
c7ab1ee271 remove all console logs 2021-12-01 17:55:03 +01:00
ogerly
09cdd00c82 Add Methods commitStore() for publisherId 2021-12-01 17:53:58 +01:00
ogerly
06983d786b remove all console logs 2021-12-01 16:54:57 +01:00
ogerly
0c5c59224b hand over and pass to be able to close editforms cleanly 2021-12-01 16:53:52 +01:00
Hannes Heine
4c2e51b517 Update pending creation 2021-12-01 15:43:22 +01:00
Alexander Friedland
2bb11230f6
Update frontend/src/views/Pages/Register.vue 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-12-01 15:34:19 +01:00
Alexander Friedland
6a4379f9cd
Update frontend/src/locales/de.json 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-12-01 15:34:08 +01:00
elweyn
1ba1c44219 Rename note to memo. 2021-12-01 09:43:23 +01:00
elweyn
8becfef6c3 Added submitObj to createPendignCreation mutation. 2021-12-01 09:37:56 +01:00
elweyn
83af3bc692 Merge last branch in this. 2021-12-01 09:33:26 +01:00
elweyn
da71446fc5 Merge admin_pending_creation and lowered the admin coverage. 2021-12-01 09:23:52 +01:00
elweyn
0e592fd353 Added some tests and reduce coverage since we removed comments. 2021-12-01 09:22:08 +01:00
elweyn
46bfae5bf5 Change update method from query to mutation. 2021-11-30 15:07:14 +01:00
elweyn
c71eccec0e Merge branch 'admin_pending_creation' into adminPendingCreationQueries 2021-11-30 14:59:13 +01:00
elweyn
daeb0ed32c Change create method from query to mutation. 2021-11-30 14:58:47 +01:00
ogerly
efb106f960 yarn lint --fix 2021-11-30 14:57:38 +01:00
ogerly
bc21f76848 Insert publishID from Store when set 2021-11-30 14:57:04 +01:00
ogerly
eece84d007 yarn locales --fix 2021-11-30 13:58:34 +01:00
ogerly
2de8684ca3 Add edit locales for german PublisherID for Herausgeber ID 2021-11-30 13:57:40 +01:00
ogerly
a1018b526d Add locales for PublisherID 2021-11-30 13:56:22 +01:00
ogerly
75ec2a6e8c Add PublisherID locales in DOM and english 2021-11-30 13:54:33 +01:00
ogerly
57e8be75a6 Add PublisherID locales in DOM and german 2021-11-30 13:52:57 +01:00
ogerly
5206e27a7a Add PublisherID input box per collaps 2021-11-30 13:44:42 +01:00
elweyn
2aabd646ac Merge branch 'adminDeletePendingCreationQuery' into adminEditPendingCreationQueries 2021-11-30 10:33:54 +01:00
elweyn
2c657db8f6 Merge branch 'adminPendingCreationQueries' into adminDeletePendingCreationQuery 2021-11-30 10:33:34 +01:00
elweyn
bd9ce97bc5 Merge branch 'admin_pending_creation' into adminPendingCreationQueries 2021-11-30 10:33:02 +01:00
elweyn
e47a95cd4b Change note to memo in database. 2021-11-30 10:31:43 +01:00