1740 Commits

Author	SHA1	Message	Date
elweyn	95e1cd4b6d	Merge branch 'master' into add_hide_amount_to_users	2023-01-10 14:00:47 +01:00
elweyn	427a0a6865	Change test of returned login datas.	2023-01-10 10:55:41 +01:00
ogerly	ae5c5984b8	change hide amounts to optional	2023-01-10 10:06:58 +01:00
Moriz Wahl	e009fcb87d	Merge branch 'master' into seed-contributions	2023-01-09 14:49:21 +01:00
Hannes Heine	85744a100e	Merge branch 'master' into add_hide_amount_to_users	2023-01-05 14:07:17 +01:00
Ulf Gebhardt	f83b9a762c	also fix backend month test	2023-01-03 12:41:42 +01:00
elweyn	3d8e28e16c	Add comment to update hideAmountGDT.	2023-01-03 10:42:54 +01:00
elweyn	465dc469b0	Add hideAmount to updataUserInfos args & change updateUserInfo method. ... Co-authored-by: ogerly <fridolin@tutanota.com>	2023-01-03 10:13:01 +01:00
Ulf Gebhardt	dcd2ec708d	include logger for error when creation is not successful	2022-12-22 15:56:37 +01:00
Moriz Wahl	8ebea39870	Merge branch 'master' into semaphore	2022-12-22 14:10:57 +01:00
Moriz Wahl	6a36d9afb2	remove console logs	2022-12-22 14:08:32 +01:00
Ulf Gebhardt	d6f08daaae	Merge branch 'semaphore' into test-semaphore	2022-12-21 00:25:03 +01:00
Ulf Gebhardt	32cea45bbf	move timestamp into semaphore transaction lock	2022-12-21 00:24:54 +01:00
Ulf Gebhardt	cf99410971	Merge branch 'semaphore' into test-semaphore	2022-12-21 00:09:03 +01:00
Ulf Gebhardt	55236f1f8e	fix another order by id instead of balanceDate. ... Have the now calculation for contribution links within the semaphore lock	2022-12-21 00:08:46 +01:00
Ulf Gebhardt	2f17ec565e	all tests are running	2022-12-21 00:05:50 +01:00
Hannes Heine	6b2f5153d4	Merge branch 'master' into 2332-mark-contribution-as-rejected	2022-12-20 14:53:48 +01:00
elweyn	853bfabd57	Finish denie logic, add deniedAt IsNull() to queries.	2022-12-20 12:09:59 +01:00
elweyn	dabef05dc0	Change name of user to moderatorUser.	2022-12-20 10:24:27 +01:00
Ulf Gebhardt	ba2ad05088	Merge branch 'semaphore' into test-semaphore	2022-12-15 23:08:31 +01:00
Ulf Gebhardt	5a925c0526	"fixed" semaphore tests	2022-12-15 23:08:19 +01:00
Ulf Gebhardt	f306dddfaf	console logs, fix order by id instead of date	2022-12-15 23:06:29 +01:00
Moriz Wahl	20fbaa276f	feat(backend): test semaphore	2022-12-15 18:35:11 +01:00
Moriz Wahl	d03a3f601c	mock semaphore to allow to use jest fake timers	2022-12-15 17:00:35 +01:00
Moriz Wahl	cb55da5d32	confirming two contributions at once does not throw anymore	2022-12-15 15:58:02 +01:00
Ulf Gebhardt	a8995914f3	Merge branch 'master' into seed-contributions ... # Conflicts: # backend/src/graphql/resolver/AdminResolver.test.ts	2022-12-15 15:40:39 +01:00
Ulf Gebhardt	9537910413	lock also on contributions	2022-12-15 13:07:53 +01:00
Ulf Gebhardt	a98d569fb3	lock also on transactionLink	2022-12-15 13:07:53 +01:00
Ulf Gebhardt	c2c7e34539	share the lock for transactions via external file. Do all possible checks before acquiring the lock	2022-12-15 13:07:53 +01:00
Ulf Gebhardt	1f765bd3f4	fix find last Transaction	2022-12-15 12:41:42 +01:00
Ulf Gebhardt	ef6d697514	Merge branch 'master' into semaphore ... # Conflicts: # backend/src/graphql/resolver/TransactionResolver.ts	2022-12-15 12:02:07 +01:00
Ulf Gebhardt	59b40bf44d	Merge branch 'master' into clear-old-password-junk ... # Conflicts: # backend/src/graphql/resolver/TransactionResolver.ts # backend/src/graphql/resolver/UserResolver.ts	2022-12-15 11:17:45 +01:00
elweyn	10abf45e15	Merge dissolve_admin_resolver to local branch.	2022-12-14 11:04:16 +01:00
Moriz Wahl	35f9157f41	Merge branch 'master' into clear-old-password-junk	2022-12-13 20:52:06 +01:00
Moriz Wahl	1b31d09278	add tests for semaphore	2022-12-13 20:42:20 +01:00
Moriz Wahl	c59a5a3d30	Merge branch 'master' into semaphore	2022-12-13 20:31:36 +01:00
Ulf Gebhardt	330f85e04e	Merge branch 'master' into dissolve_admin_resolver ... # Conflicts: # backend/src/graphql/resolver/AdminResolver.ts	2022-12-13 16:20:30 +01:00
Moriz Wahl	02656ee117	fix tests after merge	2022-12-13 15:49:41 +01:00
Moriz Wahl	98742c0db1	Merge branch 'master' into test-validation-of-optin-codes	2022-12-13 14:57:15 +01:00
elweyn	ca01e34394	Get adminUser and find contribution with specific id.	2022-12-13 10:17:35 +01:00
elweyn	30c72bb734	Setup rejecctContribution method.	2022-12-13 10:10:42 +01:00
Ulf Gebhardt	cc8cabef69	Merge branch 'master' into semaphore ... # Conflicts: # backend/src/graphql/resolver/TransactionResolver.ts	2022-12-13 10:05:20 +01:00
Hannes Heine	4be546c68e	Merge branch 'master' into dissolve_admin_resolver	2022-12-13 09:01:44 +01:00
Moriz Wahl	35c392bbae	adopt unit tests to changes in factory	2022-12-12 14:38:56 +01:00
Ulf Gebhardt	a82e1877a8	Merge branch 'master' into log-client-timezone-offset	2022-12-09 14:14:23 +01:00
Ulf Gebhardt	052f31d8ec	lint	2022-12-09 14:10:46 +01:00
Ulf Gebhardt	7638d29052	merge	2022-12-09 14:09:43 +01:00
Ulf Gebhardt	903fe56f60	Merge branch 'master' into dissolve_admin_resolver ... # Conflicts: # backend/src/graphql/resolver/AdminResolver.test.ts # backend/src/graphql/resolver/AdminResolver.ts # backend/src/graphql/resolver/TransactionResolver.ts # backend/src/graphql/resolver/UserResolver.ts	2022-12-09 14:09:33 +01:00
Ulf Gebhardt	486777cb35	Merge branch 'master' into 2392-refactor-more-emails-to-translatables	2022-12-09 12:59:59 +01:00
Moriz Wahl	61ecfa22fd	Merge branch 'master' into log-client-timezone-offset	2022-12-08 19:13:26 +01:00