13185 Commits

Author SHA1 Message Date
elweyn
027376b3e0 Add contributionState check for message form 2023-03-09 15:51:21 +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
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
elweyn
dd44415099 remove unused locale keys 2023-03-08 13:21:47 +01:00
elweyn
747c146bbf Add to database query relation messages 2023-03-08 12:33:15 +01:00
elweyn
f8e59352ec Change css style hack to bootstrap 2023-03-08 12:31:17 +01:00
elweyn
5cc5867213 Revert "Add messages to query of listAllContribution"
This reverts commit a14b9403b1a075b231641b956c2441a2fdfd6c38.
2023-03-08 12:13:45 +01:00
elweyn
d0c5d7aff0 Change position of reopen. 2023-03-08 12:11:34 +01:00
elweyn
a14b9403b1 Add messages to query of listAllContribution 2023-03-08 12:06:44 +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
Alexander Friedland
5ea527f6a0
Merge pull request #2774 from gradido/2772-Send-Gradidos-via-linkfirst-Button-must-be-Check-now
fix(frontend): send gdd - change first submit button text to 'Check Now'
2023-03-08 10:57:08 +01:00
elweyn
fe1473a9a5 Change reActive to reopen, add localize for it. 2023-03-08 10:55:56 +01:00
Hannes Heine
428f38456c
Merge branch 'master' into 2772-Send-Gradidos-via-linkfirst-Button-must-be-Check-now 2023-03-08 10:19:38 +01:00
Hannes Heine
79f72d923d
Merge pull request #2771 from gradido/BerndHueckstaedt-patch-3
refactor(frontend): creations generated by link NL
2023-03-08 10:18:15 +01:00
Hannes Heine
0f9f559364
Merge branch 'master' into BerndHueckstaedt-patch-3 2023-03-08 09:28:00 +01:00
Hannes Heine
2997536aff
Merge pull request #2770 from gradido/BerndHueckstaedt-patch-2
refactor(frontend): creations generated by link (FR) + (NL)
2023-03-08 09:26:40 +01:00
Hannes Heine
fce74dfeb7
Merge branch 'master' into BerndHueckstaedt-patch-2 2023-03-08 09:12:42 +01:00
Hannes Heine
f3f1a84b9d
Merge pull request #2765 from gradido/BerndHueckstaedt-patch-1
refactor(frontend): update German locales
2023-03-08 09:12:06 +01:00
Hannes Heine
eefae95368
Merge branch 'master' into BerndHueckstaedt-patch-1 2023-03-08 08:44:10 +01:00
Hannes Heine
15626efd31
Update frontend/src/locales/es.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2023-03-08 08:43:29 +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