1247 Commits

Author SHA1 Message Date
b4e324ce0a
Merge branch 'master' into eslint-plugin-type-graphql-fixes 2023-03-10 12:12:59 +01:00
elweyn
e2fc7c1733 chore(other): upgrade version to 1.19.1 2023-03-10 11:36:35 +01:00
Hannes Heine
3ec72b28eb
Merge branch 'master' into 2802-update-store 2023-03-09 21:04:46 +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
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
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
827c829306
fixes based on the unit tests 2023-03-09 14:37:25 +01:00
elweyn
53f48d0475 Remove reopen from deleted tab 2023-03-09 12:59:17 +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
elweyn
d843f0beb0 Merge branch 'master' into 2787-fix-contribution-tab-textes 2023-03-09 10:05:52 +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
elweyn
8a808d9945 The locale status already existed 2023-03-09 07:57:16 +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
dd44415099 remove unused locale keys 2023-03-08 13:21:47 +01:00
elweyn
f8e59352ec Change css style hack to bootstrap 2023-03-08 12:31:17 +01:00
elweyn
d0c5d7aff0 Change position of reopen. 2023-03-08 12:11:34 +01:00
elweyn
cbac8caee2 Change local mod to moderator in contribution tab 2023-03-08 12:06:18 +01:00
elweyn
2dd4d8edee Localize state to Status & State 2023-03-08 11:52:17 +01:00
elweyn
0f1ec58feb Add icons on tabs of contribution 2023-03-08 11:47:25 +01:00
elweyn
ed83e11ef1 Change reActive to reopen in OpenCreationsTable 2023-03-08 11:46:49 +01:00
elweyn
b476e84bc6 Remove email for tab open 2023-03-08 10:59:28 +01:00
elweyn
d2927f1154 Change label of editCreation to chat 2023-03-08 10:58:54 +01:00
elweyn
fe1473a9a5 Change reActive to reopen, add localize for it. 2023-03-08 10:55:56 +01:00
elweyn
9084f4b11d Remove p-1 from creation tab. 2023-03-08 07:46:20 +01:00
elweyn
2cb179a175 Remove p-3 from navbar. 2023-03-08 07:45:25 +01:00
elweyn
992eb6e89b Add margin-top -7px to navbar brand. 2023-03-08 07:44:43 +01:00
elweyn
d00bfec5a6 Set new release version. 2023-03-07 14:15:17 +01:00
ogerly
3f25962853 test add propsData item 2023-03-02 13:15:28 +01:00
ogerly
2f75b131ad fix lint 2023-03-01 09:20:54 +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