13221 Commits

Author SHA1 Message Date
Hannes Heine
c7e7595f18
Merge pull request #2810 from gradido/fix-click-answer-question
fix(frontend): admin question clickable
2023-03-10 08:59:18 +01:00
Hannes Heine
b8f97e0b71
Merge branch 'master' into fix-click-answer-question 2023-03-10 08:33:33 +01:00
Hannes Heine
cb4085beca
Merge pull request #2809 from gradido/fix-send-svg-to-icon
refactor(frontend): change b-img to b-icon send
2023-03-10 08:32:59 +01:00
elweyn
ef3a9c16b2 Removed code reintroduced. 2023-03-10 08:31:15 +01:00
elweyn
8a3d66861e Change b-img to b-icon send. 2023-03-10 08:02:25 +01:00
Hannes Heine
8d12978fea
Merge pull request #2806 from gradido/2802-update-store
fix(admin): update openCreation in case of tab open.
2023-03-09 21:17:48 +01:00
Hannes Heine
3ec72b28eb
Merge branch 'master' into 2802-update-store 2023-03-09 21:04:46 +01:00
2f6c5b92a9
Merge pull request #2804 from gradido/fix-english-language-admin-creations
fix(admin): english language for contributions in admin
2023-03-09 20:32:51 +01:00
elweyn
fe560ff319 Change openCreation in case of tab open. 2023-03-09 20:19:01 +01:00
e7f7b9b164
fix english language for contributions in admin 2023-03-09 20:13:54 +01:00
Hannes Heine
3191b3333a
Merge pull request #2760 from gradido/2710-delete-own-post-in-admin-interface-remove-icon
refactor(admin): event buttons for myself turned off in open contributions
2023-03-09 19:12:25 +01:00
Moriz Wahl
8f6c3d45aa a element at button match 2023-03-09 18:59:05 +01:00
elweyn
780f18f32b Remove propsData 2023-03-09 18:40:29 +01:00
elweyn
44214e9657 Change following test of tab confirmed. 2023-03-09 18:38:17 +01:00
elweyn
52cc4e54bd Remove clearAllMocks for 'open' 2023-03-09 18:24:02 +01:00
elweyn
75e06d46e4 Merge master. 2023-03-09 18:06:05 +01:00
elweyn
4c34f0933d Unit test moved. 2023-03-09 18:02:49 +01:00
Hannes Heine
4b90072608
Merge pull request #2794 from gradido/2787-fix-contribution-tab-textes
fix(admin): contribution page
2023-03-09 17:58:47 +01:00
elweyn
e7c6ecb9a1 Merge branch '2710-delete-own-post-in-admin-interface-remove-icon' of https://github.com/gradido/gradido into 2710-delete-own-post-in-admin-interface-remove-icon 2023-03-09 16:24:29 +01:00
elweyn
a0c7ad827f Merge branch 'master' into 2710-delete-own-post-in-admin-interface-remove-icon 2023-03-09 16:24:05 +01:00
elweyn
17e19debad Fix unit test. 2023-03-09 16:18:37 +01:00
elweyn
723cb4f238 Merge branch '2787-fix-contribution-tab-textes' of https://github.com/gradido/gradido into 2787-fix-contribution-tab-textes 2023-03-09 16:12:45 +01:00
elweyn
06186dd2d7 Change messageCount to messagesCount 2023-03-09 16:12:37 +01:00
elweyn
027376b3e0 Add contributionState check for message form 2023-03-09 15:51:21 +01:00
Hannes Heine
6bdf82c25e
Update admin/src/pages/CreationConfirm.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-03-09 15:18:26 +01:00
elweyn
923cc5d81e Extract format date or - to a method. 2023-03-09 15:14:16 +01:00
Hannes Heine
159d1f2a51
Update admin/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-03-09 14:38:27 +01:00
Hannes Heine
4fa00b728e
Merge branch 'master' into 2787-fix-contribution-tab-textes 2023-03-09 13:44:24 +01:00
Hannes Heine
15e092b428
Merge pull request #2798 from gradido/fix-info-svg
fix(frontend): info.svg
2023-03-09 13:43:55 +01:00
Hannes Heine
e6aecefc26
Merge branch 'master' into fix-info-svg 2023-03-09 13:25:32 +01:00
elweyn
53f48d0475 Remove reopen from deleted tab 2023-03-09 12:59:17 +01:00
Hannes Heine
2b6a5829b4
Merge pull request #2795 from gradido/2741-messageCount-listAllContributions
fix(backend): add relation messages to database query
2023-03-09 12:51:28 +01:00
elweyn
34def5fdbf Change info.svg to path 2023-03-09 12:49:12 +01:00
elweyn
c81013a70e Remove reopen since it is not used yet 2023-03-09 10:55:01 +01:00
elweyn
dc0e9c478e Date format if value null => '-' 2023-03-09 10:51:35 +01:00
49c83eb768
Merge branch 'master' into 2741-messageCount-listAllContributions 2023-03-09 10:43:38 +01:00
elweyn
d843f0beb0 Merge branch 'master' into 2787-fix-contribution-tab-textes 2023-03-09 10:05:52 +01:00
mahula
6f2ade8c98
Merge branch 'master' into 2710-delete-own-post-in-admin-interface-remove-icon 2023-03-09 10:05:45 +01:00
elweyn
ba42c282e4 Remove template for reopen. 2023-03-09 10:05:31 +01:00
elweyn
083f51c0d9 Add moderator confirmedBy to confirmed. 2023-03-09 10:05:08 +01:00
elweyn
acbbc45ec2 Change translation 'denied' to 'rejected' 2023-03-09 08:23:44 +01:00
Hannes Heine
364742762f
Merge pull request #2793 from gradido/2787-fix-ui-for-release
fix(admin): header and menu
2023-03-09 07:58:09 +01:00
elweyn
8a808d9945 The locale status already existed 2023-03-09 07:57:16 +01:00
Hannes Heine
b23aafb507
Merge branch 'master' into 2787-fix-ui-for-release 2023-03-09 07:41:58 +01:00
elweyn
6685b95551 Merge branch '2787-fix-contribution-tab-textes' of https://github.com/gradido/gradido into 2787-fix-contribution-tab-textes 2023-03-09 07:36:58 +01:00
elweyn
af5212d0c3 Change german local `reopen` 2023-03-09 07:36:09 +01:00
Hannes Heine
e6fdf718d0
Update admin/src/pages/CreationConfirm.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-03-09 07:32:26 +01:00
Hannes Heine
c8fea682bc
Update admin/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-03-09 07:32:01 +01:00
Hannes Heine
8d3f345d72
Update admin/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-03-09 07:31:44 +01:00
elweyn
775d29fb68 Add messageCount value to the contributions that got messages, order the objects in the same order as they are found. 2023-03-08 14:29:25 +01:00