1751 Commits

Author SHA1 Message Date
elweyn
2010a1b059 Add hideAmountGDD and hideAmountGDT to the login mutations and the verifyLogin queries 2023-01-03 12:24:49 +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
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
d6f08daaae
Merge branch 'semaphore' into test-semaphore 2022-12-21 00:25:03 +01:00
32cea45bbf
move timestamp into semaphore transaction lock 2022-12-21 00:24:54 +01:00
cf99410971
Merge branch 'semaphore' into test-semaphore 2022-12-21 00:09:03 +01:00
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
2f17ec565e
all tests are running 2022-12-21 00:05:50 +01:00
ba2ad05088
Merge branch 'semaphore' into test-semaphore 2022-12-15 23:08:31 +01:00
5a925c0526
"fixed" semaphore tests 2022-12-15 23:08:19 +01:00
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
9537910413
lock also on contributions 2022-12-15 13:07:53 +01:00
a98d569fb3
lock also on transactionLink 2022-12-15 13:07:53 +01:00
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
1f765bd3f4
fix find last Transaction 2022-12-15 12:41:42 +01:00
ef6d697514
Merge branch 'master' into semaphore
# Conflicts:
#	backend/src/graphql/resolver/TransactionResolver.ts
2022-12-15 12:02:07 +01:00
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
Moriz Wahl
b52c62749c include user contact in user context object 2022-12-13 21:07:12 +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
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
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
a82e1877a8
Merge branch 'master' into log-client-timezone-offset 2022-12-09 14:14:23 +01:00
052f31d8ec
lint 2022-12-09 14:10:46 +01:00
7638d29052
merge 2022-12-09 14:09:43 +01:00
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
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
Moriz Wahl
3051d8f070
Merge branch 'master' into fix-delete-email-contact 2022-12-08 19:11:18 +01:00
Moriz Wahl
cbb688112f
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-12-08 19:11:09 +01:00
Moriz Wahl
bd3f05d6c8
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-12-08 19:11:01 +01:00
Moriz Wahl
7174bec2f3
Merge branch 'master' into test-validation-of-optin-codes 2022-12-08 19:10:21 +01:00
joseji
9604a6309a found more and more junk everywhere, almost cleared 2022-12-06 22:31:15 +01:00
elweyn
d52f7f9590 change transactionLinkId to linkId. 2022-12-06 12:20:21 +01:00
elweyn
ffb5988760 Refactoring of some small smelling code. 2022-12-06 11:58:17 +01:00
7c528d5f9b
use semaphore to lock transactions 2022-12-06 11:25:37 +01:00
20146908fa
Merge branch 'master' into test-validation-of-optin-codes 2022-12-05 12:13:51 +01:00
9f6038b748
Merge branch 'master' into fix-delete-email-contact 2022-12-05 12:00:55 +01:00
80d3a7bb18
Merge branch 'master' into 2392-refactor-more-emails-to-translatables 2022-12-02 11:59:03 +01:00
ac578b3f10
Merge branch 'master' into dissolve_admin_resolver 2022-12-01 21:45:19 +01:00