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

14070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mahula
17f7e8adf0 use msgBoxConfirm for user deletion modal 2023-03-28 18:10:27 +02:00
mahula
44f57779b8 use msgBoxConfirm for user role change modal 2023-03-28 17:53:08 +02:00
Hannes Heine
572e7d5c80
Merge branch 'master' into align-workflow-naming-remove-remove-docker-filter-from-build-tests 2023-03-28 15:50:06 +02:00
Moriz Wahl
d7919ea10f changes requested 2023-03-28 13:32:47 +02:00
Moriz Wahl
ed8549bfb5 Merge branch 'master' into feat-send-coins-via-gradido-ID 2023-03-28 13:23:58 +02:00
Moriz Wahl
a4c82ae145 remove skipped tests as thay are depreciated 2023-03-28 13:06:37 +02:00
Moriz Wahl
a81b364fef fix admin create contribution 2023-03-28 12:57:34 +02:00
Ulf Gebhardt
3ae1ad7953
Merge branch 'master' into events-user 2023-03-28 12:02:10 +02:00
Moriz Wahl
f5f50e9353 Merge branch 'master' into 2803-open-contribution-edit-button 2023-03-28 11:52:01 +02:00
ogerly
47fe739c77 yarn installAll 2023-03-28 08:07:34 +02:00
Hannes Heine
1947cae206
Merge branch 'master' into 2825-add-download-link-to-qr-code 2023-03-28 02:29:47 +02:00
Hannes Heine
184de4672e
Merge pull request #2885 from gradido/2785-remove-email-from-subscribe-unsubscribe 
fix(backend): subscription get's email and languages from user
 2023-03-28 02:14:10 +02:00
Ulf Gebhardt
d0d9be2d28
Merge branch 'master' into events-user 2023-03-28 01:54:34 +02:00
Hannes Heine
3c9dca5b46
Update backend/src/graphql/resolver/KlicktippResolver.ts 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2023-03-28 01:49:27 +02:00
Hannes Heine
d6536f275f
Update backend/src/graphql/resolver/KlicktippResolver.ts 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2023-03-28 01:49:08 +02:00
Ulf Gebhardt
69a29f0a31
fix linting 2023-03-28 01:36:52 +02:00
Ulf Gebhardt
00a2ba2387
lint fixes 2023-03-28 01:08:30 +02:00
Ulf Gebhardt
c874fb6ca1
Merge branch 'master' into eslint-plugin-import-fixes 2023-03-28 01:08:16 +02:00
Hannes Heine
8a4aa5630b
Merge branch 'master' into 2785-remove-email-from-subscribe-unsubscribe 2023-03-28 00:56:55 +02:00
Ulf Gebhardt
2cf2a75df5
Merge pull request #2816 from gradido/eslint-plugin-jest-fixes 
refactor(backend): eslint-plugin-jest + fixes
 2023-03-28 00:51:27 +02:00
Ulf Gebhardt
eefdf5ae58
Merge branch 'master' into eslint-plugin-jest-fixes 2023-03-28 00:39:18 +02:00
Hannes Heine
07164e5c34
Merge pull request #2888 from gradido/fix-french-apostroph 
fix(frontend): fr change ` and ´ to '
 2023-03-28 00:35:27 +02:00
Ulf Gebhardt
f6071d6e07
fix linting 2023-03-28 00:25:14 +02:00
Ulf Gebhardt
caa0e5fe0f
Merge branch 'master' into events-user 2023-03-28 00:23:39 +02:00
Hannes Heine
b475b17e0b
Merge branch 'master' into fix-french-apostroph 2023-03-28 00:21:54 +02:00
Ulf Gebhardt
6e96f9ee7c
Merge pull request #2792 from gradido/events-transaction-link 
feat(backend): events for transaction links
 2023-03-28 00:20:55 +02:00
Ulf Gebhardt
4c4da6e929
fixed linting 2023-03-27 23:59:46 +02:00
mahula
ccf5156f98 remove block comments fron dht node and federation workflow files 2023-03-27 21:18:52 +02:00
mahula
d84b9872bd use docker-compose file filter unambiguous and only where necessary 
- change docker-compose file filter name
- use new file filter name in workflow files
- remove unnecessary docker-compose filtering from build test jobs
 2023-03-27 21:04:58 +02:00
mahula
2cacecdf97 align workflow file naming 2023-03-27 20:53:57 +02:00
mahula
5aaf9acd98 align workflow file naming 2023-03-27 20:18:13 +02:00
clauspeterhuebner
463a346175
Merge branch 'master' into 2874-feature-rules-and-blacklisting-for-alias 2023-03-24 19:47:05 +01:00
Claus-Peter Hübner
c299d5a7ff Merge branch '2882-feature-distingue-communities-and-communities_federation-in-database' of github.com:gradido/gradido into 2882-feature-distingue-communities-and-communities_federation-in-database 2023-03-24 17:28:31 +01:00
Claus-Peter Hübner
595503b970 divide the database migration in three steps 2023-03-24 17:26:13 +01:00
clauspeterhuebner
59c888bb43
Merge branch 'master' into 2882-feature-distingue-communities-and-communities_federation-in-database 2023-03-24 15:42:02 +01:00
mahula
c08b5387c5 fix user role change modal 2023-03-24 14:38:10 +01:00
elweyn
06a5cd678b Fix test 2023-03-24 13:36:25 +01:00
elweyn
5a960a6e27 Frontend mutation call remove language 2023-03-24 13:36:18 +01:00
elweyn
68064a9797 remove language from mutation definition 2023-03-24 13:35:43 +01:00
elweyn
1f13613049 remove language from mutation 2023-03-24 13:35:03 +01:00
Hannes Heine
2954c61892
Merge branch 'master' into 2785-remove-email-from-subscribe-unsubscribe 2023-03-24 12:41:16 +01:00
elweyn
e359fa59b3 Add mock for . 2023-03-24 12:39:09 +01:00
elweyn
0ae9b9e908 add download key to locales 2023-03-24 12:24:57 +01:00
elweyn
b3d935af4a feat(frontend): add link to download QR-Code 2023-03-24 12:23:32 +01:00
elweyn
a3e135969d fix(frontend): FR change ```` and ´ to '` 2023-03-24 12:08:47 +01:00
Ulf Gebhardt
980242012f
Merge branch 'master' into events-transaction-link 2023-03-24 12:02:39 +01:00
Ulf Gebhardt
d0564c231b
Merge pull request #2784 from gradido/events-contribution 
feat(backend): events for contributions
 2023-03-24 12:02:12 +01:00
Ulf Gebhardt
b23030e612
Merge branch 'master' into events-contribution 2023-03-24 11:50:15 +01:00
Ulf Gebhardt
90ec961592
Merge pull request #2783 from gradido/events-contribution-message 
feat(backend): events for contribution messages
 2023-03-24 11:45:50 +01:00
elweyn
79bede5e35 feat(backend): add fields to subscriber 2023-03-24 09:33:52 +01:00