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

13760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
elweyn
d326f00c0b Fix linting 2023-03-31 07:28:52 +02:00
elweyn
0345e8420d Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-03-31 07:27:58 +02:00
elweyn
71266dcc2d Fix linting rules 2023-03-31 07:16:21 +02:00
elweyn
989a3e30f2 Import order fixed by lint 2023-03-31 07:16:04 +02:00
Moriz Wahl
042f13fce7
Merge pull request #2811 from gradido/2803-open-contribution-edit-button 
fix(admin): admin open contribution edit button
 2023-03-30 18:57:17 +02:00
Moriz Wahl
695d037a2d do not allow edit contribution for admin contributions in backend 2023-03-30 18:33:36 +02:00
Moriz Wahl
d3ac556885 Merge branch 'master' into 2803-open-contribution-edit-button 2023-03-30 18:26:02 +02:00
Moriz Wahl
6dff07a7ba Revert "do not allow user to edit admin contributions" 
This reverts commit 43e2f5fbc839921b5b0fe3deadc85c15baeb104f.
 2023-03-30 18:25:47 +02:00
Ulf Gebhardt
a43c58e5b7
Merge pull request #2911 from gradido/fix-import-order 
fix(backend): import order
 2023-03-30 18:18:13 +02:00
Ulf Gebhardt
7d7eb34aeb
fix order 2023-03-30 18:04:43 +02:00
Ulf Gebhardt
9407386de7
fix alphabetical sort 2023-03-30 17:57:15 +02:00
Ulf Gebhardt
80ff97e72a
more lint fixes 2023-03-30 17:39:09 +02:00
Ulf Gebhardt
b0c19eda47
fix import order 2023-03-30 17:28:03 +02:00
Ulf Gebhardt
36b7c74e5e
Merge pull request #2910 from gradido/federation-fix-env-template 
fix(other): use default values for undefined .env database values
 2023-03-30 16:56:38 +02:00
Moriz Wahl
769e36bea5 no Float in query 2023-03-30 16:55:00 +02:00
elweyn
c07582d5a1 Merge & linting 2023-03-30 16:44:17 +02:00
Ulf Gebhardt
cc98227de0
use default values for undefined .env database values 2023-03-30 16:40:56 +02:00
Moriz Wahl
43e2f5fbc8 do not allow user to edit admin contributions 2023-03-30 16:40:07 +02:00
Hannes Heine
b67baf665b
Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-03-30 16:37:03 +02:00
elweyn
8c3a847af6 Linting 2023-03-30 16:31:02 +02:00
elweyn
54e912f028 Add unit tests for KlicktippResolver 2023-03-30 16:30:44 +02:00
elweyn
e1c6764978 Remove unused queries 2023-03-30 16:30:11 +02:00
elweyn
ff7a73048c Correct mutations in testing 2023-03-30 16:29:35 +02:00
elweyn
04c6756ef4 Remove check on CONFIG.KLICKTIPP 2023-03-30 16:29:05 +02:00
elweyn
ada9f9a056 Remove not used function rights. 2023-03-30 16:28:38 +02:00
elweyn
b2f0bf37d2 Refactor klicktippcontroller to not call function 2023-03-30 16:28:18 +02:00
Moriz Wahl
64d896f973 do not allow user to edit admin contributions 2023-03-30 16:14:36 +02:00
Moriz Wahl
cdfcaefa84 show moderator id 2023-03-30 15:50:20 +02:00
Moriz Wahl
10022c2247 Merge branch 'master' into 2803-open-contribution-edit-button 2023-03-30 15:11:18 +02:00
Ulf Gebhardt
002dfe5a73
Merge pull request #2827 from gradido/eslint-plugin-import-fixes 
refactor(backend): eslint plugin import + fixes
 2023-03-30 14:20:32 +02:00
Ulf Gebhardt
5b451520d0
Merge branch 'master' into eslint-plugin-import-fixes 2023-03-30 14:06:21 +02:00
Ulf Gebhardt
fee1a49295
Merge pull request #2900 from gradido/event-tests-for-transactionLinks 
refactor(backend): missing event tests
 2023-03-30 10:13:54 +02:00
Ulf Gebhardt
90c9802ece
disable import/no-cycle 2023-03-29 15:10:30 +02:00
Ulf Gebhardt
6a8e239ab0
merge 2023-03-29 15:06:26 +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
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
Hannes Heine
8be1278770
Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-03-29 10:00:14 +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
Hannes Heine
cecfc346cc
Merge branch 'master' into 2785-add-events-for-subscribe-unsubscribe 2023-03-29 07:54:19 +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
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