11934 Commits

Author SHA1 Message Date
elweyn
605812d777 Add error to confirmContribution mutation in case where contributionState is 'DENIED' 2023-01-13 11:15:14 +01:00
elweyn
2e9f8caa9d Add denied symbols in the frontend. 2023-01-13 11:08:18 +01:00
elweyn
70017c3115 Add state & messagesCount to the query listAllContributions. 2023-01-13 11:07:26 +01:00
elweyn
79220ced79 Add deleted Contribution to the Contribution list in the admin interface. 2023-01-13 11:05:56 +01:00
elweyn
9b4d1cd2b3 Add new locales. 2023-01-12 15:29:34 +01:00
elweyn
b88bfabb78 Add button to deny contribution in the admin interface 2023-01-12 15:06:45 +01:00
elweyn
493aa32011 Deny contribution sends rejected contribution email. 2023-01-12 15:05:41 +01:00
elweyn
ea30fed068 Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-10 16:07:24 +01:00
Hannes Heine
837efc7cb8
Merge pull request #2506 from gradido/add_hide_amount_to_users
feat(backend): add hideAmountGDD & hideAmountGDT to users table.
2023-01-10 16:05:35 +01:00
Hannes Heine
40ce03bf87
Merge branch 'master' into add_hide_amount_to_users 2023-01-10 15:49:02 +01:00
Alexander Friedland
1165917725
Merge pull request #2530 from gradido/2529-Avatar-always-has-2-letters
fix(frontend): avatar initials always has 2 letters
2023-01-10 15:36:32 +01:00
Hannes Heine
447d252e58
Merge branch 'master' into 2332-mark-contribution-as-rejected 2023-01-10 14:41:10 +01:00
elweyn
676283449c Fix 'second call to API' test of Gdt- and GddAmount 2023-01-10 14:35:56 +01:00
Alexander Friedland
6833480a65
Merge branch 'master' into 2529-Avatar-always-has-2-letters 2023-01-10 14:09:19 +01:00
elweyn
95e1cd4b6d Merge branch 'master' into add_hide_amount_to_users 2023-01-10 14:00:47 +01:00
elweyn
01f054c181 Tests on GdtAmount 2023-01-10 13:56:52 +01:00
elweyn
74c575882a Tests on GddAmount 2023-01-10 13:56:39 +01:00
Moriz Wahl
640018b5e7
Merge pull request #2460 from gradido/seed-contributions
refactor(backend): seed contributions as user
2023-01-10 13:47:52 +01:00
elweyn
dded791586 Fix linting and locales 2023-01-10 11:54:44 +01:00
elweyn
d71a73ec3b Add new mutation variables to the tests mutation in backend. 2023-01-10 10:56:08 +01:00
elweyn
427a0a6865 Change test of returned login datas. 2023-01-10 10:55:41 +01:00
ogerly
b139834729 add methodes to update hide amounts 2023-01-10 10:07:47 +01:00
ogerly
ae5c5984b8 change hide amounts to optional 2023-01-10 10:06:58 +01:00
Alexander Friedland
11c2b3900c
Merge branch 'master' into add_hide_amount_to_users 2023-01-10 09:10:50 +01:00
Alexander Friedland
352b672f47
Merge branch 'master' into 2529-Avatar-always-has-2-letters 2023-01-10 07:31:55 +01:00
Moriz Wahl
712c62e6da
Merge branch 'master' into seed-contributions 2023-01-09 21:01:45 +01:00
4c2a609f92
Merge pull request #2503 from gradido/fix_logger_middleware
fix(backend): fix logger middleware
2023-01-09 20:29:53 +01:00
9a9de722c8
Merge branch 'master' into fix_logger_middleware 2023-01-09 19:57:50 +01:00
913235c186
Merge pull request #2523 from gradido/2522-correct-email-text
fix(backend): fix email text
2023-01-09 19:57:35 +01:00
1d3ecd3339
Merge branch 'master' into 2522-correct-email-text 2023-01-09 19:38:31 +01:00
15ae49d8f0
Merge pull request #2489 from gradido/lintpr-new-scopes
feat(other): new scopes for lint pr
2023-01-09 19:38:15 +01:00
8f14602b9f
Merge branch 'master' into lintpr-new-scopes 2023-01-09 19:14:36 +01:00
eeb59f9ea8
Merge pull request #2477 from gradido/fix-config
fix(backend): fix config - some typos
2023-01-09 19:14:10 +01:00
ogerly
e9ef878ca4 Avatar always has 2 letters 2023-01-09 15:47:45 +01:00
Moriz Wahl
e009fcb87d
Merge branch 'master' into seed-contributions 2023-01-09 14:49:21 +01:00
9bbb401428
fixed email text 2023-01-08 13:53:16 +01:00
5f58ec9393
Merge branch 'master' into fix-config 2023-01-06 13:23:27 +01:00
Hannes Heine
d440b38d83
Merge branch 'master' into add_hide_amount_to_users 2023-01-06 11:06:59 +01:00
Alexander Friedland
b69a59bd6d
Merge pull request #2297 from gradido/2290-New-Design
style(frontend): new Design
2023-01-06 10:56:58 +01:00
e59d2f0a0e
skip last failing test 2023-01-05 19:08:46 +01:00
1e1efd885e
ŕeduce coverage requirement to 89% 2023-01-05 18:55:09 +01:00
d2f929e887
skip failing tests 2023-01-05 18:53:15 +01:00
a2a2fee9b0
fix ContributionForm.spec.js tests all low hanging fruits 2023-01-05 18:36:53 +01:00
ogerly
a6273e79cb page vergessen 2023-01-05 16:59:48 +01:00
ogerly
99b69373d9 fix lint, locales, stylelint 2023-01-05 16:55:29 +01:00
ogerly
183d670c2a review changed from ulf 2023-01-05 16:38:19 +01:00
Hannes Heine
85744a100e
Merge branch 'master' into add_hide_amount_to_users 2023-01-05 14:07:17 +01:00
ogerly
4c097a34a3 resolve conflicts 2023-01-05 13:22:22 +01:00
mahula
67bae52fc2 add unit tests for right side contribution info component 2023-01-05 11:00:02 +01:00
mahula
b3f206fe83 fix amount related issue in transaction form component 2023-01-05 00:23:36 +01:00