14868 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	01a5e6897c	Merge branch 'master' into fix-moderation-message-answer-question	2023-07-05 10:03:04 +02:00
Ulf Gebhardt	ed216bfc2b	Merge pull request #3122 from gradido/fix-frontend-spelling-speichern ... fix(frontend): fix German "Speichern" to have capital letter	2023-07-05 10:02:21 +02:00
Ulf Gebhardt	69ae2e91f0	fix message count on moderator message contributions (filter out MODERATOR messages)	2023-07-05 09:37:35 +02:00
Ulf Gebhardt	d1ba7c7f41	do not change contribution status on moderator message	2023-07-05 09:05:20 +02:00
Ulf Gebhardt	069f1170e9	fix spelling german "Speichern" captial letter	2023-07-05 08:56:58 +02:00
mahula	dc101d3e4d	Merge pull request #3117 from gradido/release-1.22.1 ... chore(release): v1.22.1	2023-07-04 11:52:07 +02:00
mahula	1b2b261dd4	chore(release): v1.22.1	2023-07-04 11:36:40 +02:00
mahula	a365f1d067	Merge pull request #3114 from gradido/3112-bugbackend-email-links-of-stage2-send-to-production ... fix(backend): use base url from config in email templates	2023-07-04 10:38:55 +02:00
mahula	c021295a9d	Merge branch 'master' into 3112-bugbackend-email-links-of-stage2-send-to-production	2023-07-04 10:22:48 +02:00
mahula	5422246e11	Merge pull request #3052 from gradido/more-unit-tests-frontend ... feat(frontend): test right side layout template	2023-07-04 10:20:31 +02:00
mahula	61d212c649	Merge branch 'master' into more-unit-tests-frontend	2023-07-04 10:07:11 +02:00
mahula	8cc7025bb4	add snapshot for email template testing	2023-07-04 10:05:35 +02:00
einhornimmond	acabf937c1	Merge pull request #3115 from gradido/iota3_remove_from_backend ... feat(backend): remove iota from backend	2023-07-03 23:30:37 +02:00
einhornimmond	e3bb015815	Merge branch 'master' into iota3_remove_from_backend	2023-07-03 17:57:11 +02:00
Alexander Friedland	839738d5db	Merge pull request #3116 from gradido/refactor-text-juni-to-juli ... refactor(frontend): text juni to juli	2023-07-03 16:40:08 +02:00
ogerly	353578dd9f	July for English with uppercase initial letter	2023-07-03 15:44:48 +02:00
ogerly	d019c71be5	text juni to juli	2023-07-03 15:20:06 +02:00
Einhornimmond	98d1002011	remove all traces of iota	2023-07-03 14:09:18 +02:00
Hannes Heine	cf86413841	Merge branch 'master' into 3112-bugbackend-email-links-of-stage2-send-to-production	2023-07-03 13:57:41 +02:00
mahula	83a5c64d6c	fix url in email templates	2023-07-03 13:29:21 +02:00
mahula	89759f607e	remove email template snapshot	2023-07-03 13:28:36 +02:00
Hannes Heine	20e5ebe3f7	Merge pull request #3113 from gradido/3105-refactor-fFrontend-settings-page-style-optimisation ... refactor(frontend): refactor changes incorporated	2023-07-03 13:11:54 +02:00
mahula	6de04bce77	use base url from config in email templates	2023-07-03 12:47:08 +02:00
Alexander Friedland	c029b2cbff	Merge branch 'master' into 3105-refactor-fFrontend-settings-page-style-optimisation	2023-07-03 12:42:55 +02:00
Hannes Heine	777b088af7	Merge pull request #3108 from gradido/3102-refactor-frontend-overview-page ... refactor(frontend): date from deploy changed to infotext	2023-07-03 12:42:40 +02:00
ogerly	969de269e3	fix locales	2023-07-03 11:53:34 +02:00
ogerly	258874dd86	changes incorporated	2023-07-03 11:52:45 +02:00
ogerly	c369c42093	date from deploy changed to infotext	2023-07-03 08:01:29 +02:00
Hannes Heine	e5be42f0f8	Merge branch 'master' into more-unit-tests-frontend	2023-07-01 14:07:00 +02:00
Hannes Heine	77c01401df	Merge pull request #3107 from gradido/3104-fix-frontend-verify-login-missing-alias ... fix(frontend): add alias to the verifyLogin GraphQL answer.	2023-07-01 14:04:02 +02:00
Hannes Heine	d29339ce07	Merge branch 'master' into 3104-fix-frontend-verify-login-missing-alias	2023-07-01 13:38:16 +02:00
Hannes Heine	6921c07b10	Merge pull request #3106 from gradido/3103-fix-backend-moderator-message ... fix(backend): moderator message don't send email to user	2023-07-01 13:37:54 +02:00
elweyn	f4b537c08c	Add alias to the verifyLogin grqphql answer.	2023-07-01 12:14:57 +02:00
elweyn	0b4d7181be	Check that the message type is not MODERATOR before sending email.	2023-07-01 11:54:24 +02:00
elweyn	000ac24865	Test that their is no email send after a moderator message.	2023-07-01 11:53:54 +02:00
Ulf Gebhardt	4b0cfb8181	Merge pull request #3101 from gradido/v1.22.0 ... chore(release): v1.22.0	2023-06-30 20:26:02 +02:00
Ulf Gebhardt	a8a751a9f0	v1.22.0	2023-06-30 19:52:03 +02:00
Hannes Heine	a939f4c70c	Merge pull request #3097 from gradido/fix-yarn-lock ... fix(backend): yarn.lock after typeorm update	2023-06-30 19:07:00 +02:00
Hannes Heine	d045880aaf	Merge branch 'master' into fix-yarn-lock	2023-06-30 18:27:38 +02:00
Hannes Heine	0f9184d142	Merge pull request #3040 from gradido/2519-new-design-for-settings-and-profile ... feat(frontend): new style for settings page	2023-06-30 18:27:17 +02:00
ogerly	c3db20df20	fix locales	2023-06-30 17:50:29 +02:00
ogerly	34261e3534	fix locales	2023-06-30 17:49:36 +02:00
ogerly	16c253d0c8	fix test UserName.spec.js	2023-06-30 17:47:59 +02:00
ogerly	8a2c664787	input readonly if .state.username	2023-06-30 17:29:42 +02:00
ogerly	70f52cd117	fix test Settings.spec.js	2023-06-30 17:17:51 +02:00
ogerly	3f06367a71	fix lint	2023-06-30 16:07:45 +02:00
ogerly	acda4108b2	darkmode hide and TODO	2023-06-30 16:04:11 +02:00
Alexander Friedland	59ecc14b29	Merge branch 'master' into 2519-new-design-for-settings-and-profile	2023-06-30 15:46:20 +02:00
Moriz Wahl	e60b7dcc83	Merge pull request #3094 from gradido/query-users-on-contributions ... feat(admin): query users on contributions	2023-06-30 15:43:08 +02:00
ogerly	0ecc0bca3d	fix test UserName.spec.js	2023-06-30 15:36:26 +02:00