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

13977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulf Gebhardt
6a8e239ab0
merge 2023-03-29 15:06:26 +02:00
ogerly
5ca2a571f4 restore code 2023-03-29 14:26:27 +02:00
ogerly
5fded941b9 add watch tabIndex, when > currentPage = 1 2023-03-29 14:20:19 +02:00
ogerly
145a60bcdd yarn installAll 2023-03-29 14:12:28 +02:00
ogerly
73b2a55064 fix locales 2023-03-29 14:02:46 +02:00
Alexander Friedland
c2f3f58121
Merge branch 'master' into 2595-visualize-the-federation 2023-03-29 12:32:23 +02:00
Ulf Gebhardt
a1bcf7515a
removed more obsolete data 2023-03-29 11:22:50 +02:00
Ulf Gebhardt
f2d53dfea6
Merge branch 'master' into cleanup-database 2023-03-29 11:22:20 +02:00
Ulf Gebhardt
e6aa6a5c98
Merge branch 'master' into event-tests-for-transactionLinks 2023-03-29 11:18:11 +02:00
Ulf Gebhardt
afd5703c80
missing event tests 2023-03-29 11:06:47 +02:00
ogerly
bc4af26667 change sort, add lastAnnouncedAt and createdAt by DESC 2023-03-29 10:58:12 +02:00
ogerly
a1b8be4329 add visualize federation 2023-03-29 10:57:31 +02:00
Ulf Gebhardt
1b45941081
Merge pull request #2799 from gradido/events-unify-names 
refactor(backend): unify event names
 2023-03-29 10:56:53 +02:00
Ulf Gebhardt
e08c156acf
merge conflict solved 2023-03-29 09:47:51 +02:00
Ulf Gebhardt
1f0b07b708
Merge branch 'master' into events-unify-names 2023-03-29 09:47:40 +02:00
Ulf Gebhardt
5542989063
Merge pull request #2797 from gradido/events-user 
feat(backend): events for users
 2023-03-29 09:44:02 +02:00
mahula
e106f85086 fix locales sorting 2023-03-28 20:01:52 +02:00
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
mahula
c08b5387c5 fix user role change modal 2023-03-24 14:38:10 +01:00