177 Commits

Author SHA1 Message Date
Moriz Wahl
26871b4f61
Merge branch 'master' into 1319-email-optin 2022-02-07 19:27:50 +01:00
ogerly
3fe2b8e026 yarn locales --fix 2022-02-04 15:52:14 +01:00
ogerly
46f7894d29 add localized 2022-02-04 15:49:33 +01:00
elweyn
a284e49f01 Fix locales had a property that was not closed. 2022-01-26 14:44:53 +01:00
Hannes Heine
ffcf8106a4
Merge branch 'master' into 1319-email-optin 2022-01-25 14:29:16 +01:00
elweyn
f5383e3c05 In case where the user has used an OptIn code that was to old then the user is send to a thx/resetFailed page where he gets a message that the code was to old. 2022-01-22 14:11:54 +01:00
elweyn
c29245b3ca Change the text if the account is not activated yet and changed the button so that we are send to reset password. 2022-01-22 10:00:03 +01:00
ogerly
2f0f6d7db7 check array and send the correct parameters to the thx page 2022-01-21 11:36:50 +01:00
Alexander Friedland
6ae5305e67
Merge branch 'master' into 1227-Vergaenglichkeit-besser-darstellen 2022-01-19 15:50:05 +01:00
Alexander Friedland
d0468f8c48
Update frontend/src/locales/de.json
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-01-19 15:49:43 +01:00
ogerly
fb4bbac8aa remove text publisher.infoNoRegister from locales de 2022-01-19 09:47:47 +01:00
ogerly
cca2de8faf fix locales 2022-01-18 16:36:17 +01:00
ogerly
e239b51a8c set locales for advance-calculation 2022-01-18 16:34:47 +01:00
ogerly
d8b9062a92 add locales for advance-calculation 2022-01-18 16:31:10 +01:00
9ec068165a
Update frontend/src/locales/de.json 2022-01-12 06:42:27 +01:00
6188d7e0ca
Update frontend/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-01-12 06:41:17 +01:00
6d73a14b2d
text change request from bernd 2022-01-09 11:01:35 +01:00
dd34fea280
update for the langauge strings I got from Bernd 2022-01-07 19:22:57 +01:00
Alexander Friedland
b846fac6ed
Merge branch 'master' into 1078-GDD-Calculate-Decay-Tool-clear 2021-12-16 12:53:42 +01:00
ogerly
17d16df87c yarn locales --fix 2021-12-14 11:24:56 +01:00
ogerly
00c2c85306 Send transaction confirm, new amount structured 2021-12-14 11:22:30 +01:00
Alexander Friedland
96dc03e0df
Update frontend/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2021-12-14 09:12:40 +01:00
Hannes Heine
7d62db39bb
Merge branch 'master' into 1078-GDD-Calculate-Decay-Tool-clear 2021-12-13 04:31:33 +01:00
ogerly
0bb3b04436 remove error text for decay not found. 2021-12-10 15:22:36 +01:00
ogerly
47f8ce38b1 change error text for transactionCount is FALSE or undefind 2021-12-10 12:48:46 +01:00
ogerly
ae317a95db yarn lint, yarn locales --fixed 2021-12-10 12:19:07 +01:00
ogerly
3abbb6def1 error handling gddTransactionList locales fixed 2021-12-10 12:17:49 +01:00
Moriz Wahl
5a055b3739 Merge branch 'test-apollo-provider-frontend' into 1029-Change-text-for-expired-session 2021-12-08 11:11:04 +01:00
elweyn
00f08ff2db Added a comingFrom parameter to ForgotPassword so we can have different texte in case of optin code expired. 2021-12-07 09:48:22 +01:00
bbd54ef607
Merge branch 'master' into login_call_resetPassword 2021-12-06 13:42:48 +01:00
ogerly
fb48e7c9d2 catch error Client certificate revoked and pass error.session-expired. Graph QL error: always passed from backend 2021-12-03 13:09:45 +01:00
Alexander Friedland
4f7c5490b8
Merge branch 'master' into 1078-GDD-Calculate-Decay-Tool-clear 2021-12-02 12:28:40 +01:00
ogerly
508b1519ee TransactionConfirm new translations added 2021-12-02 09:55:34 +01:00
Alexander Friedland
6a4379f9cd
Update frontend/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2021-12-01 15:34:08 +01:00
ogerly
eece84d007 yarn locales --fix 2021-11-30 13:58:34 +01:00
ogerly
2de8684ca3 Add edit locales for german PublisherID for Herausgeber ID 2021-11-30 13:57:40 +01:00
ogerly
a1018b526d Add locales for PublisherID 2021-11-30 13:56:22 +01:00
ogerly
57e8be75a6 Add PublisherID locales in DOM and german 2021-11-30 13:52:57 +01:00
400ab334e2
fix locales 2021-11-26 02:54:12 +01:00
0b3a8c013a
include review of moriz 2021-11-26 02:50:57 +01:00
8427584cb7
Merge branch 'login_call_resetPassword_frontend' into login_call_resetPassword
# Conflicts:
#	frontend/src/views/Pages/ResetPassword.vue
2021-11-26 02:43:46 +01:00
Moriz Wahl
ac7eb303b4 Merge branch 'master' into login_admin_interface 2021-11-24 18:23:31 +01:00
elweyn
a9941faafb Added locale for activate email & reset email. 2021-11-23 09:34:54 +01:00
73c9f7c2ab
Merge branch 'master' into bugfix_registration 2021-11-22 23:27:58 +01:00
Hannes Heine
38ee1d46b8
Update frontend/src/locales/de.json 2021-11-22 23:27:02 +01:00
b6400d3c8d
fixed locales 2021-11-20 17:19:58 +01:00
a61317c3af
admin_area language file 2021-11-20 17:19:58 +01:00
elweyn
9a75604a7a Change prozess so that a user that has not activate his account gets a warning that he needs to click the activation link in the email. Withdrew sendActivationMail again. 2021-11-12 10:55:43 +01:00
elweyn
1bf8e8451d Textes for the new pages added. 2021-11-12 10:06:51 +01:00
elweyn
b1e419530c Fix sorting of locale. 2021-11-12 08:31:48 +01:00