14655 Commits

Author SHA1 Message Date
Alexander Friedland
d9600bd88a
Merge branch 'master' into message-type-admin-frontend 2023-06-27 14:49:23 +02:00
ogerly
387d9e87b7 fix test for ContributionMessagesFormular.spec.js 2023-06-27 14:39:10 +02:00
Hannes Heine
39a826c37b
Merge pull request #3082 from gradido/2671-refactor-state-to-status
refactor(other): refactor state to status
2023-06-27 14:08:55 +02:00
Hannes Heine
e02c650174
Merge branch 'master' into 2671-refactor-state-to-status 2023-06-27 13:33:30 +02:00
ogerly
13657682b2 delete src/graphql/listContributionMessages.js 2023-06-27 11:46:00 +02:00
Hannes Heine
c20d48571f
Merge pull request #3080 from gradido/3008-change-deny-button-color
feat(admin): change deny contribution btn-warning color and background-color to #e1a908
2023-06-27 11:38:13 +02:00
elweyn
45b3dc8295 Refactor state to status for contribution in admin. 2023-06-27 10:04:54 +02:00
elweyn
af60cc2638 Refactor state to status for contribution in frontend. 2023-06-27 10:04:40 +02:00
elweyn
48498ee729 Refactor state to status for contribution. 2023-06-27 10:04:21 +02:00
ogerly
f4408a14ae fix test for ContributionMessagesList.spec.js 2023-06-27 09:41:30 +02:00
ogerly
6f1bb9653b refactor history message, fix test for ContributionMessagesListItem.spec.js 2023-06-27 09:38:39 +02:00
elweyn
3af471aebb Change btn-warning color and background color to #e1a908 2023-06-26 20:00:24 +02:00
ogerly
1d53de99c2 check for userId to filter moderators 2023-06-26 11:35:53 +02:00
ogerly
e14cfff6d6 Added missing locales 2023-06-26 10:20:09 +02:00
ogerly
0b8f822a94 Added missing locales 2023-06-26 10:19:02 +02:00
ogerly
c3f7b30e32 messages only visible for moderators 2023-06-26 10:11:13 +02:00
Moriz Wahl
95acf084f7 get it working 2023-06-21 19:20:03 +02:00
Moriz Wahl
c7b940d514 Merge branch 'message-type-admin' into message-type-admin-frontend 2023-06-21 17:37:39 +02:00
ogerly
031f58651a add stle for hidden moderator messages 2 2023-06-21 13:31:47 +02:00
ogerly
ef22cb0b67 add stle for hidden moderator messages 2023-06-21 13:30:53 +02:00
ogerly
d742697a34 add moderator messages message type, add mutation adminListContributionMessages 2023-06-21 12:24:00 +02:00
einhornimmond
5963ebb6a1
Merge pull request #3041 from gradido/iota3_bootstrap_hello_welt
feat(backend): bootstrap and Hello World Test
2023-06-20 20:56:25 +02:00
Moriz Wahl
f0eae909b9 fix authentication test 2023-06-20 13:16:35 +02:00
Moriz Wahl
1e6d4cfe4b add admin list contribution message query 2023-06-20 13:11:36 +02:00
Moriz Wahl
4d119f8911 find contribution messages helper function 2023-06-20 12:44:35 +02:00
Moriz Wahl
732560aaac add message type arg to admin create contribution message 2023-06-20 12:11:44 +02:00
Moriz Wahl
65965a2ffd add MODERATOR contribution message type 2023-06-20 11:34:48 +02:00
einhornimmond
d7ae14a8d7
Merge branch 'master' into iota3_bootstrap_hello_welt 2023-06-18 19:17:22 +02:00
einhornimmond
85e081e271 linter fixes 2023-06-18 17:58:12 +02:00
einhornimmond
797f8bf74e remove old code 2023-06-18 17:49:27 +02:00
einhornimmond
778664b7de increase coverage, replace null with undefined, try and catch on iota connection 2023-06-18 17:48:25 +02:00
einhornimmond
9d773fcd5a install rust build tools in base container, remove it in production container 2023-06-17 14:53:59 +02:00
einhornimmond
a128585123 refactor code and tests to as response to review 2023-06-17 12:07:49 +02:00
Alexander Friedland
9c279aa515
Merge pull request #3049 from gradido/3048-change-the-info-text-on-the-start-page
feat(frontend):  change the info text on the start page
2023-06-16 16:55:29 +02:00
Alexander Friedland
13dfcb0e35
Merge branch 'master' into 3048-change-the-info-text-on-the-start-page 2023-06-16 15:14:31 +02:00
b1f07c13c0
Merge pull request #3045 from gradido/eslint-dht-n
refactor(dht): eslint dht n
2023-06-16 14:40:18 +02:00
720e167f19
Merge branch 'master' into eslint-dht-n 2023-06-16 14:23:18 +02:00
24e60eb192
Merge pull request #3046 from gradido/eslint-dht-comments
refactor(dht): eslint dht comments
2023-06-16 14:22:57 +02:00
a7d01d1b6f
Merge branch 'master' into eslint-dht-comments 2023-06-16 14:10:12 +02:00
Alexander Friedland
28546787b1
Merge branch 'master' into 3048-change-the-info-text-on-the-start-page 2023-06-16 08:31:05 +02:00
Alexander Friedland
f9c7bf9cfc
Update frontend/src/locales/fr.json
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2023-06-16 08:30:47 +02:00
Alexander Friedland
7c78f01edd
Merge pull request #2959 from gradido/2892-Frontend-multiple-auto-logout-messages
fix(frontend): auto logout messages autohide time 5000
2023-06-16 06:06:57 +02:00
Alexander Friedland
732a083aab
Merge branch 'master' into 2892-Frontend-multiple-auto-logout-messages 2023-06-16 05:32:21 +02:00
Alexander Friedland
f6a7a029e2
Merge branch 'master' into 3048-change-the-info-text-on-the-start-page 2023-06-16 05:30:34 +02:00
b27393f6e7
Merge pull request #3024 from gradido/federation-introduce-private-key-in-community-table
feat(federation): introduce private key in community table
2023-06-16 02:23:29 +02:00
clauspeterhuebner
7becf9b3ab
Merge branch 'master' into eslint-dht-comments 2023-06-16 00:05:00 +02:00
clauspeterhuebner
e71c9085f0
Merge branch 'master' into eslint-dht-n 2023-06-16 00:04:44 +02:00
clauspeterhuebner
d060acaba2
Merge branch 'master' into federation-introduce-private-key-in-community-table 2023-06-16 00:02:25 +02:00
09faa30aab
Merge pull request #3035 from gradido/remove-klicktipp-middleware
refactor(backend): removed klicktipp middleware and replace it with a function
2023-06-15 20:17:42 +02:00
6c8a56cece
Merge branch 'master' into remove-klicktipp-middleware 2023-06-15 20:02:46 +02:00