Alexander Friedland
|
59ecc14b29
|
Merge branch 'master' into 2519-new-design-for-settings-and-profile
|
2023-06-30 15:46:20 +02:00 |
|
Moriz Wahl
|
e60b7dcc83
|
Merge pull request #3094 from gradido/query-users-on-contributions
feat(admin): query users on contributions
|
2023-06-30 15:43:08 +02:00 |
|
ogerly
|
0ecc0bca3d
|
fix test UserName.spec.js
|
2023-06-30 15:36:26 +02:00 |
|
Moriz Wahl
|
cc49a85e3d
|
Merge branch 'master' into query-users-on-contributions
|
2023-06-30 15:17:36 +02:00 |
|
Moriz Wahl
|
7445fe2caa
|
Merge pull request #3091 from gradido/user-query-on-find-contributions
feat(backend): user query on find contributions
|
2023-06-30 15:17:16 +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 |
|
Hannes Heine
|
50d3fe1ac3
|
Merge pull request #3093 from gradido/2789-double-redeem-transaction-link
fix(backend): double redeem transaction link
|
2023-06-30 12:23:42 +02:00 |
|
ogerly
|
537573ca94
|
fix test src/components/UserSettings/UserName.spec.js
|
2023-06-30 12:00:16 +02:00 |
|
elweyn
|
db74bf0778
|
Fix error that resulted of merge conflict
|
2023-06-30 11:44:19 +02:00 |
|
Hannes Heine
|
52fa4cea98
|
Merge branch 'master' into 2789-double-redeem-transaction-link
|
2023-06-30 11:24:23 +02:00 |
|
mahula
|
5656e48141
|
Merge pull request #3073 from gradido/message-type-admin-frontend
feat(admin): message type admin frontend
|
2023-06-30 11:18:23 +02:00 |
|
Hannes Heine
|
a4ca612604
|
Merge branch 'master' into 2789-double-redeem-transaction-link
|
2023-06-30 10:58:13 +02:00 |
|
mahula
|
c9e4d09c6e
|
Merge branch 'master' into message-type-admin-frontend
|
2023-06-30 10:50:18 +02:00 |
|
mahula
|
3544189c2f
|
Merge pull request #3077 from gradido/3053-featureend-to-end-forgot-password-of-deleted-user
feat(other): end-to-end test scenarios for deleted and not registered user
|
2023-06-30 10:49:54 +02:00 |
|
ogerly
|
0dc978cc68
|
test step 2
|
2023-06-30 10:49:06 +02:00 |
|
Alexander Friedland
|
3e32ffa123
|
Merge branch 'master' into 2519-new-design-for-settings-and-profile
|
2023-06-30 10:48:57 +02:00 |
|
ogerly
|
c9c328518c
|
fix test ContributionMessagesList.spec.js
|
2023-06-30 10:42:26 +02:00 |
|
mahula
|
fa7db05a76
|
Merge branch 'master' into 3053-featureend-to-end-forgot-password-of-deleted-user
|
2023-06-30 10:24:07 +02:00 |
|
ogerly
|
a5dae526fc
|
refactor names state to status
|
2023-06-30 10:07:24 +02:00 |
|
Moriz Wahl
|
3f0b4d88af
|
test user query
|
2023-06-29 16:28:33 +02:00 |
|
Moriz Wahl
|
99690c15d6
|
user search uses user query component
|
2023-06-29 16:23:38 +02:00 |
|
Moriz Wahl
|
5e559d46e2
|
add query variable to unit tests
|
2023-06-29 16:19:05 +02:00 |
|
Moriz Wahl
|
ad3c233ce1
|
feat(admin): query users on contributions
|
2023-06-29 16:14:37 +02:00 |
|
Moriz Wahl
|
7462e6f36e
|
sort locales
|
2023-06-29 16:01:32 +02:00 |
|
Moriz Wahl
|
0c96c76d32
|
add moderatorId to avoid schema warnings
|
2023-06-29 15:47:41 +02:00 |
|
Moriz Wahl
|
a2d17ba509
|
refactor apollo query, improved test
|
2023-06-29 15:40:19 +02:00 |
|
Moriz Wahl
|
b898ca62d3
|
use data test for button selectors
|
2023-06-29 15:03:37 +02:00 |
|
Moriz Wahl
|
58b5a0afc6
|
test submit MODERATOR message type
|
2023-06-29 15:00:46 +02:00 |
|
Moriz Wahl
|
2099322ef4
|
improve test for API call
|
2023-06-29 14:55:30 +02:00 |
|
Moriz Wahl
|
b56d7a7d2e
|
Merge branch 'master' into message-type-admin-frontend
|
2023-06-29 14:47:37 +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
|
a43cb6a3f6
|
Merge pull request #3078 from gradido/update-typeorm
feat(database): update typeorm
|
2023-06-29 13:45:36 +02:00 |
|
Moriz Wahl
|
3ed9adfc73
|
Merge branch 'master' into update-typeorm
|
2023-06-29 12:28:05 +02:00 |
|
ogerly
|
5b91a4f175
|
fix test username
|
2023-06-29 12:25:03 +02:00 |
|
mahula
|
1526ed9477
|
Merge pull request #3092 from gradido/disable-cypress-retries
refactor(other): disable cypress test retries
|
2023-06-29 12:18:01 +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 |
|
mahula
|
00c15a9c18
|
fix linting
|
2023-06-29 11:45:59 +02:00 |
|
mahula
|
b67ab14b0e
|
Merge branch 'master' into disable-cypress-retries
|
2023-06-29 11:39:00 +02:00 |
|
mahula
|
b4d54cfc64
|
refactor e2e email step definition
|
2023-06-29 10:12:25 +02:00 |
|
mahula
|
9f8a7f779f
|
Merge pull request #3056 from gradido/update-cypress
test(other): update cypress
|
2023-06-29 09:06:45 +02:00 |
|
mahula
|
938cfcc89a
|
Merge branch 'master' into update-cypress
|
2023-06-29 08:33:28 +02:00 |
|
Hannes Heine
|
70217d5fa7
|
Merge pull request #3051 from gradido/2878-trigger-export-klicktipp
feat(other): add definition of cron-job for klicktipp export.
|
2023-06-29 08:27:49 +02:00 |
|
Hannes Heine
|
74bfc5d065
|
Merge branch 'master' into 2878-trigger-export-klicktipp
|
2023-06-29 07:51:29 +02:00 |
|
mahula
|
1b335f00ec
|
set cypress test retries to 0
|
2023-06-28 20:36:33 +02:00 |
|
mahula
|
7b39a08232
|
Merge branch 'master' into 3053-featureend-to-end-forgot-password-of-deleted-user
|
2023-06-28 17:34:38 +02:00 |
|
|
|
b1036c9d5b
|
Merge pull request #3090 from gradido/fix-forget-password-deleted-user
fix(backend): forget password not for deleted users
|
2023-06-28 16:49:50 +02:00 |
|
