Wolfgang Huß
369752783c
Translate and HTML'lize email 'sendAccountActivation'
2022-11-17 13:46:59 +01:00
Wolfgang Huß
e9c4de5373
Remove old untranslated 'sendAccountMultiRegistrationEmail'
2022-11-14 13:59:51 +01:00
Wolfgang Huß
88b7e5ee78
Merge branch 'master' of github.com:gradido/gradido into 1288-email-templates
...
# Conflicts:
# backend/package.json
# backend/yarn.lock
2022-11-14 13:55:46 +01:00
Wolfgang Huß
8589f352ad
Set backend 'i18n' language on login
2022-11-14 13:51:26 +01:00
Wolfgang Huß
7eefdd2843
Fix test of 'sendEmailTranslated'
2022-11-14 12:54:48 +01:00
Wolfgang Huß
17e0cbb15c
Test email template 'sendAccountMultiRegistrationEmail' in english
2022-11-14 12:47:40 +01:00
3c0105cfa8
Merge pull request #2386 from gradido/fix_email_texts
...
fix(backend): corrected E-Mail texts
2022-11-14 11:16:04 +01:00
db96f8ff72
Merge branch 'master' into fix_email_texts
2022-11-14 10:50:42 +01:00
Moriz Wahl
dc431ceac7
Merge pull request #2381 from gradido/parse-histroy-messages
...
fix(frontend): better history messages
2022-11-14 10:49:34 +01:00
Wolfgang Huß
c187b33a4d
Test 'sendEmailTranslated'
2022-11-14 09:36:43 +01:00
Wolfgang Huß
2df19ab362
Document testing options
2022-11-14 09:17:52 +01:00
b8c1a9d477
fixed tests
2022-11-13 14:21:33 +01:00
f65cb9c586
missing change, deinem not with capital letter
2022-11-13 14:21:27 +01:00
Moriz Wahl
0cb3189073
unit tests for HISTORY type contribution messages
2022-11-13 13:24:00 +01:00
Moriz Wahl
1b40d6aaee
unit tests for HISTORY type contribution messages
2022-11-13 13:18:41 +01:00
dcfab11f5e
corrected E-Mail texts
2022-11-12 20:41:21 +01:00
Moriz Wahl
5ceae68be3
Merge branch 'master' into parse-histroy-messages
2022-11-12 16:31:37 +01:00
Moriz Wahl
7dee06bc56
Merge pull request #2383 from gradido/fix-mailto-link
...
fix(frontend): mailto link
2022-11-12 16:30:38 +01:00
Moriz Wahl
4724912025
fix(frontend): Mailto Link
2022-11-12 16:09:13 +01:00
Moriz Wahl
16a2ffca76
remove GDD filter
2022-11-12 14:40:48 +01:00
Wolfgang Huß
e1392b0483
Refine 'sendEmailTranslated.ts'
2022-11-11 13:40:10 +01:00
Moriz Wahl
ae8f40ba85
do proper rename
2022-11-11 12:56:51 +01:00
Moriz Wahl
10eda75fb7
parse history message in admin interface
2022-11-11 12:48:26 +01:00
Moriz Wahl
5204e16240
rename component
2022-11-11 12:41:06 +01:00
Moriz Wahl
d0f3f286b9
fix (frontend): Better History Messages
2022-11-11 12:34:08 +01:00
Wolfgang Huß
5fcd684b6b
Fix language conflict between current user and email receiving user
2022-11-11 12:10:26 +01:00
Wolfgang Huß
5b5aa2268b
Set current user language globaly
2022-11-11 12:09:41 +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
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
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
