13044 Commits

Author SHA1 Message Date
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
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
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
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
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
Alexander Friedland
cbc6018595
Update frontend/src/components/Menu/Sidebar.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-28 14:49:57 +01:00
Alexander Friedland
3a162b358d
Update frontend/src/components/Menu/Sidebar.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-02-28 14:49:45 +01:00
Wolfgang Huß
a8d382b8d7 Fix tests 2023-02-28 14:37:51 +01:00
Wolfgang Huß
1055396d20 Change menu and tab titles in email to the new design 2023-02-28 14:37:41 +01:00
mahula
c236be46e9
Merge pull request #2743 from gradido/naming-of-dht-and-federation-workflow-jobs
ci(other): rename dht node and federation workflow jobs for better branch protection maintenance
2023-02-28 12:22:52 +01:00
039d789c84
Merge branch 'master' into naming-of-dht-and-federation-workflow-jobs 2023-02-28 12:08:55 +01:00
91593ad4bf
Merge pull request #2706 from gradido/combine_listTransactionLinks_and_listTransactionLinksAdmin
refactor(backend): combine logic for `listTransactionLinks` & `listTransactionLinksAdmin`
2023-02-27 22:58:23 +01:00
21b6e35391
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-27 15:53:59 +01:00
5f8702c3c4
catch error for not existing users and test this 2023-02-27 15:44:14 +01:00
ogerly
fc11149f1f add visible event an answer question text in my contribution list 2023-02-27 10:31:10 +01:00
mahula
eb53e5ff16 rename report names in federation and dht workflow 2023-02-24 22:40:07 +01:00
mahula
1f16ae89ca rename federation workflow jobs for github settings 2023-02-24 21:34:51 +01:00
Moriz Wahl
5f54d048d3
Merge pull request #2724 from gradido/remove-adminCreateContributions
refactor(backend): remove admin create contributions
2023-02-24 18:10:59 +01:00
mahula
93735ad3f7 rename dht node workflow jobs for github settings 2023-02-24 17:57:00 +01:00
Moriz Wahl
e2a3ca3c0b
Merge branch 'master' into remove-adminCreateContributions 2023-02-24 14:00:25 +01:00
Moriz Wahl
c0f9f07fd8 remove further mass creations artefacts 2023-02-24 14:00:07 +01:00
ogerly
0faf32b071 rename files after merge :( 2023-02-24 08:17:09 +01:00
Alexander Friedland
7e044f5269
Merge branch 'master' into 2682-Desktop-Sidebar-Style 2023-02-24 07:46:02 +01:00
ogerly
affb0fd2b7 fix test 2023-02-24 07:45:42 +01:00
Hannes Heine
36312450b5
Merge pull request #2725 from gradido/fix-frontend-admin-imports
refactor(frontend): remove .vue as imports
2023-02-24 06:42:42 +01:00
Alexander Friedland
d1caeb7944
Merge branch 'master' into 2682-Desktop-Sidebar-Style 2023-02-23 22:16:42 +01:00
ogerly
47d720e5a2 remove px in sidebar 2023-02-23 22:16:18 +01:00
ogerly
cd9d4b3012 remove unused key in locales 2023-02-23 22:11:27 +01:00
dec47d6dc5
Merge branch 'master' into combine_listTransactionLinks_and_listTransactionLinksAdmin 2023-02-23 22:07:08 +01:00
ogerly
a1b926da71 style sidebar, add icons 2023-02-23 22:01:30 +01:00
75d23c5daf
corrected return type of listTransactionLinks 2023-02-23 21:36:59 +01:00
Moriz Wahl
8205cd4a08
Merge branch 'master' into remove-adminCreateContributions 2023-02-23 16:41:09 +01:00
Hannes Heine
896f949227
Merge branch 'master' into fix-frontend-admin-imports 2023-02-23 16:01:41 +01:00
clauspeterhuebner
63c5407517
Merge pull request #2729 from gradido/2728-devops-adapt-config-and-scripts-for-federation-modules
feat(federation): add dht-node to deployment scripts
2023-02-23 15:28:04 +01:00
2b513eb9c4
Merge branch 'master' into remove-adminCreateContributions 2023-02-23 14:42:30 +01:00
Claus-Peter Hübner
b070ef5504 conditional dht-node start with message 2023-02-22 21:30:32 +01:00
Claus-Peter Hübner
9966a06630 conditional start of dht-node 2023-02-22 21:14:34 +01:00
clauspeterhuebner
fffb5fc9b3
Merge branch 'master' into 2728-devops-adapt-config-and-scripts-for-federation-modules 2023-02-22 14:11:31 +01:00
Alexander Friedland
02cdcf8751
Merge pull request #2718 from gradido/2708-button-for-chat-with-moderator-incorrect-fetch
fix(frontend): change fetchPolicy, add scripts.update
2023-02-22 09:12:21 +01:00
Alexander Friedland
05ad93a36e
Merge branch 'master' into 2708-button-for-chat-with-moderator-incorrect-fetch 2023-02-22 08:35:08 +01:00
Claus-Peter Hübner
e6291c7dd4 solve error returning ownApiList 2023-02-21 23:56:26 +01:00
Claus-Peter Hübner
d37714b468 config changes 2023-02-21 23:02:46 +01:00
Claus-Peter Hübner
93d07ca4d1 add dht-node to deployment scripts 2023-02-21 22:29:44 +01:00
Moriz Wahl
bee05397d2 fix test 2023-02-21 15:28:18 +01:00