181 Commits

Author	SHA1	Message	Date
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	0818ddcf66	Update frontend/src/locales/en.json ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2021-12-14 09:12:49 +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
Ulf Gebhardt	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	75ec2a6e8c	Add PublisherID locales in DOM and english	2021-11-30 13:54:33 +01:00
ogerly	57e8be75a6	Add PublisherID locales in DOM and german	2021-11-30 13:52:57 +01:00
Ulf Gebhardt	400ab334e2	fix locales	2021-11-26 02:54:12 +01:00
Ulf Gebhardt	0b3a8c013a	include review of moriz	2021-11-26 02:50:57 +01:00
Ulf Gebhardt	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	fe22bee016	Changed locales to give some textes.	2021-11-24 09:05:15 +01:00
elweyn	a9941faafb	Added locale for activate email & reset email.	2021-11-23 09:34:54 +01:00
Ulf Gebhardt	73c9f7c2ab	Merge branch 'master' into bugfix_registration	2021-11-22 23:27:58 +01:00
Hannes Heine	57e01cba27	Update frontend/src/locales/en.json	2021-11-22 23:27:09 +01:00
Hannes Heine	38ee1d46b8	Update frontend/src/locales/de.json	2021-11-22 23:27:02 +01:00
Ulf Gebhardt	b6400d3c8d	fixed locales	2021-11-20 17:19:58 +01:00
Ulf Gebhardt	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
elweyn	f5044e8579	Change register message & error toast message account not active yet.	2021-11-12 07:54:14 +01:00
elweyn	14db7bd058	Added a no-email-verify to locale check if the error message contains the message email not verified then throw another message than normal.	2021-11-12 07:38:57 +01:00
Alexander Friedland	6328500de4	Merge pull request #1048 from gradido/1047-Please-correct-spelling-mistakes ... Spelling error fixed 'Berechnungsformel'	2021-11-01 16:47:59 +01:00
ogerly	a5c936a491	Spelling error fixed 'Berechnungsformel'	2021-10-27 08:31:45 +02:00
elweyn	4974cfd79a	Text changes for german and english.	2021-10-25 09:32:34 +02:00
Alexander Friedland	55c8173223	Merge pull request #970 from gradido/707-Separate-Account-Overview-from-Send-Form ... 707 separate account overview and send	2021-10-22 09:08:55 +02:00
Alexander Friedland	e046926866	Merge pull request #984 from gradido/983-hinweis-auf-gradido-unterstuetzen ... Link to the funding contributions of gradido.net memberships	2021-10-22 09:07:45 +02:00
ogerly	5a931d62b0	test When no transactions are loaded, fix lint, fix locales	2021-10-21 09:48:03 +02:00
Moriz Wahl	7bc7940b5e	Merge branch 'master' into 707-Separate-Account-Overview-from-Send-Form	2021-10-21 02:01:03 +02:00
ogerly	6be4348174	change text 'eingetraten' to 'eingetragen'	2021-10-19 11:56:11 +02:00
Ulf Gebhardt	d05590aa70	fix language registriert	2021-10-15 13:28:24 +02:00
ogerly	5c6804aea7	fix locales	2021-10-15 10:38:06 +02:00
ogerly	c182b71358	ink to the funding contributions of gradido.net memberships	2021-10-15 09:41:52 +02:00
ogerly	907a9fe696	merge master, merge conflict fixed	2021-10-13 16:34:29 +02:00