3788 Commits

Author SHA1 Message Date
elweyn
b07cd9d284 Set both parallel mutation in a promise.all block. 2023-07-09 10:01:39 +02:00
4e7c2d73ed
Merge branch 'master' into federation-fix-database-public-key-length 2023-07-06 13:46:12 +02:00
11057c48f0
v.1.22.3 2023-07-06 11:28:06 +02:00
6a440e18b5
fix email link to have correct url text 2023-07-06 11:07:57 +02:00
5657798016
fix snapshot 2023-07-06 11:03:34 +02:00
caf1b8e9d8
fix email-link 2023-07-06 10:51:59 +02:00
elweyn
6571d9aaf2 chore(release): v1.22.2 2023-07-06 09:18:17 +02:00
89c2c1c778
english typo 2023-07-06 02:08:17 +02:00
960252e9fc
fix comment, typo 2023-07-06 02:07:02 +02:00
elweyn
e228d8b3e7 Correct the test message. 2023-07-05 12:56:29 +02:00
604d67dd63
lint 2023-07-05 11:08:23 +02:00
f5a761c769
implicitly test for messagescounts to be correct when moderator message is present(not shown on listContributions) 2023-07-05 11:07:45 +02:00
e6f18f718b
fix linting 2023-07-05 10:41:55 +02:00
ff03b05e5e
test case for Moderation Contribution message does not change contribution status, normal message does 2023-07-05 10:41:12 +02:00
69ae2e91f0
fix message count on moderator message contributions (filter out MODERATOR messages) 2023-07-05 09:37:35 +02:00
d1ba7c7f41
do not change contribution status on moderator message 2023-07-05 09:05:20 +02:00
mahula
1b2b261dd4 chore(release): v1.22.1 2023-07-04 11:36:40 +02:00
mahula
c021295a9d
Merge branch 'master' into 3112-bugbackend-email-links-of-stage2-send-to-production 2023-07-04 10:22:48 +02:00
mahula
8cc7025bb4 add snapshot for email template testing 2023-07-04 10:05:35 +02:00
Einhornimmond
98d1002011 remove all traces of iota 2023-07-03 14:09:18 +02:00
mahula
83a5c64d6c fix url in email templates 2023-07-03 13:29:21 +02:00
mahula
89759f607e remove email template snapshot 2023-07-03 13:28:36 +02:00
mahula
6de04bce77 use base url from config in email templates 2023-07-03 12:47:08 +02:00
elweyn
0b4d7181be Check that the message type is not MODERATOR before sending email. 2023-07-01 11:54:24 +02:00
elweyn
000ac24865 Test that their is no email send after a moderator message. 2023-07-01 11:53:54 +02:00
Hannes Heine
7d7d660d8c
Merge branch 'master' into federation-fix-database-public-key-length 2023-06-30 22:11:07 +02:00
a8a751a9f0
v1.22.0 2023-06-30 19:52:03 +02:00
Hannes Heine
8a041a0f59
Merge branch 'master' into federation-fix-database-public-key-length 2023-06-30 19:15:09 +02:00
Hannes Heine
d045880aaf
Merge branch 'master' into fix-yarn-lock 2023-06-30 18:27:38 +02:00
Alexander Friedland
59ecc14b29
Merge branch 'master' into 2519-new-design-for-settings-and-profile 2023-06-30 15:46:20 +02:00
4a9568a99d
Merge branch 'master' into federation-fix-database-public-key-length 2023-06-30 15:44:01 +02:00
Moriz Wahl
3486a95f19
Merge branch 'master' into user-query-on-find-contributions 2023-06-30 14:44:30 +02:00
Moriz Wahl
ef461dc969
Update backend/src/graphql/resolver/util/findContributions.ts
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2023-06-30 14:32:09 +02:00
751bac018a
yarn lock updated after typeorm upgrade 2023-06-30 14:26:39 +02:00
dd87313d41
Merge branch 'master' into federation-fix-database-public-key-length 2023-06-30 13:07:42 +02:00
elweyn
db74bf0778 Fix error that resulted of merge conflict 2023-06-30 11:44:19 +02:00
Hannes Heine
a4ca612604
Merge branch 'master' into 2789-double-redeem-transaction-link 2023-06-30 10:58:13 +02:00
Alexander Friedland
3e32ffa123
Merge branch 'master' into 2519-new-design-for-settings-and-profile 2023-06-30 10:48:57 +02:00
Moriz Wahl
6030ca0898 change state to status 2023-06-29 14:41:07 +02:00
Moriz Wahl
91fa7bfbfd
Merge branch 'master' into user-query-on-find-contributions 2023-06-29 13:45:53 +02:00
Moriz Wahl
3ed9adfc73
Merge branch 'master' into update-typeorm 2023-06-29 12:28:05 +02:00
elweyn
8c9b4614b2 Surrond the check if link is correct with the new semafore. 2023-06-29 12:12:49 +02:00
elweyn
74ce9b3067 Create a semafore lock for transaction links. 2023-06-29 12:09:42 +02:00
elweyn
77b7d5b414 Expect to receive an error on second call. 2023-06-29 12:09:07 +02:00
e05e4cbf37
Merge branch 'master' into fix-forget-password-deleted-user 2023-06-28 15:11:03 +02:00
Moriz Wahl
7192b666ee test user query on find contribbutions 2023-06-28 14:36:33 +02:00
3d4ee1de9f
Merge branch 'master' into fix-gdt-error 2023-06-28 14:35:55 +02:00
Moriz Wahl
32b6b0bee9 add query to find contributions, change relations to object notation 2023-06-28 14:26:46 +02:00
Moriz Wahl
abe1d1b71f remove unused file 2023-06-28 13:56:08 +02:00
Moriz Wahl
d81d0cbd53 undo query changes 2023-06-28 13:08:41 +02:00