IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-02-06 09:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,877 Commits 1 Branch 0 Tags
Commit Graph

14877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Claus-Peter Huebner
eb537301b8 Merge remote-tracking branch 'origin/master' into 
3030-feature-role-administration-backend
 2023-06-30 21:13:04 +02:00
Ulf Gebhardt
4b0cfb8181
Merge pull request #3101 from gradido/v1.22.0 
chore(release): v1.22.0
 2023-06-30 20:26:02 +02:00
Ulf Gebhardt
a8a751a9f0
v1.22.0 2023-06-30 19:52:03 +02:00
Hannes Heine
a939f4c70c
Merge pull request #3097 from gradido/fix-yarn-lock 
fix(backend): yarn.lock after typeorm update
 2023-06-30 19:07:00 +02:00
Hannes Heine
d045880aaf
Merge branch 'master' into fix-yarn-lock 2023-06-30 18:27:38 +02:00
Hannes Heine
0f9184d142
Merge pull request #3040 from gradido/2519-new-design-for-settings-and-profile 
feat(frontend): new style for settings page
 2023-06-30 18:27:17 +02:00
ogerly
c3db20df20 fix locales 2023-06-30 17:50:29 +02:00
ogerly
34261e3534 fix locales 2023-06-30 17:49:36 +02:00
ogerly
16c253d0c8 fix test UserName.spec.js 2023-06-30 17:47:59 +02:00
ogerly
8a2c664787 input readonly if .state.username 2023-06-30 17:29:42 +02:00
ogerly
70f52cd117 fix test Settings.spec.js 2023-06-30 17:17:51 +02:00
ogerly
3f06367a71 fix lint 2023-06-30 16:07:45 +02:00
ogerly
acda4108b2 darkmode hide and TODO 2023-06-30 16:04:11 +02:00
Alexander Friedland
59ecc14b29
Merge branch 'master' into 2519-new-design-for-settings-and-profile 2023-06-30 15:46:20 +02:00
Moriz Wahl
e60b7dcc83
Merge pull request #3094 from gradido/query-users-on-contributions 
feat(admin): query users on contributions
 2023-06-30 15:43:08 +02:00
ogerly
0ecc0bca3d fix test UserName.spec.js 2023-06-30 15:36:26 +02:00
Moriz Wahl
cc49a85e3d
Merge branch 'master' into query-users-on-contributions 2023-06-30 15:17:36 +02:00
Moriz Wahl
7445fe2caa
Merge pull request #3091 from gradido/user-query-on-find-contributions 
feat(backend): user query on find contributions
 2023-06-30 15:17:16 +02:00
Moriz Wahl
3486a95f19
Merge branch 'master' into user-query-on-find-contributions 2023-06-30 14:44:30 +02:00
Moriz Wahl
ef461dc969
Update backend/src/graphql/resolver/util/findContributions.ts 
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
 2023-06-30 14:32:09 +02:00
Ulf Gebhardt
751bac018a
yarn lock updated after typeorm upgrade 2023-06-30 14:26:39 +02:00
Hannes Heine
50d3fe1ac3
Merge pull request #3093 from gradido/2789-double-redeem-transaction-link 
fix(backend): double redeem transaction link
 2023-06-30 12:23:42 +02:00
ogerly
537573ca94 fix test src/components/UserSettings/UserName.spec.js 2023-06-30 12:00:16 +02:00
elweyn
db74bf0778 Fix error that resulted of merge conflict 2023-06-30 11:44:19 +02:00
Hannes Heine
52fa4cea98
Merge branch 'master' into 2789-double-redeem-transaction-link 2023-06-30 11:24:23 +02:00
mahula
5656e48141
Merge pull request #3073 from gradido/message-type-admin-frontend 
feat(admin):  message type admin frontend
 2023-06-30 11:18:23 +02:00