12033 Commits

Author SHA1 Message Date
Moriz Wahl
2b27e6aaa8 test for valid date string for creation date 2022-11-10 19:18:01 +01:00
Moriz Wahl
5e2d6c3bc9 fix: Timezone Problems on Change of Month 2022-11-10 19:01:16 +01:00
Wolfgang Huß
f8eea10371 Fix 'i18n' server integration for testing
- Fix the sending of the multiple times registrars name to the email owner.
- Clarify the logging of the multiple times registrars name and the email owners name.
2022-11-10 16:33:50 +01:00
Wolfgang Huß
9154ff32d1 Fix spelling in sendEmail.test.ts 2022-11-10 16:30:18 +01:00
Wolfgang Huß
a73cca0ab4 Implement 'i18n' better into the server 2022-11-10 15:23:51 +01:00
mahula
5032307e2b
Merge pull request #2365 from gradido/2360-bug-admin-automatic-contribution-links-must-start-with-capital-letter
fix(admin): fix text in admin area to uppercase
2022-11-10 14:50:20 +01:00
mahula
47f9f49d1c
Merge branch 'master' into 2360-bug-admin-automatic-contribution-links-must-start-with-capital-letter 2022-11-10 14:38:00 +01:00
mahula
7d91f75879
Merge pull request #2349 from gradido/2343-feature-gradido-is-free-worldwide-on-startpage-slider
feat(frontend): move the information about gradido being free to the auth layout
2022-11-10 14:37:48 +01:00
mahula
6cbba25d73
Merge branch 'master' into 2360-bug-admin-automatic-contribution-links-must-start-with-capital-letter 2022-11-10 14:30:18 +01:00
1e9a223554
Merge branch 'master' into 2343-feature-gradido-is-free-worldwide-on-startpage-slider 2022-11-10 14:24:53 +01:00
Alexander Friedland
28d0534f30
Merge pull request #2364 from gradido/2355-2-Edit-Contribution
fix(admin): load error fixed for contribution link
2022-11-10 14:02:16 +01:00
Alexander Friedland
51b770012b
Merge branch 'master' into 2290-New-Design 2022-11-10 12:52:54 +01:00
mahula
91606876e2 fix text in admin area to uppercase 2022-11-10 12:33:54 +01:00
ogerly
05a4b9505d fix load error 2022-11-10 12:25:57 +01:00
mahula
26284aaef8
Merge branch 'master' into 2343-feature-gradido-is-free-worldwide-on-startpage-slider 2022-11-10 11:42:08 +01:00
mahula
230118e390 remove unused sign in an sign up headings from locales files 2022-11-10 11:30:32 +01:00
mahula
57a98def94 auth pages: move text about GRadido being free to the top of the card 2022-11-10 11:28:50 +01:00
Alexander Friedland
b9dbb0e54a
Merge pull request #2362 from gradido/2355-Edit-contribution-link-does-not-take-old-values
fix(admin): edit contribution link does not take old values
2022-11-10 11:14:13 +01:00
Hannes Heine
1ec132252f
Merge branch 'master' into 2285-mark-creation-via-link 2022-11-10 10:55:44 +01:00
elweyn
69af52f21a Show via link for creations. 2022-11-10 10:53:08 +01:00
elweyn
8caf482943 Store transactionLinkId to the transaction 2022-11-10 10:52:36 +01:00
ogerly
c8227670a4 fix test over 95% 2022-11-09 19:58:47 +01:00
ogerly
8b9b6f1f9a fix clean display for all functions 2022-11-09 17:15:29 +01:00
ogerly
ae3a8dc587 fix lint and locales 2022-11-09 14:37:23 +01:00
ogerly
106a72dd78 better behaviour when editing 2022-11-09 14:36:11 +01:00
9d4c68ea40
Merge pull request #2346 from gradido/fix_docker_file_descriptions
fix(other): corrected dockerfile descriptions
2022-11-09 12:35:14 +01:00
f1790e5228
Merge branch 'master' into fix_docker_file_descriptions 2022-11-09 12:21:19 +01:00
Hannes Heine
d4d68b0748
Merge pull request #2340 from gradido/2272-send-email-for-rejected-contributions
feat(backend): 🍰 Send email for rejected contributions
2022-11-09 12:05:32 +01:00
d4b1bb5e34
Merge branch 'master' into fix_docker_file_descriptions 2022-11-09 11:59:26 +01:00
Hannes Heine
65bd9b54f9
Merge branch 'master' into 2272-send-email-for-rejected-contributions 2022-11-09 11:40:02 +01:00
jjimenezgarcia
f555e82d9f
Merge pull request #2351 from gradido/amount-is-negative-sending-gdd 2022-11-09 10:48:07 +01:00
joseji
ac6b8e666f encryption interface 2022-11-09 10:46:01 +01:00
ogerly
7776ceae10 remove box test color 2022-11-09 10:44:27 +01:00
316334bd45
Merge branch 'master' into fix_docker_file_descriptions 2022-11-09 10:41:10 +01:00
Hannes Heine
635572d4dc
Merge branch 'master' into 2272-send-email-for-rejected-contributions 2022-11-09 10:38:54 +01:00
jjimenezgarcia
4323b438c7
Merge branch 'master' into amount-is-negative-sending-gdd 2022-11-09 10:20:25 +01:00
Alexander Friedland
339d3f1714
Merge pull request #2309 from gradido/2303-Allow-the-admin-to-edit-automatic-contribution-link
feat(admin): edit automatic contribution link
2022-11-09 09:49:05 +01:00
Hannes Heine
e57e8120b7
Merge branch 'master' into 2272-send-email-for-rejected-contributions 2022-11-09 09:28:24 +01:00
Hannes Heine
7d26669f99
Update backend/src/graphql/resolver/AdminResolver.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-11-09 09:28:07 +01:00
ogerly
b302abf29f +Merge branch 'master' into 2290-New-Design 2022-11-09 09:23:07 +01:00
Alexander Friedland
065a01c83a
Merge branch 'master' into 2303-Allow-the-admin-to-edit-automatic-contribution-link 2022-11-08 14:12:56 +01:00
Alexander Friedland
c6ab14434c
Update admin/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-11-08 14:12:42 +01:00
Alexander Friedland
864a24ee59
Update admin/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-11-08 14:12:15 +01:00
Alexander Friedland
b6e0a13675
Update admin/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-11-08 14:11:59 +01:00
Alexander Friedland
1cdfd33e99
Update admin/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-11-08 14:11:51 +01:00
Alexander Friedland
7f090acdb5
Update admin/src/components/ContributionLink/ContributionLinkForm.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-11-08 14:11:42 +01:00
jjimenezgarcia
02413ae0bb
Merge pull request #2308 from gradido/logger-error-cleaning-history
refactor(backend): fix logger mocks
2022-11-08 13:42:04 +01:00
joseji
73ced2291e database migration added 2022-11-08 13:41:33 +01:00
jjimenezgarcia
5606c80057
Merge branch 'master' into logger-error-cleaning-history 2022-11-08 13:25:16 +01:00
joseji
d11d587989 negative sign removed 2022-11-08 12:47:17 +01:00