14991 Commits

Author SHA1 Message Date
69ae2e91f0
fix message count on moderator message contributions (filter out MODERATOR messages) 2023-07-05 09:37:35 +02:00
d1ba7c7f41
do not change contribution status on moderator message 2023-07-05 09:05:20 +02:00
069f1170e9
fix spelling german "Speichern" captial letter 2023-07-05 08:56:58 +02:00
Claus-Peter Huebner
d4bfaaa52c rework PR-comment 2023-07-04 14:48:51 +02:00
Einhornimmond
d0e308e3ff add dlt as new target 2023-07-04 14:08:45 +02:00
einhornimmond
f15776fc32
Merge branch 'master' into iota4_extra_module_hello_world 2023-07-04 14:04:21 +02:00
Einhornimmond
8d4c2ed7e6 copied from dht-node and reduced, added iota hello world test code 2023-07-04 13:59:06 +02:00
clauspeterhuebner
c9ffed5eb3
Merge branch 'master' into 3030-feature-role-administration-backend 2023-07-04 13:34:11 +02:00
mahula
dc101d3e4d
Merge pull request #3117 from gradido/release-1.22.1
chore(release): v1.22.1
2023-07-04 11:52:07 +02:00
mahula
1b2b261dd4 chore(release): v1.22.1 2023-07-04 11:36:40 +02:00
mahula
a365f1d067
Merge pull request #3114 from gradido/3112-bugbackend-email-links-of-stage2-send-to-production
fix(backend): use base url from config in email templates
2023-07-04 10:38:55 +02:00
mahula
c021295a9d
Merge branch 'master' into 3112-bugbackend-email-links-of-stage2-send-to-production 2023-07-04 10:22:48 +02:00
mahula
5422246e11
Merge pull request #3052 from gradido/more-unit-tests-frontend
feat(frontend): test right side layout template
2023-07-04 10:20:31 +02:00
mahula
61d212c649
Merge branch 'master' into more-unit-tests-frontend 2023-07-04 10:07:11 +02:00
mahula
8cc7025bb4 add snapshot for email template testing 2023-07-04 10:05:35 +02:00
einhornimmond
acabf937c1
Merge pull request #3115 from gradido/iota3_remove_from_backend
feat(backend): remove iota from backend
2023-07-03 23:30:37 +02:00
Claus-Peter Huebner
e018234591 repair isAuthorized and other user access and findings 2023-07-03 18:43:49 +02:00
einhornimmond
e3bb015815
Merge branch 'master' into iota3_remove_from_backend 2023-07-03 17:57:11 +02:00
Claus-Peter Huebner
c324acc5b9 linting 2023-07-03 17:10:26 +02:00
Claus-Peter Huebner
b9ef4876d8 Merge branch '3030-feature-role-administration-backend' of github.com:gradido/gradido into 3030-feature-role-administration-backend 2023-07-03 16:57:10 +02:00
Claus-Peter Huebner
567d2399f7 rework PR-comments 2023-07-03 16:56:04 +02:00
clauspeterhuebner
712195efc1
Merge branch 'master' into 3030-feature-role-administration-backend 2023-07-03 16:48:50 +02:00
clauspeterhuebner
2cb8b45fcf
Update backend/src/graphql/directive/isAuthorized.ts
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
2023-07-03 16:40:21 +02:00
Alexander Friedland
839738d5db
Merge pull request #3116 from gradido/refactor-text-juni-to-juli
refactor(frontend): text juni to juli
2023-07-03 16:40:08 +02:00
Claus-Peter Huebner
3e5b7c9eec Merge remote-tracking branch 'origin/master' into 3030-feature-role-administration-backend 2023-07-03 16:28:49 +02:00
Claus-Peter Huebner
4e9ed0726f all tests solved 2023-07-03 16:26:16 +02:00
ogerly
353578dd9f July for English with uppercase initial letter 2023-07-03 15:44:48 +02:00
ogerly
d019c71be5 text juni to juli 2023-07-03 15:20:06 +02:00
Einhornimmond
98d1002011 remove all traces of iota 2023-07-03 14:09:18 +02:00
Hannes Heine
cf86413841
Merge branch 'master' into 3112-bugbackend-email-links-of-stage2-send-to-production 2023-07-03 13:57:41 +02:00
mahula
83a5c64d6c fix url in email templates 2023-07-03 13:29:21 +02:00
mahula
89759f607e remove email template snapshot 2023-07-03 13:28:36 +02:00
Hannes Heine
20e5ebe3f7
Merge pull request #3113 from gradido/3105-refactor-fFrontend-settings-page-style-optimisation
refactor(frontend):  refactor changes incorporated
2023-07-03 13:11:54 +02:00
mahula
6de04bce77 use base url from config in email templates 2023-07-03 12:47:08 +02:00
Alexander Friedland
c029b2cbff
Merge branch 'master' into 3105-refactor-fFrontend-settings-page-style-optimisation 2023-07-03 12:42:55 +02:00
Hannes Heine
777b088af7
Merge pull request #3108 from gradido/3102-refactor-frontend-overview-page
refactor(frontend): date from deploy changed to infotext
2023-07-03 12:42:40 +02:00
ogerly
969de269e3 fix locales 2023-07-03 11:53:34 +02:00
ogerly
258874dd86 changes incorporated 2023-07-03 11:52:45 +02:00
ogerly
c369c42093 date from deploy changed to infotext 2023-07-03 08:01:29 +02:00
Hannes Heine
e5be42f0f8
Merge branch 'master' into more-unit-tests-frontend 2023-07-01 14:07:00 +02:00
Hannes Heine
77c01401df
Merge pull request #3107 from gradido/3104-fix-frontend-verify-login-missing-alias
fix(frontend): add alias to the verifyLogin GraphQL answer.
2023-07-01 14:04:02 +02:00
Hannes Heine
d29339ce07
Merge branch 'master' into 3104-fix-frontend-verify-login-missing-alias 2023-07-01 13:38:16 +02:00
Hannes Heine
6921c07b10
Merge pull request #3106 from gradido/3103-fix-backend-moderator-message
fix(backend): moderator message don't send email to user
2023-07-01 13:37:54 +02:00
elweyn
f4b537c08c Add alias to the verifyLogin grqphql answer. 2023-07-01 12:14:57 +02:00
elweyn
0b4d7181be Check that the message type is not MODERATOR before sending email. 2023-07-01 11:54:24 +02:00
elweyn
000ac24865 Test that their is no email send after a moderator message. 2023-07-01 11:53:54 +02:00
650ae42ba7
Merge branch 'master' into eslint-dht-import 2023-07-01 00:02:42 +02:00
Claus-Peter Huebner
4ccf687a63 further solved tests 2023-06-30 23:29:57 +02:00
Claus-Peter Huebner
faf86f95b9 further solved tests 2023-06-30 23:23:35 +02:00
Hannes Heine
7d7d660d8c
Merge branch 'master' into federation-fix-database-public-key-length 2023-06-30 22:11:07 +02:00