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 |
|
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 |
|
ogerly
|
4dffa377cc
|
resolve merge conflict
|
2022-07-13 08:57:38 +02:00 |
|
ogerly
|
3162a1e6b6
|
change test for disable button
|
2022-07-13 08:55:11 +02:00 |
|
ogerly
|
c8234ea54e
|
add test for Community.vue
|
2022-07-13 08:55:11 +02:00 |
|
ogerly
|
8ddc6c5604
|
add test for ContributionList.vue
|
2022-07-13 08:55:11 +02:00 |
|
ogerly
|
f93351dcdd
|
add test for ContributionForm.vue
|
2022-07-13 08:55:11 +02:00 |
|
ogerly
|
5a4a713c25
|
change formular text
|
2022-07-13 08:55:11 +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 |
|
Wolfgang Huß
|
597394b0b3
|
Add 'docker-compose.apple-m1.override.yml'
|
2022-07-12 18:56:38 +02:00 |
|
Wolfgang Huß
|
741370fdbc
|
Remove 'image' entries in 'docker-compose.override.yml' and 'docker-compose.yml' files
|
2022-07-12 18:56:13 +02:00 |
|
Alexander Friedland
|
25cd43a789
|
Merge branch 'master' into 2038-Community-contribution-site-and-form
|
2022-07-12 17:15:31 +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 |
|