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
10,160 Commits 1 Branch 0 Tags
Commit Graph

10160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Friedland
8f742ce1d1
Merge branch 'master' into 2051-list-contribution-add-deleted 2022-07-15 07:37:37 +02:00
clauspeterhuebner
913ed6b1d9
Merge branch 'master' into 1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol 2022-07-15 00:54:44 +02:00
Claus-Peter Hübner
9af614d437 invert default setting of EVENT_PROTOCOL_ENABLED 2022-07-15 00:37:07 +02:00
Moriz Wahl
46650133b5
Merge branch 'master' into docu-env-vars 2022-07-14 18:39:21 +02:00
elweyn
b86ddbf8b0 Fix linting. 2022-07-14 18:08:51 +02:00
elweyn
c242f97733 Change the test for listAllContributions to have every seed user and create all creations, add Test suite that checks if every seeded data arrives as well. 2022-07-14 17:52:31 +02:00
elweyn
34de4bb901 Merge conflict on contribution resolver test file 2022-07-14 17:42:49 +02:00
elweyn
22602c45b9 Merge master into this branch. 2022-07-14 17:40:58 +02:00
elweyn
3733bf5114 Change con.close to resetToken method. 2022-07-14 17:30:21 +02:00
elweyn
246edadc13 Test that authenticated user gets allContributions. 2022-07-14 17:22:22 +02:00
elweyn
ba90911aec Test that unauthenticated user can not query listAllContributions. 2022-07-14 16:57:57 +02:00
elweyn
ab77a798f5 Add query seed for listAllContributions. 2022-07-14 16:57:25 +02:00
elweyn
cbbe0ffad2 Change the method name from listAllConfirmedContributions to listAllContributions. 2022-07-14 16:45:19 +02:00
elweyn
fdea5f68ef Add confirmedBy and confirmedAt for the contribution query. 2022-07-14 16:43:20 +02:00
elweyn
8c6ec08e88 Gives a list of allCreations and calls the User one time in the creation. 2022-07-14 16:42:55 +02:00
mahula
703a9107c8
Merge pull request #2054 from gradido/session-timer 
Prevent session expiration modal from displaying negative seconds, when session is expired for more than 0 seconds
 2022-07-14 16:22:31 +02:00
ogerly
af0f434d01 add updateContribution 2022-07-14 15:22:38 +02:00
elweyn
c02f575780 Withdrew userid from contribution object. 2022-07-14 12:59:21 +02:00
elweyn
2f90bd9811 Withdrew User from Contribution object and replaced it with userId, firstName and lastName. 2022-07-14 12:58:01 +02:00
elweyn
7c698de325 Add constructor to ContributionListResult. 2022-07-14 12:25:45 +02:00
ogerly
84706e430b add slot ContributionListItem.vue, add verifyLogin, update store for creation 2022-07-14 11:50:17 +02:00
mahula
be22ac3da3
Merge branch 'master' into session-timer 2022-07-13 19:43:26 +02:00
Moriz Wahl
1a540ade02
Merge branch 'master' into docu-env-vars 2022-07-13 19:13:54 +02:00
mahula
90d90ca9bd fix linting 2022-07-13 19:04:38 +02:00
Claus-Peter Hübner
14619384a4 remove comments 2022-07-13 18:52:11 +02:00
clauspeterhuebner
c805f85f75
Merge branch 'master' into 1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol 2022-07-13 18:37:58 +02:00
Moriz Wahl
ff93ce3b29
Merge branch 'master' into statistics-resolver 2022-07-13 16:12:15 +02:00
mahula
2302da9054
Update frontend/src/components/SessionLogoutTimeout.vue 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-07-13 15:36:40 +02:00
mahula
1d1cc7e960
Update frontend/src/components/SessionLogoutTimeout.spec.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2022-07-13 15:36:15 +02:00
Hannes Heine
6cb4b376e7
Merge pull request #2032 from gradido/2000-contribution-update 
feat: mutation contribution update
 2022-07-13 15:11:14 +02:00
mahula
b2164e6d1d add unit test for this fix 2022-07-13 14:54:47 +02:00
mahula
ed10d7d1a0 set session timer to 0, if expiration is greater then 0 seconds 2022-07-13 14:54:17 +02:00
Hannes Heine
8d727f5e5c
Merge branch 'master' into 2000-contribution-update 2022-07-13 14:42:02 +02:00
Moriz Wahl
bdcbb196b7 update database version 2022-07-13 14:31:31 +02:00
Moriz Wahl
eb404cf8b3 add migrations to insert contributions to all transactions with type creation that do not have a contribution yet 2022-07-13 14:30:46 +02:00
elweyn
b7c2497839 Add new right LIST_ALL_CONFIRMED_CONTRIBUTIONS. 2022-07-13 12:18:47 +02:00
ogerly
c1d6a57e41 Merge branch '2051-list-contribution-add-deleted' into 2038-Community-contribution-site-and-form 2022-07-13 11:29:21 +02:00
ogerly
ffe8831d09 change listContributions query add confirmedBy and confirmedAt 2022-07-13 11:28:35 +02:00
elweyn
99c4e83670 Add deleted contribution to the list of contribution. 2022-07-13 11:26:18 +02:00
ogerly
a905ff8642 Merge branch '2051-list-contribution-add-deleted' into 2038-Community-contribution-site-and-form 2022-07-13 11:15:15 +02:00
ogerly
802a629d26 remove console statement 2022-07-13 11:12:33 +02:00
ogerly
b0df5996e0 change computed lastMonthObject 2022-07-13 11:06:29 +02:00
elweyn
9d9d1a78f1 Add confirmedBy and confirmedAt for the contribution query. 2022-07-13 11:01:44 +02:00
elweyn
e1d50cacb5 Fix linting. 2022-07-13 09:55:21 +02:00
ogerly
6dd11a961f resolve merge conflict for ContributionResolver.ts 2 2022-07-13 09:04:14 +02:00
ogerly
910ba6bbdf moved from v-html to computed 2022-07-13 09:03:09 +02:00
ogerly
0ddd732da6 show open creation in contribution form 2022-07-13 09:03:09 +02:00
ogerly
e5e594c3a2 fix lint 2022-07-13 09:03:09 +02:00
ogerly
72d912dbdb add creation on login query and store 2022-07-13 09:03:09 +02:00
ogerly
ee886f42e5 resolve merge conflict for ContributionResolver.ts 2022-07-13 09:02:53 +02:00