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

12033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
ogerly
08a7919898 mobile hide elements if mobile 2022-12-07 12:51:54 +01:00
ogerly
08e2121c63 mobile hide components transactionlist contribution in fo and list 2022-12-07 12:41:46 +01:00
ogerly
eb68187339 show LastTransactions.vue only in desktop or large 2022-12-07 12:17:19 +01:00
ogerly
7c4932dba6 borderless in LastTransactions.vue 2022-12-07 12:14:45 +01:00
ogerly
2ec6f05def default show gdd and hide gdt 2022-12-07 11:44:33 +01:00
ogerly
21189582e4 locales asterisks *** >>> **** 2022-12-07 10:52:08 +01:00
ogerly
52e820a68d empty list groups hide in LastTransactions.vue 2022-12-07 10:48:42 +01:00
ogerly
4767b5f050 add props transactionLinkId 2022-12-07 10:43:02 +01:00
ogerly
3e3135a6c4 hideAmount icon eye for GDD and GDD 2022-12-07 10:39:46 +01:00
ogerly
a38cb71da5 hideAmount style for GDD and GDD 2022-12-07 10:32:44 +01:00
ogerly
7275518062 hideAmounts in store for GDD and GDD 2022-12-07 09:56:46 +01:00
ogerly
3aca7cdaf2 hide amount gdd and gdt 2022-12-07 09:38:07 +01:00
Alexander Friedland
193b66d32e
Merge branch 'master' into 2290-New-Design 2022-12-07 08:54:47 +01:00
mahula
cb66b51887 adapt unit test for community page to design changes 2022-12-07 05:46:29 +01:00
Claus-Peter Hübner
9d7891a077 Merge remote-tracking branch 'origin/master' into 2420-feature-federation-implement-exchange-of-api-versions-persist-in-table 2022-12-06 23:26:56 +01:00
Claus-Peter Hübner
e247439751 adapt static test-data, reorg control-flow for received data checkes 2022-12-06 23:26:11 +01:00
Claus-Peter Hübner
15e598cf00 check for valid federation config settings or exit 2022-12-06 23:23:32 +01:00
Claus-Peter Hübner
e3003cc6a0 ensure setting FEDERATION_COMMUNTIY_URL to null or with ending '/' 2022-12-06 23:22:23 +01:00
joseji
9604a6309a found more and more junk everywhere, almost cleared 2022-12-06 22:31:15 +01:00
ogerly
1a81bc53cb fix tests 2022-12-06 15:33:07 +01:00
ogerly
a8e8513ab2 Transaction GDT list style edited 2022-12-06 13:13:10 +01:00
ogerly
dfa794a90a Contributions list style edited 2022-12-06 13:09:14 +01:00
Hannes Heine
4794ca61c1
Merge pull request #2363 from gradido/2285-mark-creation-via-link 
feat(backend): 🍰 Mark creation via link
 2022-12-06 12:34:41 +01:00
elweyn
d52f7f9590 change transactionLinkId to linkId. 2022-12-06 12:20:21 +01:00