167 Commits

Author	SHA1	Message	Date
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
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
ogerly	db1124da3f	separate pages: overview and send. ... apexcharts library inserted. example charts created: lienen and bar charts. example charts inserted	2021-10-13 16:13:28 +02:00
ogerly	8f42aa60d7	repair branch 707-Separate-Account-Overview-from-Send-Form from 937-Frontend-style-documentation	2021-10-06 09:19:51 +02:00
elweyn	5462e8b606	Merge master in this and resolve merge conflicts.	2021-10-05 08:06:09 +02:00
einhorn_b	fccb5a7715	fix sorting	2021-10-02 13:57:01 +02:00
einhorn_b	2277cc497b	fix locales	2021-10-02 13:57:01 +02:00
ogerly	4ce456d459	changes review, fix lint, fix locales, fix test	2021-09-30 22:57:20 +02:00
ogerly	2065bcbfb7	tests register fix	2021-09-30 09:03:11 +02:00
ogerly	defabccf86	Registration in different communities II	2021-09-29 18:11:03 +02:00
ogerly	173dac51b1	merge master in 803-community-selection-page-of-registration-process-2	2021-09-28 18:41:16 +02:00
Alexander Friedland	3220548ae7	Merge pull request #905 from gradido/902-arranging-the-settings-translations ... Cleaned up locales for settings and adjusted texts in files	2021-09-28 13:50:21 +02:00
ogerly	f5915d0ada	setting changed to settings, remove delete rows	2021-09-28 09:41:07 +02:00
einhornimmond	5eb40c4819	Merge pull request #890 from gradido/login_update_password ... update password check, allow every special char	2021-09-27 18:02:06 +02:00
ogerly	4dec84321a	Cleaned up locales for settings and adjusted texts in files	2021-09-27 15:35:17 +02:00
Moriz Wahl	342649ae1e	no white space rule in password	2021-09-27 13:34:58 +02:00