13355 Commits

Author SHA1 Message Date
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
Alexander Friedland
370bb323c7
Merge branch 'master' into 2710-delete-own-post-in-admin-interface-remove-icon 2023-03-01 10:32:22 +01:00
ogerly
2f75b131ad fix lint 2023-03-01 09:20:54 +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
Claus-Peter Hübner
0ee62ef644 additional replacement step 2023-03-01 02:40:22 +01:00
Claus-Peter Hübner
780ece56c5 change include back to EnvVar-Replacement 2023-03-01 02:36:04 +01:00
Claus-Peter Hübner
90887b1abe define .env-files 2023-03-01 02:33:11 +01:00
Claus-Peter Hübner
192d052089 include gradido-federation.conf 2023-03-01 02:27:19 +01:00
Claus-Peter Hübner
25634a9cfa keep gradido-federation.conf files 2023-03-01 02:19:20 +01:00
Claus-Peter Hübner
1e960cbd83 correct gradido-federation.conf replacements 2023-03-01 02:13:26 +01:00
Claus-Peter Hübner
7f12bf759d change dir before nginx restart 2023-03-01 01:52:44 +01:00
Claus-Peter Hübner
b1a6fcdb42 adapt federation config files 2023-03-01 01:23:28 +01:00
Claus-Peter Hübner
aaf4c9748c correct migration downgrade by delete communities entries with
last_announced_at is null
2023-03-01 00:57:52 +01:00
Claus-Peter Hübner
876bc91d93 correct migration downgrade by delete communities entries with
last_announced_at is null
2023-03-01 00:46:58 +01:00
Claus-Peter Hübner
c7c4f52816 correct migration downgrade by delete communities entries with
last_announced_at is null
2023-03-01 00:42:49 +01:00
Claus-Peter Hübner
6ea9cc39a9 small changes 2023-03-01 00:34:44 +01:00
Claus-Peter Hübner
e80c170c32 change logoutput 2023-03-01 00:33:42 +01:00
Claus-Peter Hübner
bf099845a1 beautify configs 2023-03-01 00:33:10 +01:00
Claus-Peter Hübner
b7ac341a0d modify nginx config for federation modules 2023-02-28 23:27:21 +01:00
Claus-Peter Hübner
fc08dcd896 modify nginx config for federation modules 2023-02-28 23:20:54 +01:00
Claus-Peter Hübner
c14eec061a modify nginx config for federation modules 2023-02-28 23:19:20 +01:00
Claus-Peter Hübner
757053b735 modify nginx config for federation modules 2023-02-28 23:07:16 +01:00
Claus-Peter Hübner
b333bb0b06 modify nginx config for federation modules 2023-02-28 22:59:07 +01:00
Alexander Friedland
b3cfc6d918
Update admin/src/components/Tables/OpenCreationsTable.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-28 21:40:35 +01:00
Alexander Friedland
815e06f8da
Update admin/src/components/Tables/OpenCreationsTable.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-28 21:40:20 +01:00
Alexander Friedland
8047dbf544
Update admin/src/components/Tables/OpenCreationsTable.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-28 21:40:09 +01:00
Alexander Friedland
2c1c4ede75
Update admin/src/components/Tables/OpenCreationsTable.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-28 21:39:56 +01:00
Alexander Friedland
215bf45169
Update admin/src/components/Tables/OpenCreationsTable.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-28 21:39:45 +01:00
Alexander Friedland
9eb42e0a41
Update admin/src/components/Tables/OpenCreationsTable.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-28 21:39:18 +01:00
Moriz Wahl
ed7cf461fb fix(backend): set email tls true in test 2023-02-28 21:06:51 +01:00
Moriz Wahl
92e072652f change list contribution query to status filter 2023-02-28 20:37:32 +01:00
Moriz Wahl
e4a9533802 refactor(backend): use find contributions helper in list contributions 2023-02-28 20:36:23 +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
Alexander Friedland
134c04a325
Merge branch 'master' into 2710-delete-own-post-in-admin-interface-remove-icon 2023-02-28 18:57:49 +01:00
ogerly
91c1db0c1c event buttons for myself turned off in open contributions 2023-02-28 18:55:26 +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