Moriz Wahl
|
2adf6b32b0
|
Merge pull request #2759 from gradido/deleted-contributions-in-admin-interface
feat(admin): deleted contributions visible
|
2023-03-02 18:46:09 +01:00 |
|
Hannes Heine
|
1c312488a4
|
Merge branch 'master' into deleted-contributions-in-admin-interface
|
2023-03-02 15:29:43 +01:00 |
|
Hannes Heine
|
d8c5f889d6
|
Merge pull request #2753 from gradido/2421-feature-user-story-finish-up-register
feat(other): e2e test user story user registration
|
2023-03-02 15:27:38 +01:00 |
|
mahula
|
4ac23c29e4
|
Merge branch 'master' into 2421-feature-user-story-finish-up-register
|
2023-03-02 15:12:22 +01:00 |
|
mahula
|
cc8c671241
|
Merge pull request #2648 from gradido/2562-style-and-design-changes-to-a-contribution
refactor(frontend): style and design changes to a contribution
|
2023-03-02 15:10:36 +01:00 |
|
Hannes Heine
|
ed36e99d3a
|
Merge branch 'master' into 2562-style-and-design-changes-to-a-contribution
|
2023-03-02 14:55:03 +01:00 |
|
mahula
|
e360212b58
|
upgrade cypress to v12.7.0
|
2023-03-02 14:38:28 +01:00 |
|
mahula
|
4136592f11
|
upgrade cypress to v12.7.0
|
2023-03-02 14:31:08 +01:00 |
|
Hannes Heine
|
6300e08de0
|
Merge pull request #2740 from gradido/2689-test-email-send-deny-deleted-contribution
test(backend): add tests that ``sendContributionDeleted`` and ``sendContributionDenied`` are called
|
2023-03-02 14:24:34 +01:00 |
|
mahula
|
b84bf9c868
|
set test workflow triggers back to push
|
2023-03-02 14:15:43 +01:00 |
|
Hannes Heine
|
8c2260719c
|
Merge branch 'master' into 2689-test-email-send-deny-deleted-contribution
|
2023-03-02 14:11:37 +01:00 |
|
mahula
|
567961947c
|
set timeout instead of wait in email step definition
|
2023-03-02 13:52:10 +01:00 |
|
mahula
|
10c7e8e2de
|
refactor email step definitions
|
2023-03-02 13:50:12 +01:00 |
|
Moriz Wahl
|
9b6b298f40
|
Merge pull request #2763 from gradido/set-EMAIL_TLS-true
fix(backend): set email tls true in test
|
2023-03-02 13:40:53 +01:00 |
|
mahula
|
d66356c040
|
refactor email step definitions
|
2023-03-02 13:26:58 +01:00 |
|
Alexander Friedland
|
7da4c99ad4
|
Merge branch 'master' into 2562-style-and-design-changes-to-a-contribution
|
2023-03-02 12:58:39 +01:00 |
|
Alexander Friedland
|
29b2bbe30c
|
Update frontend/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2023-03-02 12:58:29 +01:00 |
|
Alexander Friedland
|
c579acd31e
|
Update frontend/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2023-03-02 12:58:20 +01:00 |
|
mahula
|
86286023fa
|
add registration test to e2e test job in workflow
|
2023-03-02 10:54:18 +01:00 |
|
mahula
|
77ee852c1a
|
refactor e2e test register scenario
|
2023-03-02 10:53:21 +01:00 |
|
mahula
|
2ded17348a
|
refactor naming in reset password page model
|
2023-03-02 10:52:24 +01:00 |
|
mahula
|
84b031c967
|
rewrite registration scenarion to use the email steps
|
2023-03-02 10:00:26 +01:00 |
|
mahula
|
fede39f308
|
correct method call in step definition
|
2023-03-02 09:59:18 +01:00 |
|
mahula
|
48cede9222
|
add email step definition for registration test
|
2023-03-02 09:53:47 +01:00 |
|
Moriz Wahl
|
455c60d232
|
Merge branch 'master' into set-EMAIL_TLS-true
|
2023-03-02 09:35:17 +01:00 |
|
Alexander Friedland
|
2cda1abc7b
|
Merge pull request #2750 from gradido/2613-Answer-moderator-question-clickable
refactor(frontend): add visible event an answer question
|
2023-03-01 17:43:50 +01:00 |
|
Hannes Heine
|
d2afaad938
|
Merge branch 'master' into 2689-test-email-send-deny-deleted-contribution
|
2023-03-01 17:06:09 +01:00 |
|
Alexander Friedland
|
69aa1fae73
|
Merge branch 'master' into 2613-Answer-moderator-question-clickable
|
2023-03-01 15:50:35 +01:00 |
|
Alexander Friedland
|
0a6075a86f
|
Merge pull request #2737 from gradido/2682-Desktop-Sidebar-Style
refactor(frontend): style sidebar, add icons
|
2023-03-01 15:13:34 +01:00 |
|
Alexander Friedland
|
5df9aecef4
|
Merge branch 'master' into 2682-Desktop-Sidebar-Style
|
2023-03-01 14:43:41 +01:00 |
|
Alexander Friedland
|
37a2dcb6be
|
Merge branch 'master' into 2613-Answer-moderator-question-clickable
|
2023-03-01 10:51:22 +01:00 |
|
mahula
|
6ec9d9120e
|
Merge branch 'master' into set-EMAIL_TLS-true
|
2023-03-01 10:45:50 +01:00 |
|
Moriz Wahl
|
63fda2fe65
|
Merge pull request #2761 from gradido/fix-possible-flaky-test
fix(backend): possible flaky test
|
2023-03-01 09:17:29 +01:00 |
|
elweyn
|
9fc1e45ed0
|
Merge branch '2689-test-email-send-deny-deleted-contribution' of https://github.com/gradido/gradido into 2689-test-email-send-deny-deleted-contribution
|
2023-03-01 05:21:03 +01:00 |
|
elweyn
|
becd9e44ea
|
Remove await before sendContributionDeletedEmail
|
2023-03-01 05:20:25 +01:00 |
|
elweyn
|
3a6b701d3b
|
Reduce mock of emails sendEmailVariant.
|
2023-03-01 05:16:37 +01:00 |
|
Hannes Heine
|
bfbf7954e3
|
Merge branch 'master' into 2689-test-email-send-deny-deleted-contribution
|
2023-03-01 05:03:44 +01:00 |
|
Moriz Wahl
|
ed7cf461fb
|
fix(backend): set email tls true in test
|
2023-02-28 21:06:51 +01:00 |
|
Moriz Wahl
|
be048be032
|
fix(backend): possible flaky test
|
2023-02-28 19:53:35 +01:00 |
|
Alexander Friedland
|
ea99826faf
|
Merge branch 'master' into 2613-Answer-moderator-question-clickable
|
2023-02-28 18:58:55 +01:00 |
|
Wolfgang Huß
|
252ac67740
|
Merge pull request #2756 from gradido/2752-emails-adjust-namings-of-menus-to-new-design
fix(backend): emails – adjust namings of menus to new design
|
2023-02-28 18:49:30 +01:00 |
|
Moriz Wahl
|
cfac7a81d6
|
improved spec for refetch after filter updates
|
2023-02-28 18:44:52 +01:00 |
|
Moriz Wahl
|
0a13a78172
|
use correct locale
|
2023-02-28 18:34:24 +01:00 |
|
Moriz Wahl
|
a811b2bf2d
|
rename query file and query, update specs
|
2023-02-28 18:28:52 +01:00 |
|
Moriz Wahl
|
457cea4619
|
add deleted contribution table
|
2023-02-28 17:20:56 +01:00 |
|
Moriz Wahl
|
f83c364d1d
|
feat(admin): deleted contributions visible
|
2023-02-28 17:19:12 +01:00 |
|
Alexander Friedland
|
f868664f46
|
Update frontend/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2023-02-28 14:59:26 +01:00 |
|
Alexander Friedland
|
1655c9ae56
|
Update frontend/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2023-02-28 14:59:14 +01:00 |
|
Wolfgang Huß
|
8ff5f21ade
|
Merge branch 'master' into 2752-emails-adjust-namings-of-menus-to-new-design
|
2023-02-28 14:57:42 +01:00 |
|
Alexander Friedland
|
215a77a2dc
|
Update frontend/src/components/Menu/Sidebar.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2023-02-28 14:52:41 +01:00 |
|