9538 Commits

Author SHA1 Message Date
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
Wolfgang Huß
7064bc33c3
Update admin/src/components/ChangeUserRoleFormular.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:10:55 +02:00
Wolfgang Huß
6bf2a63e17
Update admin/src/components/ChangeUserRoleFormular.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:10:25 +02:00
Wolfgang Huß
638e58c84e
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:10:08 +02:00
Wolfgang Huß
d12cf4c987
Update admin/src/components/ChangeUserRoleFormular.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:10:01 +02:00
Wolfgang Huß
53a90d299c
Update admin/src/components/ChangeUserRoleFormular.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:09:43 +02:00
Wolfgang Huß
7e266f9ec1
Update admin/src/components/ChangeUserRoleFormular.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:09:29 +02:00
Wolfgang Huß
d0fb80483e
Update admin/src/components/ChangeUserRoleFormular.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-06-20 12:09:09 +02:00
Wolfgang Huß
0b464591a1 Merge branch 'master' of github.com:gradido/gradido into 1881-set-role-in-admin-interface 2022-06-20 11:36:41 +02:00
ogerly
60fe402f98 changed mobil stage picture 2022-06-17 16:15:29 +02:00
Moriz Wahl
660f4764a1
Merge pull request #1993 from gradido/release-v1.10.0
release: v1.10.0
2022-06-17 15:25:36 +02:00
clauspeterhuebner
9f060655a9
Merge branch 'master' into 1906-feature-concept-for-gdd-creation-per-linkqr-code 2022-06-17 15:20:42 +02:00
Moriz Wahl
0171d9f44c release: v1.10.0 2022-06-17 15:15:49 +02:00
Alexander Friedland
64605afc16
Merge pull request #1988 from gradido/merge-frontend-redeem-contribution-link
frontend redeem contribution link
2022-06-17 15:07:29 +02:00
Moriz Wahl
8ce97391e1
Update frontend/src/pages/TransactionLink.spec.js 2022-06-17 14:11:52 +02:00
Moriz Wahl
b1beaeb2db
Merge branch 'master' into merge-frontend-redeem-contribution-link 2022-06-17 13:59:49 +02:00
Moriz Wahl
19b1cb12cf Merge branch 'master' into merge-frontend-redeem-contribution-link 2022-06-17 13:59:31 +02:00
Moriz Wahl
4475da0fbe fix tests 2022-06-17 13:58:46 +02:00
Alexander Friedland
95be1b8167
Merge branch 'master' into 1976-Customise-the-mobile-view 2022-06-17 12:52:11 +02:00
Alexander Friedland
372478caab
Merge pull request #1990 from gradido/1989-change-start-pictures
change new start picture
2022-06-17 12:51:44 +02:00
Alexander Friedland
0578d3620f
Merge branch 'master' into 1989-change-start-pictures 2022-06-17 12:39:17 +02:00
Moriz Wahl
94f541ff23
Merge pull request #1987 from gradido/redeem-contribution-link
feat: Redeem Contribution Link
2022-06-17 12:21:44 +02:00
ogerly
6ecc10318d remove double whitespace 2022-06-17 09:42:35 +02:00
ogerly
881c7637ef change new startimage 2022-06-17 08:29:48 +02:00
ogerly
964c6d8256 fix lint 2022-06-17 07:55:22 +02:00
ogerly
1d66b9511c remove alert 2022-06-16 23:55:57 +02:00
ogerly
6210ff8597 fix test for LanguageSwitch2 2022-06-16 23:31:07 +02:00
Moriz Wahl
65326358c4
Merge branch 'master' into merge-frontend-redeem-contribution-link 2022-06-16 17:04:18 +02:00
ogerly
b1b74f5c1b fix test 2022-06-16 16:45:23 +02:00
ogerly
33ed4db29a set redeem valid amount 2022-06-16 16:07:23 +02:00