220 Commits

Author SHA1 Message Date
49976b30b7
fix problems 2023-05-09 12:20:28 +02:00
Moriz Wahl
c42ee8d264
Merge branch 'master' into no-email-in-user 2023-05-08 08:55:18 +02:00
Claus-Peter Hübner
3fdeec0783 linting 2023-04-27 21:35:18 +02:00
Claus-Peter Hübner
7fb7ff9e8c rename communities to federated_communities 2023-04-20 02:28:29 +02:00
Moriz Wahl
311bb50eb8 refactor(backend): no email in user 2023-04-18 16:14:44 +02:00
elweyn
0bb00a3af4 fix(federation): correct exported of community url.' 2023-04-06 23:35:30 +02:00
657c171898
merge 2023-04-06 14:05:50 +02:00
Moriz Wahl
1fdd2e1014 get previuos transaction from database 2023-04-03 18:42:17 +02:00
Moriz Wahl
d578273589 correct calculation of previuos balance 2023-04-03 14:17:42 +02:00
Moriz Wahl
60ccdc5beb feat(backend): previuos balance in transaction 2023-04-03 12:54:11 +02:00
7a44a223e9
lint fixes 2023-03-31 12:51:51 +02:00
ae8405e8f6
merge 2023-03-31 12:48:09 +02:00
Moriz Wahl
d3ac556885 Merge branch 'master' into 2803-open-contribution-edit-button 2023-03-30 18:26:02 +02:00
9407386de7
fix alphabetical sort 2023-03-30 17:57:15 +02:00
80ff97e72a
more lint fixes 2023-03-30 17:39:09 +02:00
b0c19eda47
fix import order 2023-03-30 17:28:03 +02:00
Moriz Wahl
10022c2247 Merge branch 'master' into 2803-open-contribution-edit-button 2023-03-30 15:11:18 +02:00
c874fb6ca1
Merge branch 'master' into eslint-plugin-import-fixes 2023-03-28 01:08:16 +02:00
Moriz Wahl
2ac94e1b47 Merge branch 'master' into 2803-open-contribution-edit-button 2023-03-23 13:17:02 +01:00
Claus-Peter Hübner
fa76d3db2f Merge remote-tracking branch 'origin/master' into
2800-feature-backend-read-communities-data-from-database
2023-03-13 22:14:43 +01:00
c54e6fb8ae
new rules + fixes 2023-03-12 02:19:10 +01:00
721ccecd12
fixes 2023-03-12 02:19:10 +01:00
Moriz Wahl
21fede66ea Merge branch 'master' into 2803-open-contribution-edit-button 2023-03-10 15:08:56 +01:00
Moriz Wahl
ac2ce5e6b1 remove email from admin update contribution 2023-03-10 11:36:08 +01:00
elweyn
2146c98ee4 Add moderatorId for contribution object. 2023-03-09 20:42:07 +01:00
Claus-Peter Hübner
9a834fa720 implement getCommunities in CommunityResolver 2023-03-09 18:56:25 +01:00
18491cc380
timeUsed is a float 2023-03-09 14:37:25 +01:00
2783a6c62e
gdtSum is float 2023-03-09 14:37:25 +01:00
16914e3d98
gdt balance is a float 2023-03-09 14:37:25 +01:00
19adc53ed7
fix newly introduced errors 2023-03-09 14:37:25 +01:00
827c829306
fixes based on the unit tests 2023-03-09 14:37:25 +01:00
3391b3a9ee
merge 2023-03-09 14:37:17 +01:00
Moriz Wahl
f83c364d1d feat(admin): deleted contributions visible 2023-02-28 17:19:12 +01:00
21b6e35391
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-27 15:53:59 +01:00
Moriz Wahl
3cc5494736 refactor(backend): remove admin create contributions 2023-02-20 14:24:42 +01:00
66a5175dc1
combine logic for both listTransactionLinks and listTransactionLinksAdmin 2023-02-14 21:28:58 +01:00
Hannes Heine
c84fa68132
Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-19 07:50:22 +01:00
Moriz Wahl
b66372bd90 change name of dynamic statitics fields 2023-01-16 19:42:01 +01:00
Moriz Wahl
7781011b1a refactor(backend): field resolvers in statistics 2023-01-16 15:22:45 +01:00
elweyn
df4e2b419a Merge master in here. 2023-01-13 11:24:11 +01:00
Moriz Wahl
3a63e2721d remove creations from graphql user object 2023-01-11 22:32:50 +01:00
Moriz Wahl
dc33427cd0 add openCreation graphqlModel and resolver 2023-01-11 15:15:26 +01:00
elweyn
ea30fed068 Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-10 16:07:24 +01:00
elweyn
2010a1b059 Add hideAmountGDD and hideAmountGDT to the login mutations and the verifyLogin queries 2023-01-03 12:24:49 +01:00
elweyn
853bfabd57 Finish denie logic, add deniedAt IsNull() to queries. 2022-12-20 12:09:59 +01:00
elweyn
d52f7f9590 change transactionLinkId to linkId. 2022-12-06 12:20:21 +01:00
elweyn
46014adc6d Database join contribution to transaction table, add new join to query. 2022-12-01 12:07:25 +01:00
Hannes Heine
9bab013847
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction 2022-09-26 08:27:22 +02:00
elweyn
5aa499a073 Change the result for the FE so that we get datas from the contribution table instead of the transaction table. 2022-09-21 13:31:19 +02:00
Claus-Peter Hübner
3fcc62539a changes after merge from master 2022-09-16 15:14:51 +02:00