14885 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	5657798016	fix snapshot	2023-07-06 11:03:34 +02:00
Ulf Gebhardt	caf1b8e9d8	fix email-link	2023-07-06 10:51:59 +02:00
Hannes Heine	0e8c2c225f	Merge pull request #3127 from gradido/release1.22.2 ... chore(release): v1.22.2	2023-07-06 09:35:45 +02:00
elweyn	6571d9aaf2	chore(release): v1.22.2	2023-07-06 09:18:17 +02:00
Hannes Heine	da94074457	Merge pull request #3123 from gradido/fix-moderation-message-answer-question ... fix(backend): moderation message are completely hidden from the user	2023-07-06 08:55:04 +02:00
Ulf Gebhardt	89c2c1c778	english typo	2023-07-06 02:08:17 +02:00
Ulf Gebhardt	960252e9fc	fix comment, typo	2023-07-06 02:07:02 +02:00
elweyn	e228d8b3e7	Correct the test message.	2023-07-05 12:56:29 +02:00
Hannes Heine	befc61f7b4	Merge branch 'master' into fix-moderation-message-answer-question	2023-07-05 12:33:30 +02:00
Hannes Heine	f35959ea3c	Merge pull request #3124 from gradido/fix-username-saving ... fix(frontend): properly save username, do not allow to edit it again	2023-07-05 12:33:15 +02:00
Hannes Heine	fc4c2dae64	Merge branch 'master' into fix-username-saving	2023-07-05 12:08:14 +02:00
Ulf Gebhardt	9244a4c5a4	fix username component	2023-07-05 11:18:54 +02:00
Ulf Gebhardt	604d67dd63	lint	2023-07-05 11:08:23 +02:00
Ulf Gebhardt	f5a761c769	implicitly test for messagescounts to be correct when moderator message is present(not shown on listContributions)	2023-07-05 11:07:45 +02:00
Ulf Gebhardt	e6f18f718b	fix linting	2023-07-05 10:41:55 +02:00
Ulf Gebhardt	ff03b05e5e	test case for Moderation Contribution message does not change contribution status, normal message does	2023-07-05 10:41:12 +02:00
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	18239c75fe	properly save username, do not allow to edit it again	2023-07-05 10:01:23 +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