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 |
|
|
|
f2dadcd93d
|
Merge branch 'master' into consistent-transaction-table
|
2022-12-13 10:13:34 +01:00 |
|
elweyn
|
30c72bb734
|
Setup rejecctContribution method.
|
2022-12-13 10:10:42 +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 |
|
Moriz Wahl
|
35c392bbae
|
adopt unit tests to changes in factory
|
2022-12-12 14:38:56 +01:00 |
|
Moriz Wahl
|
06b5fa4295
|
refactor(backend): seed contributions as user
|
2022-12-12 14:05:15 +01:00 |
|
Moriz Wahl
|
04c88a743b
|
Merge branch 'master' into consistent-user-contacts-table
|
2022-12-12 13:50:40 +01:00 |
|
Moriz Wahl
|
82d92d9223
|
Merge branch 'consistent-user-contacts-table' into consistent-transaction-table
|
2022-12-12 12:46:46 +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
|
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 |
|
Claus-Peter Hübner
|
9d7891a077
|
Merge remote-tracking branch 'origin/master' into 2420-feature-federation-implement-exchange-of-api-versions-persist-in-table
|
2022-12-06 23:26:56 +01:00 |
|
Claus-Peter Hübner
|
e247439751
|
adapt static test-data, reorg control-flow for received data checkes
|
2022-12-06 23:26:11 +01:00 |
|
Claus-Peter Hübner
|
15e598cf00
|
check for valid federation config settings or exit
|
2022-12-06 23:23:32 +01:00 |
|
Claus-Peter Hübner
|
e3003cc6a0
|
ensure setting FEDERATION_COMMUNTIY_URL to null or with ending '/'
|
2022-12-06 23:22:23 +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 |
|
|
|
bf2e7fb79d
|
await semaphore package
|
2022-12-06 11:24:51 +01:00 |
|
Claus-Peter Hübner
|
3fa4aa9f36
|
detailed tests on received data plus testmode for socket handshake on
sending data
|
2022-12-06 02:02:01 +01:00 |
|
Claus-Peter Hübner
|
c1c4862880
|
add new property FEDERATION_DHT_TEST_SOCKET
|
2022-12-06 02:00:54 +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 |
|
Claus-Peter Hübner
|
0f3b736808
|
Merge remote-tracking branch 'origin/master' into 2420-feature-federation-implement-exchange-of-api-versions-persist-in-table
|
2022-12-02 15:28:50 +01:00 |
|
Claus-Peter Hübner
|
ea6fb28cf8
|
rework PR comments
|
2022-12-02 15:27:26 +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 |
|
|
|
ac578b3f10
|
Merge branch 'master' into dissolve_admin_resolver
|
2022-12-01 21:45:19 +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
|
ed3a76dfdc
|
update database version
|
2022-12-01 16:56:24 +01:00 |
|
Moriz Wahl
|
54c1786406
|
Merge branch 'master' into consistent-user-contacts-table
|
2022-12-01 16:21:53 +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 |
|
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 |
|
Claus-Peter Hübner
|
f7a7049e99
|
linting
|
2022-12-01 01:04:29 +01:00 |
|