9239 Commits

Author SHA1 Message Date
elweyn
c7ea879e36 Change return value of createContribution from Boolean to UnconfirmedContribution, add constructor to UnconfirmedContribution. 2022-06-29 11:56:18 +02:00
elweyn
6a9b4f7b9a Remove unused import. 2022-06-29 11:24:12 +02:00
elweyn
790b6fb906 Remove unused variable. 2022-06-29 11:23:12 +02:00
elweyn
329a6c5500 Fix linting. 2022-06-29 11:21:03 +02:00
elweyn
55cf4ffc5a Change method description to => notation. 2022-06-29 11:09:06 +02:00
elweyn
6a55a27f88 Removed tests with deleted user and user with unchecked email, add describe block for input not valid as well as valid input. 2022-06-29 11:06:25 +02:00
elweyn
001117527c Change import of getUserCreation in isContributionValid. 2022-06-29 10:52:36 +02:00
elweyn
6e5540b863 Move all util methods to isContributionValid file, add const file for Resolvers. 2022-06-29 10:49:53 +02:00
elweyn
237c01af1b Refactor CreateContributionArgs to ContributionArgs so that it can be used for updateContribution. 2022-06-29 10:13:08 +02:00
elweyn
0c819522a1 Merge changes from master and this branch. 2022-06-28 11:17:06 +02:00
elweyn
5a51207895 Remove unused imports. 2022-06-28 09:59:25 +02:00
elweyn
457016a7a7 Withdrew if contribution not valid statement since the method throws an exception if not valid. 2022-06-27 17:43:10 +02:00
elweyn
a56908b8f5 Adding some test for the ContributionToken. 2022-06-27 17:13:30 +02:00
elweyn
38e04b4979 Remove checks on users since the authorization token handels it. 2022-06-27 17:12:59 +02:00
Alexander Friedland
a8cdd55f6b
Merge pull request #1998 from gradido/1910-carousel-should-also-have-changing-texts
1910 separate text for the slideshow images.
2022-06-27 15:52:01 +02:00
Alexander Friedland
e6a408273a
change text 2022-06-27 15:43:31 +02:00
elweyn
4d4f6979da Change moderator so that it can be null. 2022-06-27 13:41:11 +02:00
elweyn
c03509c525 Change response value to boolean, add RIGHTS for createContribution, add new RIGHT in ROLES. 2022-06-27 13:40:36 +02:00
elweyn
6ac0106470 Change import for refactored methods. 2022-06-27 13:37:47 +02:00
elweyn
d062a10a34 Fix linting. 2022-06-27 13:37:03 +02:00
Alexander Friedland
829a2c2570
Merge branch 'master' into 1910-carousel-should-also-have-changing-texts 2022-06-27 09:09:10 +02:00
clauspeterhuebner
cc442d8bc9
Merge pull request #1996 from gradido/origin/1921-rebase_from_master
Origin/1921 additional parameter checks for createContributionLinks
2022-06-24 12:34:45 +02:00
elweyn
2d90fdd64e New Resolver for Contribution, createContribution method. 2022-06-24 12:19:02 +02:00
elweyn
5ebd0993d9 New Args definition for CreateContribution. 2022-06-24 12:18:18 +02:00
elweyn
b95a8081fc Refactored getUserCreation & isContributionValid method to own files. 2022-06-24 12:17:28 +02:00
Claus-Peter Hübner
c1eef4a464 Merge branch 'origin/1921-rebase_from_master' of github.com:gradido/gradido into 1921-rebase_from_master 2022-06-24 00:13:07 +02:00
Claus-Peter Hübner
e1fca7fb14 correct version of database 2022-06-24 00:07:37 +02:00
clauspeterhuebner
a675364ba0
Delete .project 2022-06-23 02:50:06 +02:00
clauspeterhuebner
e2149a6ce4
Delete .dbeaver directory 2022-06-23 02:49:16 +02:00
clauspeterhuebner
e1fd44a295
Merge branch 'master' into origin/1921-rebase_from_master 2022-06-23 02:45:49 +02:00
Claus-Peter Hübner
47772a37b2 rework PR-comments 2022-06-23 02:42:20 +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
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