10976 Commits

Author SHA1 Message Date
Claus-Peter Hübner
47772a37b2 rework PR-comments 2022-06-23 02:42:20 +02:00
Claus-Peter Hübner
ecd38bd184 mutation createEventProtocol 2022-06-23 00:26:43 +02:00
Alexander Friedland
9d82cc081a
Merge branch 'master' into 1736-When-session-is-expired-redeem-link-is-not-transported 2022-06-22 23:14:34 +02:00
ogerly
fae0685509 step 1 automatic logout of session after 10 minutes, last 60 seconds warning modal 2022-06-22 22:41:26 +02:00
Claus-Peter Hübner
f5ced262d2 linting 2022-06-22 21:56:39 +02:00
Alexander Friedland
708fda7c60
Merge branch 'master' into 1910-carousel-should-also-have-changing-texts 2022-06-22 21:08:00 +02:00
Alexander Friedland
13a8b84342
Merge pull request #1999 from gradido/1839-Missing-Locale-in-Decay-Information
add missing locales
2022-06-22 21:07:36 +02:00
Alexander Friedland
448fab59e0
Merge branch 'master' into 1839-Missing-Locale-in-Decay-Information 2022-06-22 16:45:10 +02:00
Alexander Friedland
83efd17dac
Merge branch 'master' into 1910-carousel-should-also-have-changing-texts 2022-06-22 16:44:44 +02:00
Alexander Friedland
f80824cd74
Update frontend/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-22 16:44:35 +02:00
Alexander Friedland
3da9b9a462
Update frontend/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-22 16:43:51 +02:00
Moriz Wahl
bab867a1bd add global event handler middleware 2022-06-22 16:02:28 +02:00
Moriz Wahl
7ecd96d28b undo changes of DB config 2022-06-22 15:09:22 +02:00
clauspeterhuebner
396fcf3523
Merge pull request #1907 from gradido/1906-feature-concept-for-gdd-creation-per-linkqr-code
1906 feature concept for gdd creation per linkqr code
2022-06-22 00:56:07 +02:00
clauspeterhuebner
610f6ee847
Merge branch 'master' into 1906-feature-concept-for-gdd-creation-per-linkqr-code 2022-06-22 00:48:23 +02:00
ogerly
5668fc1a39 add missing locales 2022-06-21 14:12:24 +02:00
ogerly
09a10fdc81 remove empty space 2022-06-21 13:31:23 +02:00
ogerly
a3d325ab94 yarn locales 2022-06-21 12:00:54 +02:00
ogerly
b5faaabd49 seperate text for slide picture 2022-06-21 11:59:36 +02:00
Wolfgang Huß
6fc3f71f99
Merge pull request #1962 from gradido/1880-no-throw-when-register-with-existing-email
refactor: 🍰 Not Throwing An Error When Register With Existing Email
2022-06-21 11:38:31 +02:00
Moriz Wahl
a50d241c75 igrmore dbeaver folder 2022-06-21 11:30:45 +02:00
Moriz Wahl
8583d0a308 igrmore dbeaver folder 2022-06-21 11:29:40 +02:00
Moriz Wahl
82ee8529a9
Merge branch 'master' into 1906-feature-concept-for-gdd-creation-per-linkqr-code 2022-06-21 11:27:20 +02:00
Wolfgang Huß
4c420ecbf4
Merge branch 'master' into 1880-no-throw-when-register-with-existing-email 2022-06-21 11:11:56 +02:00
Wolfgang Huß
78250d61bd
Merge pull request #1974 from gradido/1881-set-role-in-admin-interface
feat: 🍰 Set Role In Admin Interface
2022-06-21 11:11:03 +02:00
Wolfgang Huß
4692338d09
Merge branch 'master' into 1881-set-role-in-admin-interface 2022-06-21 10:44:28 +02:00
Wolfgang Huß
101bab6e9f
Merge branch 'master' into 1880-no-throw-when-register-with-existing-email 2022-06-21 10:43:50 +02:00
Claus-Peter Hübner
279a5975f1 add ContributionLink-Events 2022-06-21 04:31:12 +02:00
Claus-Peter Hübner
0dd17da89b create event protocol tables, entities and enums 2022-06-21 04:30:31 +02:00
Claus-Peter Hübner
59ef2ea5d8 next try to remove .dbeaver from repo 2022-06-21 00:01:02 +02:00
Claus-Peter Hübner
56baf51ccd add Tests for parameter checks of createContributionLink 2022-06-20 23:50:21 +02:00
Claus-Peter Hübner
0edd295dbb rework PR-Comments 2022-06-20 23:47:41 +02:00
Claus-Peter Hübner
a9b84088f9 Merge remote-tracking branch 'origin/master' into 1921-rebase_from_master 2022-06-20 20:39:36 +02:00
clauspeterhuebner
7208e58aac
Merge branch 'master' into 1906-feature-concept-for-gdd-creation-per-linkqr-code 2022-06-20 20:09:20 +02:00
Alexander Friedland
f33cd9ed89
Merge pull request #1977 from gradido/1976-Customise-the-mobile-view
refactor mobile style step 1
2022-06-20 18:06:10 +02:00
Alexander Friedland
fb0db912e0
Merge branch 'master' into 1976-Customise-the-mobile-view 2022-06-20 17:50:16 +02:00
Alexander Friedland
48a87d6088
Merge pull request #1995 from gradido/1994-picture-1-in-mobil-change
changed mobil stage picture
2022-06-20 17:49:02 +02:00
Wolfgang Huß
548a6c7582 Decrement backend coverage minimum to 68 2022-06-20 16:59:19 +02:00
Wolfgang Huß
d8e8cda075 Test emitting of 'updateIsAdmin' 2022-06-20 16:42:59 +02:00
Wolfgang Huß
b88e01c818 Merge branch '1880-no-throw-when-register-with-existing-email' of github.com:gradido/gradido into 1880-no-throw-when-register-with-existing-email 2022-06-20 16:12:24 +02:00
Wolfgang Huß
91959aea28 Fulfill Moriz suggestions 2022-06-20 16:08:35 +02:00
Wolfgang Huß
50f5667288 Merge branch 'master' of github.com:gradido/gradido into 1880-no-throw-when-register-with-existing-email
# Conflicts:
#	backend/src/graphql/resolver/UserResolver.ts
2022-06-20 13:56:25 +02:00
Wolfgang Huß
f8b449e623 Refine the tests after Moriz suggestions 2022-06-20 13:30:48 +02:00
Wolfgang Huß
a0a9eda0b4 Merge branch '1881-set-role-in-admin-interface' of github.com:gradido/gradido into 1881-set-role-in-admin-interface 2022-06-20 12:15:26 +02:00
Alexander Friedland
84bd3130c8
Merge branch 'master' into 1976-Customise-the-mobile-view 2022-06-20 12:14:59 +02:00
Wolfgang Huß
67f0458378
Update admin/src/components/ChangeUserRoleFormular.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:12:14 +02:00
Wolfgang Huß
00a224f0ce
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:12:01 +02:00
Wolfgang Huß
036a966693
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:11:49 +02:00
Wolfgang Huß
d9becacb4c
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:11:38 +02:00
Wolfgang Huß
f1a23fe9b7
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:11:30 +02:00