9774 Commits

Author SHA1 Message Date
clauspeterhuebner
77813317f5
Merge branch 'master' into 1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol 2022-07-15 15:34:24 +02:00
elweyn
10fb7fc84a Merge branch '2051-list-all-confirmed-contribution' of https://github.com/gradido/gradido into 2051-list-all-confirmed-contribution 2022-07-15 14:49:05 +02:00
elweyn
5892f7b429 Remove OneToOne import from contribution entity. 2022-07-15 14:48:51 +02:00
Hannes Heine
d9a64293ca
Merge branch 'master' into 2051-list-all-confirmed-contribution 2022-07-15 14:35:27 +02:00
Alexander Friedland
a438c5c680
Merge branch 'master' into 2038-Community-contribution-site-and-form 2022-07-15 14:34:56 +02:00
elweyn
843993e340 Fix linting. 2022-07-15 14:34:47 +02:00
Moriz Wahl
d7eb65014a
Merge pull request #2059 from gradido/do-not-log-IntrospectionQuery
feat: Do not log IntrospectionQuery from Query Browser
2022-07-15 14:32:58 +02:00
elweyn
cada4eca19 Change OneToOne relation to OneToMany / ManyToOne. 2022-07-15 14:32:20 +02:00
elweyn
382211f3ca Adapt test so that we check findAllContributions. 2022-07-15 14:14:55 +02:00
elweyn
5f5c19e6ba Change find to much more efficient code. 2022-07-15 14:14:15 +02:00
elweyn
d066227043 Change the Contribution entity to join on user. 2022-07-15 14:13:33 +02:00
elweyn
1147f58f17 Merge remote-tracking branch 'origin/do-not-log-IntrospectionQuery' into 2051-list-all-confirmed-contribution 2022-07-15 13:48:04 +02:00
Moriz Wahl
07093c466d
Merge branch 'master' into do-not-log-IntrospectionQuery 2022-07-15 13:47:11 +02:00
elweyn
ed75dce369 Merge branch 'master' into 2051-list-all-confirmed-contribution 2022-07-15 13:46:46 +02:00
Moriz Wahl
175bc514be feat: Do not log IntrospectionQuery from Query Browser 2022-07-15 13:36:31 +02:00
Alexander Friedland
fb2673284e
Merge branch 'master' into 2038-Community-contribution-site-and-form 2022-07-15 11:43:24 +02:00
Hannes Heine
ceae3915f9
Merge pull request #2052 from gradido/2051-list-contribution-add-deleted
Feat: Add confirmedBy and confirmedAt for the contribution query.
2022-07-15 11:40:33 +02:00
Moriz Wahl
66f10df1d0 improve logic and date handling. use v-model for form 2022-07-15 11:23:03 +02:00
Moriz Wahl
9efb83b2af fix tests 2022-07-15 11:01:36 +02:00
ogerly
c170c48ac4 change for tests 2022-07-15 10:11:40 +02:00
Alexander Friedland
6d948cd3b1
Merge branch 'master' into 2051-list-contribution-add-deleted 2022-07-15 09:10:49 +02:00
Alexander Friedland
6ce1fb2082
Merge branch 'master' into 2038-Community-contribution-site-and-form 2022-07-15 09:06:01 +02:00
ogerly
4215f62311 change props and data.form for update contribution 2022-07-15 09:05:27 +02:00
ogerly
dfc20a3254 change code, to review from moriz 2022-07-15 09:05:27 +02:00
Alexander Friedland
8ad1e2920f
Update frontend/src/pages/Community.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-07-15 08:36:26 +02:00
Alexander Friedland
8b4f0499c8
Merge pull request #2048 from gradido/add-creations-to-user-webapp
Add open creations to webapp
2022-07-15 07:50:13 +02:00
Alexander Friedland
1bf8c289ef
Merge branch 'master' into add-creations-to-user-webapp 2022-07-15 07:40:08 +02:00
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