clauspeterhuebner
|
212952cf56
|
Update backend/.env.dist
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-07-18 19:30:25 +02:00 |
|
Claus-Peter Hübner
|
85a6b09635
|
Merge branch '1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol' of github.com:gradido/gradido into 1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol
|
2022-07-15 16:42:15 +02:00 |
|
Claus-Peter Hübner
|
5810235cec
|
add EVENT_PROTOCOL_ENABLED
|
2022-07-15 16:40:46 +02:00 |
|
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 |
|
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 |
|
Moriz Wahl
|
07093c466d
|
Merge branch 'master' into do-not-log-IntrospectionQuery
|
2022-07-15 13:47:11 +02:00 |
|
Moriz Wahl
|
175bc514be
|
feat: Do not log IntrospectionQuery from Query Browser
|
2022-07-15 13:36:31 +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 |
|
Alexander Friedland
|
6d948cd3b1
|
Merge branch 'master' into 2051-list-contribution-add-deleted
|
2022-07-15 09:10:49 +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 |
|
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 |
|
mahula
|
be22ac3da3
|
Merge branch 'master' into session-timer
|
2022-07-13 19:43:26 +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 |
|
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 |
|
elweyn
|
99c4e83670
|
Add deleted contribution to the list of contribution.
|
2022-07-13 11:26:18 +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 |
|
elweyn
|
801e223cfd
|
Implement that adminUpdateContribution is not allowed when moderator is null.
|
2022-07-13 08:27:05 +02:00 |
|
elweyn
|
c6bab99a2c
|
Add Test that adminUpdateContribution is not allowed on creation made by createContribution mutation.
|
2022-07-13 08:26:30 +02:00 |
|
Claus-Peter Hübner
|
63d84199b0
|
linting
|
2022-07-13 02:06:36 +02:00 |
|
Claus-Peter Hübner
|
1a2bb1a29a
|
add eventSendConfirmEmail during createUser()
|
2022-07-13 01:59:37 +02:00 |
|
Claus-Peter Hübner
|
f3eb73bf8d
|
Merge remote-tracking branch 'origin/master' into
1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol
|
2022-07-13 01:28:53 +02:00 |
|
ogerly
|
bc8078c427
|
fix lint
|
2022-07-12 16:55:50 +02:00 |
|
ogerly
|
3e471eb81e
|
add creation on login query and store
|
2022-07-12 16:54:37 +02:00 |
|
Moriz Wahl
|
0e1dc8c632
|
Merge pull request #2046 from gradido/add-creations-to-user
feat: Login Returns Open Creations for User
|
2022-07-12 16:19:41 +02:00 |
|
Moriz Wahl
|
2ceb29edde
|
Merge branch 'master' into add-creations-to-user
|
2022-07-12 15:53:16 +02:00 |
|
elweyn
|
32d79bb61c
|
Corrected the spelling errors and withdrew admin creation on update scenario.
|
2022-07-12 13:01:46 +02:00 |
|
Hannes Heine
|
90d2ffbff3
|
Update backend/src/graphql/resolver/ContributionResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-07-12 12:54:55 +02:00 |
|
Hannes Heine
|
0380609dee
|
Update backend/src/graphql/resolver/ContributionResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-07-12 12:54:46 +02:00 |
|
einhornimmond
|
3aa14baa6e
|
Merge pull request #2029 from gradido/archive_transform_valid_transactions
Migrate transaction to valid dataset for gradido node
|
2022-07-12 11:00:28 +02:00 |
|
einhornimmond
|
b50acc1a10
|
Merge branch 'master' into archive_transform_valid_transactions
|
2022-07-12 10:49:34 +02:00 |
|
Moriz Wahl
|
8a3c825371
|
feat: Login Returns Open Creations for User
|
2022-07-12 10:27:52 +02:00 |
|
elweyn
|
b991bb0467
|
Delete datas after all listContributions and updateContribution Tests.
|
2022-07-12 10:11:28 +02:00 |
|
elweyn
|
46206c4752
|
Handled the merge conflict so that we can continue to work.
|
2022-07-12 10:01:26 +02:00 |
|
Hannes Heine
|
f852c97995
|
Merge pull request #2031 from gradido/2000-contribution-list
feat: implement contribution list query
|
2022-07-12 09:55:19 +02:00 |
|
elweyn
|
c6ae5760c3
|
Test that the updateContribution mutation updates the contribution with the right values.
|
2022-07-12 09:55:03 +02:00 |
|
elweyn
|
9ee40767bb
|
Change test so that only the date is to old and the amount could be right.
|
2022-07-12 09:45:48 +02:00 |
|
elweyn
|
9e355f9202
|
Test that the updateContribution mutation can not update contribution to a date that is older than 3 month.
|
2022-07-12 09:43:47 +02:00 |
|
elweyn
|
6348756ab3
|
Test that the updateContribution mutation can not update more gdd's than allowed in the month.
|
2022-07-12 09:39:24 +02:00 |
|