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

12310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulf Gebhardt
330f85e04e
Merge branch 'master' into dissolve_admin_resolver 
# Conflicts:
#	backend/src/graphql/resolver/AdminResolver.ts
 2022-12-13 16:20:30 +01:00
Moriz Wahl
6e766fa76c
Merge pull request #2418 from gradido/test-validation-of-optin-codes 
fix(backend): email verification code never expired
 2022-12-13 16:17:03 +01:00
Moriz Wahl
02656ee117 fix tests after merge 2022-12-13 15:49:41 +01:00
Moriz Wahl
98742c0db1 Merge branch 'master' into test-validation-of-optin-codes 2022-12-13 14:57:15 +01:00
elweyn
ca01e34394 Get adminUser and find contribution with specific id. 2022-12-13 10:17:35 +01:00
Ulf Gebhardt
f2dadcd93d
Merge branch 'master' into consistent-transaction-table 2022-12-13 10:13:34 +01:00
elweyn
30c72bb734 Setup rejecctContribution method. 2022-12-13 10:10:42 +01:00
Ulf Gebhardt
cc8cabef69
Merge branch 'master' into semaphore 
# Conflicts:
#	backend/src/graphql/resolver/TransactionResolver.ts
 2022-12-13 10:05:20 +01:00
Alexander Friedland
dfca1e36c0
Merge branch 'master' into 2290-New-Design 2022-12-13 09:48:04 +01:00
Hannes Heine
4be546c68e
Merge branch 'master' into dissolve_admin_resolver 2022-12-13 09:01:44 +01:00
Moriz Wahl
907cd03ab8
Merge pull request #2451 from gradido/consistent-user-contacts-table 
fix(database): consistent deleted at bewteen users and user contacts
 2022-12-12 14:58:51 +01:00
Moriz Wahl
35c392bbae adopt unit tests to changes in factory 2022-12-12 14:38:56 +01:00
Moriz Wahl
06b5fa4295 refactor(backend): seed contributions as user 2022-12-12 14:05:15 +01:00
Moriz Wahl
04c88a743b
Merge branch 'master' into consistent-user-contacts-table 2022-12-12 13:50:40 +01:00
Moriz Wahl
82d92d9223 Merge branch 'consistent-user-contacts-table' into consistent-transaction-table 2022-12-12 12:46:46 +01:00
Moriz Wahl
61899579aa
Merge pull request #2454 from gradido/log-client-timezone-offset 
feat(backend): log client timezone offset
 2022-12-12 12:45:47 +01:00
Moriz Wahl
c449e41cfb update only by SQL, thanks @ulfgebhardt 2022-12-12 12:45:17 +01:00
Claus-Peter Hübner
5ada2478c5 Merge remote-tracking branch 'origin/master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints 2022-12-09 22:30:53 +01:00
Claus-Peter Hübner
ef5afd830c now working several instances parallel depending on env-Vars 2022-12-09 22:30:04 +01:00
Ulf Gebhardt
a82e1877a8
Merge branch 'master' into log-client-timezone-offset 2022-12-09 14:14:23 +01:00
Ulf Gebhardt
052f31d8ec
lint 2022-12-09 14:10:46 +01:00
Ulf Gebhardt
7638d29052
merge 2022-12-09 14:09:43 +01:00
Ulf Gebhardt
903fe56f60
Merge branch 'master' into dissolve_admin_resolver 
# Conflicts:
#	backend/src/graphql/resolver/AdminResolver.test.ts
#	backend/src/graphql/resolver/AdminResolver.ts
#	backend/src/graphql/resolver/TransactionResolver.ts
#	backend/src/graphql/resolver/UserResolver.ts
 2022-12-09 14:09:33 +01:00
Wolfgang Huß
70a3b1bc7e
Merge pull request #2398 from gradido/2392-refactor-more-emails-to-translatables 
refactor(backend): refactor more emails to translatables
 2022-12-09 13:12:55 +01:00
Ulf Gebhardt
486777cb35
Merge branch 'master' into 2392-refactor-more-emails-to-translatables 2022-12-09 12:59:59 +01:00
mahula
a6df9eceb9 fix linting 2022-12-09 11:52:35 +01:00
Claus-Peter Hübner
d3fa08bc48 first run is working with defaults, buggy per config settings 2022-12-09 01:24:45 +01:00
Moriz Wahl
effa58d767
Merge pull request #2444 from gradido/fix-delete-email-contact 
fix(backend): delete / undelete email contact as well
 2022-12-08 19:47:29 +01:00
Moriz Wahl
61ecfa22fd
Merge branch 'master' into log-client-timezone-offset 2022-12-08 19:13:26 +01:00
Moriz Wahl
c8fa84ac11
Merge branch 'master' into consistent-user-contacts-table 2022-12-08 19:12:49 +01:00
Moriz Wahl
3051d8f070
Merge branch 'master' into fix-delete-email-contact 2022-12-08 19:11:18 +01:00
Moriz Wahl
cbb688112f
Update backend/src/graphql/resolver/AdminResolver.test.ts 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2022-12-08 19:11:09 +01:00
Moriz Wahl
bd3f05d6c8
Update backend/src/graphql/resolver/AdminResolver.test.ts 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2022-12-08 19:11:01 +01:00
Moriz Wahl
7174bec2f3
Merge branch 'master' into test-validation-of-optin-codes 2022-12-08 19:10:21 +01:00
mahula
f7b4db3ee1 fix linting 2022-12-08 16:46:47 +01:00
mahula
8e4b16b2db adapt store unit tests to changes in new design 2022-12-08 16:34:03 +01:00
mahula
bbccafabd9 adapt store unit tests to changes in new design 2022-12-08 16:27:14 +01:00
mahula
31d883d1de adapt app unit tests to design changes 2022-12-08 14:14:18 +01:00
mahula
eb88644761 fix sidebar unit tests 2022-12-08 12:28:52 +01:00
mahula
0afd7fcd6a clean up dashboard layout unit tests file 2022-12-08 11:31:55 +01:00
mahula
c3e19758c3 adapt dashboard layout unit tests to design changes 2022-12-08 11:17:54 +01:00
Claus-Peter Hübner
8276312cce create federation module as separate Apollo instance with cli params 2022-12-08 02:14:22 +01:00
mahula
f6e2e827de fix stylelinting 2022-12-07 21:05:17 +01:00
mahula
a0d8908761 sort locales 2022-12-07 21:03:04 +01:00
mahula
27fb66c779 fix linting 2022-12-07 20:46:59 +01:00
mahula
cb4e88723f fix e2e test 2022-12-07 20:41:32 +01:00
mahula
383e946594 add missing unit tests to input amout component 2022-12-07 18:27:40 +01:00
ogerly
7c1f37d24c mobile menu navbar menu button z-index1000 2022-12-07 13:56:14 +01:00
ogerly
00c5a282cc mobile menu header username and mail 2022-12-07 13:35:49 +01:00
ogerly
deb4a26efa mobile menu admin and logout emit 2022-12-07 12:59:53 +01:00