10395 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hannes Heine	f261e76a38	Merge branch 'master' into 2134-send-email-when-admin-writes-message-to-contribution	2022-09-15 16:02:37 +02:00
Hannes Heine	e463205d0e	Merge pull request #2063 from gradido/2010-send-email-to-transaction-link-sender ... feat: 🍰 Send Email To Transaction Link Sender After Receiver Redeemed It	2022-09-15 16:02:18 +02:00
Hannes Heine	c71caa139d	Merge branch 'master' into 2010-send-email-to-transaction-link-sender	2022-09-15 15:44:35 +02:00
elweyn	e3257c1f71	Fix prettier.	2022-09-14 11:22:42 +02:00
elweyn	ce1fe72a4f	Merge branch '2134-send-email-when-admin-writes-message-to-contribution' of https://github.com/gradido/gradido into 2134-send-email-when-admin-writes-message-to-contribution	2022-09-14 09:05:21 +02:00
Hannes Heine	6704cb0f87	Merge branch 'master' into 2134-send-email-when-admin-writes-message-to-contribution	2022-09-14 09:04:56 +02:00
elweyn	0820d8d529	Tests that the method sendAddedContributionMessageEmail is called.	2022-09-14 09:04:39 +02:00
elweyn	d65bd827ca	Change search to get the contribution.user instead of queriing it after wards.	2022-09-14 09:03:28 +02:00
Hannes Heine	a87667af02	Update backend/src/mailer/sendAddedContributionMessageEmail.test.ts ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-09-14 08:34:41 +02:00
Moriz Wahl	4b226813aa	Merge pull request #2196 from gradido/v1.12.1 ... release: Version 1.12.1	2022-09-13 13:47:56 +02:00
Moriz Wahl	65318c4498	release: Version 1.12.1	2022-09-13 13:37:30 +02:00
Alexander Friedland	0525a1e689	Merge pull request #2195 from gradido/bug-icon-all-contributions ... fix: 🍰 Show Not Icons In `allContribution` List	2022-09-13 13:21:32 +02:00
ogerly	f7454e3146	fix bug	2022-09-13 10:18:16 +02:00
Moriz Wahl	3d6b889624	Merge pull request #2191 from gradido/release-1.12.0 ... release: v1.12.0	2022-09-12 11:13:09 +02:00
Moriz Wahl	39d7de3d4b	release: v1.12.0	2022-09-12 10:47:07 +02:00
Alexander Friedland	ee58530900	Merge pull request #2189 from gradido/2188-do-not-save-empty-messages ... if message empty else disabled button	2022-09-09 15:53:41 +02:00
elweyn	42f667674e	Remove unused import.	2022-09-09 14:54:37 +02:00
elweyn	a3d65228f9	Add sendEmail mock to the test file.	2022-09-09 14:44:22 +02:00
elweyn	93e7684eda	Change import to the new file.	2022-09-09 14:44:00 +02:00
elweyn	655e405866	Change text of email.	2022-09-09 14:43:30 +02:00
ogerly	6c39fe9362	if message empty else disabled button	2022-09-09 14:40:15 +02:00
elweyn	2651a8afca	Move test for sendAddedContributionMessageEmail.	2022-09-09 09:20:56 +02:00
elweyn	5aea6f9d9d	Move sendAddedContributionMessageEmail to new file.	2022-09-09 09:20:34 +02:00
elweyn	d49d5f6bb7	Remove addedContributionMessageEmail test from this file.	2022-09-09 09:20:14 +02:00
elweyn	032348f8c2	Remove addedContributionMessageEmail from this file.	2022-09-09 09:19:49 +02:00
elweyn	663097c378	Fix data with named contributionMemo instead.	2022-09-09 07:52:04 +02:00
elweyn	690b18c307	Remove email of admin who sends message.	2022-09-09 07:49:11 +02:00
elweyn	d73143cfdf	Call method to send Email when an admin add a new contributionmessage.	2022-09-09 07:42:27 +02:00
elweyn	d2ff899100	Add method for sending EMail when their is a new contributionMessage from admin.	2022-09-09 07:41:45 +02:00
elweyn	d08b609088	Define the german text for the email addedContributionMessage.	2022-09-09 07:40:48 +02:00
Hannes Heine	2f41737d58	Merge branch 'master' into 2010-send-email-to-transaction-link-sender	2022-09-09 06:26:26 +02:00
Alexander Friedland	8f151b3554	Merge pull request #2185 from gradido/2184-button-for-the-messages-is-missing ... messages show if Confirmed	2022-09-08 20:40:05 +02:00
Alexander Friedland	09cc02ae2b	Merge branch 'master' into 2184-button-for-the-messages-is-missing	2022-09-08 20:31:12 +02:00
Alexander Friedland	88707d3346	Merge pull request #2186 from gradido/2183-text-in-the-messages-smaller ... text in messages smaller	2022-09-08 20:30:52 +02:00
ogerly	78a20ac9ba	text in messages smaller	2022-09-08 18:52:16 +02:00
ogerly	35f05d2f9c	messages show if Confirmed	2022-09-08 18:32:49 +02:00
Hannes Heine	7f5b2d6bc2	Merge pull request #2181 from gradido/klicktipp-retrieve-not-registered-email ... feat: 🍰 Klicktipp retrieve not registered email	2022-09-08 09:52:55 +02:00
Hannes Heine	6817b5f139	Merge branch 'master' into klicktipp-retrieve-not-registered-email	2022-09-08 09:17:06 +02:00
Hannes Heine	81a99ae72b	Merge pull request #2182 from gradido/fix-admin-show-all-moderators-on-left-side ... fix: 🍰 isModerator on messages to switch the messages side in the messages overview	2022-09-08 09:15:36 +02:00
Hannes Heine	039840139c	Merge branch 'master' into 2010-send-email-to-transaction-link-sender	2022-09-08 07:51:23 +02:00
elweyn	1efee2bbd7	Call isModerator for messages so we can switch the messages & Remove computed isModerator and use message.isModerator to switch.	2022-09-07 12:14:05 +02:00
elweyn	ed0900b735	Add lint command to ignore console.log statement.	2022-09-07 11:34:08 +02:00
elweyn	e50b80997b	Fix imports.	2022-09-07 10:38:34 +02:00
elweyn	0fb1dcdb3e	Moved klicktipp.ts to src/util	2022-09-07 10:34:09 +02:00
elweyn	0f0cdab800	Merge master	2022-09-07 10:31:23 +02:00
mahula	9e5f7f9b9a	Merge pull request #2174 from gradido/fix-locales-nederlands ... Refactor locales for Nederlands	2022-09-07 09:57:01 +02:00
mahula	44a91950ac	Merge branch 'master' into fix-locales-nederlands	2022-09-07 09:47:51 +02:00
Hannes Heine	ac268e002f	Merge pull request #2180 from gradido/add-is-moderator-to-contribution-message ... Add is moderator to contribution message	2022-09-06 16:09:09 +02:00
Hannes Heine	4bb8ced489	Merge branch 'master' into add-is-moderator-to-contribution-message	2022-09-06 15:18:08 +02:00
elweyn	73db7707ce	Remove nullable from graphql Field isModerator.	2022-09-06 14:39:44 +02:00