11455 Commits

Author SHA1 Message Date
Moriz Wahl
1229a7f7df change database version 2022-12-13 22:14:06 +01:00
Moriz Wahl
0bcd441837 rename migrations and entity number 2022-12-13 21:26:32 +01:00
joseji
9b97b6c40e removed text files regarding passphrase 2022-12-13 21:16:57 +01:00
Moriz Wahl
b52c62749c include user contact in user context object 2022-12-13 21:07:12 +01:00
Moriz Wahl
7b8d4e5c85 update database version 2022-12-13 20:54:07 +01:00
Moriz Wahl
35f9157f41 Merge branch 'master' into clear-old-password-junk 2022-12-13 20:52:06 +01:00
Moriz Wahl
6e766fa76c
Merge pull request #2418 from gradido/test-validation-of-optin-codes
fix(backend): email verification code never expired
2022-12-13 16:17:03 +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
Moriz Wahl
907cd03ab8
Merge pull request #2451 from gradido/consistent-user-contacts-table
fix(database): consistent deleted at bewteen users and user contacts
2022-12-12 14:58:51 +01:00
Moriz Wahl
04c88a743b
Merge branch 'master' into consistent-user-contacts-table 2022-12-12 13:50:40 +01:00
Moriz Wahl
61899579aa
Merge pull request #2454 from gradido/log-client-timezone-offset
feat(backend): log client timezone offset
2022-12-12 12:45:47 +01:00
Moriz Wahl
c449e41cfb update only by SQL, thanks @ulfgebhardt 2022-12-12 12:45:17 +01:00
a82e1877a8
Merge branch 'master' into log-client-timezone-offset 2022-12-09 14:14:23 +01:00
Wolfgang Huß
70a3b1bc7e
Merge pull request #2398 from gradido/2392-refactor-more-emails-to-translatables
refactor(backend): refactor more emails to translatables
2022-12-09 13:12:55 +01:00
486777cb35
Merge branch 'master' into 2392-refactor-more-emails-to-translatables 2022-12-09 12:59:59 +01:00
Moriz Wahl
effa58d767
Merge pull request #2444 from gradido/fix-delete-email-contact
fix(backend): delete / undelete email contact as well
2022-12-08 19:47:29 +01:00
Moriz Wahl
61ecfa22fd
Merge branch 'master' into log-client-timezone-offset 2022-12-08 19:13:26 +01:00
Moriz Wahl
c8fa84ac11
Merge branch 'master' into consistent-user-contacts-table 2022-12-08 19:12:49 +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
Hannes Heine
4794ca61c1
Merge pull request #2363 from gradido/2285-mark-creation-via-link
feat(backend): 🍰 Mark creation via link
2022-12-06 12:34:41 +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
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
elweyn
3ba591637c Remove unused method. 2022-12-02 07:32:08 +01:00
Moriz Wahl
2caa0ad4c9
Merge branch 'master' into 2285-mark-creation-via-link 2022-12-01 18:46:24 +01:00
Moriz Wahl
d3678bb81c feat(backend): log client timezone offset 2022-12-01 17:44:56 +01:00
Moriz Wahl
54c1786406
Merge branch 'master' into consistent-user-contacts-table 2022-12-01 16:21:53 +01:00
Moriz Wahl
e458a7dd8d
Merge pull request #2452 from gradido/fix-jest-run-all-timeers
fix(backend): run all timers for high values
2022-12-01 16:21:37 +01:00
Moriz Wahl
41495c2c65 fix(backend): run all timers for high values 2022-12-01 15:53:09 +01:00
elweyn
0b2887b86f Correct joins between contribution and transaction 2022-12-01 15:21:49 +01:00
Moriz Wahl
7f1e69c1bd update database version 2022-12-01 14:52:08 +01:00
Moriz Wahl
4a27fa07f0 fix(database): consistent deleted at bewteen users and user contacts 2022-12-01 14:49:56 +01:00
elweyn
ec396e8521 Merge master. 2022-12-01 12:45:15 +01:00
elweyn
96fd4cb14c Merge branch 'master' into 2285-mark-creation-via-link 2022-12-01 12:07:52 +01:00
elweyn
46014adc6d Database join contribution to transaction table, add new join to query. 2022-12-01 12:07:25 +01:00
Moriz Wahl
a91158a963
Merge pull request #2443 from gradido/fix-negative-amount-on-send-coins
fix(backend): critical bug
2022-11-30 20:40:59 +01:00
Moriz Wahl
272c7ee491
Merge branch 'master' into fix-negative-amount-on-send-coins 2022-11-30 18:04:26 +01:00
bed31ab3ec
Merge pull request #2442 from gradido/fix_docker_production_build
fix(other): missing files for docker production build
2022-11-30 17:18:29 +01:00
Moriz Wahl
796f5af2c6 remove unused function, count resent by admin 2022-11-30 14:45:02 +01:00
Moriz Wahl
bbd163f1e0 integrate export const checkEmailVerificationCode = async ( 2022-11-30 14:34:09 +01:00
Moriz Wahl
10781b2e6b Merge branch 'master' into test-validation-of-optin-codes 2022-11-30 14:15:21 +01:00
Moriz Wahl
bc20bfa8f6 fix(backend): delete / undelete email contact as well 2022-11-30 12:46:46 +01:00
Moriz Wahl
c0096aa26c fix(backend): critical bug 2022-11-30 12:15:47 +01:00