2362 Commits

Author	SHA1	Message	Date
Hannes Heine	e57e8120b7	Merge branch 'master' into 2272-send-email-for-rejected-contributions	2022-11-09 09:28:24 +01:00
Hannes Heine	7d26669f99	Update backend/src/graphql/resolver/AdminResolver.ts ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2022-11-09 09:28:07 +01:00
jjimenezgarcia	5606c80057	Merge branch 'master' into logger-error-cleaning-history	2022-11-08 13:25:16 +01:00
Hannes Heine	1a799f3020	Merge branch 'master' into 2272-send-email-for-rejected-contributions	2022-11-08 12:05:54 +01:00
Moriz Wahl	6d1224d7c5	Merge branch 'master' into setup-hyperswarm	2022-11-07 13:17:26 +01:00
Moriz Wahl	7efd2ffca3	linting, etc.	2022-11-07 13:16:22 +01:00
Moriz Wahl	8aac319895	move DHT connection into main	2022-11-07 12:45:44 +01:00
Moriz Wahl	51cc3164b2	use logger instead of console	2022-11-07 12:27:43 +01:00
elweyn	c79d186a45	Log error when contribution is in the wrong state. Write full content in changeMessage.	2022-11-07 10:32:26 +01:00
elweyn	c2fc4feb6a	Call method to send Email if contribution is rejected.	2022-11-07 10:11:14 +01:00
elweyn	225119c8ab	Test that the email is build correctly.	2022-11-07 10:10:28 +01:00
elweyn	0192a45346	Build and send email for rejected contributions.	2022-11-07 10:09:49 +01:00
elweyn	d092bd0068	German email template for rejected contributions.	2022-11-07 10:08:23 +01:00
elweyn	b3fd53ab7a	Change the display of the history message.	2022-11-03 08:35:26 +01:00
jjimenezgarcia	d693f5f025	Merge branch 'master' into logger-error-cleaning-history	2022-11-02 15:22:30 +01:00
Hannes Heine	677519dda7	Merge branch 'master' into 2140-add-updated-at-to-contributions	2022-11-02 13:27:06 +01:00
Moriz Wahl	7f56eb2f75	release: Version 1.13.3	2022-11-01 15:48:31 +01:00
Moriz Wahl	fdd3b0f4fd	fix: Release Statistic Query Runner	2022-11-01 14:30:43 +01:00
joseji	16699e19ad	small details	2022-10-31 14:46:52 +01:00
jjimenezgarcia	1560e80d0c	Merge branch 'master' into logger-error-cleaning-history	2022-10-28 11:53:36 +02:00
joseji	f69abcd04c	small tests modified	2022-10-28 11:46:18 +02:00
Moriz Wahl	f88db9470e	release: Version 1.13.2	2022-10-28 11:27:56 +02:00
joseji	9846e095bf	logger now mocked propperly	2022-10-28 11:22:58 +02:00
Hannes Heine	a0bf498f40	Merge branch 'master' into 2140-add-updated-at-to-contributions	2022-10-28 09:57:33 +02:00
Moriz Wahl	c3b624f36f	add order by clause	2022-10-27 19:55:23 +02:00
Moriz Wahl	568a6cdd2c	Merge branch 'master' into 2202-refactor-creations-query	2022-10-27 15:01:40 +02:00
Moriz Wahl	c55be14d5a	add more code from poc	2022-10-27 07:26:52 +02:00
Moriz Wahl	d0d84af7ee	fix merging errors	2022-10-27 06:50:25 +02:00
Moriz Wahl	0ac2a4d2c8	Merge branch 'master' into setup-hyperswarm	2022-10-27 06:42:57 +02:00
elweyn	69004d5659	Merge branch 'master' into 2140-add-updated-at-to-contributions	2022-10-26 12:05:49 +02:00
elweyn	0d304f9d71	Remove TODO comments and change the written message to only the old values no prefix.	2022-10-26 12:05:27 +02:00
joseji	1407ea0e8b	skipped test for changing month	2022-10-26 11:26:04 +02:00
Moriz Wahl	b2a1d7d672	include pending contributions for validation of contribution link, test it	2022-10-26 06:38:49 +02:00
Moriz Wahl	b5edc5f476	clean up	2022-10-25 13:45:43 +02:00
jjimenezgarcia	705365cb8e	Merge branch 'master' into admin-resolver-events-and-logging	2022-10-25 12:37:58 +02:00
joseji	7662d281f7	fixed test with new info	2022-10-25 12:37:08 +02:00
Moriz Wahl	d1a1059158	Merge branch 'master' into 2202-refactor-creations-query	2022-10-25 12:15:51 +02:00
joseji	2bf1bd6d36	fixed collisions	2022-10-25 12:01:30 +02:00
ogerly	5d3dda78de	change E-Mail Subject	2022-10-24 22:05:17 +02:00
Moriz Wahl	fcd9e1776c	fix: Include Deleted Email Contacts in User Search	2022-10-24 22:05:17 +02:00
joseji	f0c39703f1	fixed wrong removals of negative numbers	2022-10-24 22:05:17 +02:00
joseji	f8ef64054d	Merge branch 'master' into test-transaction-resolver	2022-10-24 22:02:18 +02:00
joseji	3bd339d798	fixed wrong removals of negative numbers	2022-10-24 22:01:19 +02:00
elweyn	53d315749d	Change import from ../enum to @enum	2022-10-24 16:01:48 +02:00
elweyn	68aa0a5d07	Withdrew createdAt = new Date() and use updatedAt or createdAt from the contribution.	2022-10-24 16:00:08 +02:00
elweyn	ce73e2c447	Change value from new to old value.	2022-10-24 13:40:28 +02:00
elweyn	94e9039c86	Add changed values to the new contribution message.	2022-10-24 13:23:42 +02:00
elweyn	e29c9a111d	Add a contribution message when things are changed.	2022-10-24 12:15:54 +02:00
elweyn	43705b3a40	Merge master into this branch, resolve merge conflicts	2022-10-24 12:03:27 +02:00
jjimenezgarcia	902222b9c8	Update backend/src/util/validate.ts ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-10-24 08:05:37 +02:00