9282 Commits

Author SHA1 Message Date
Hannes Heine
e2b7c9dece
Merge branch 'master' into 2000-contribution-delete 2022-07-06 10:15:03 +02:00
Alexander Friedland
69bb329188
Merge pull request #2024 from gradido/2023-switched-link-color
changed link color in navbar and language switch
2022-07-06 09:55:16 +02:00
Alexander Friedland
e1186100bd
Merge branch 'master' into 2023-switched-link-color 2022-07-06 07:50:50 +02:00
Hannes Heine
0ae0a09303
Merge pull request #2009 from gradido/2000-contribution-resolver
feat: ContributionResolver - createContribution
2022-07-05 11:48:36 +02:00
elweyn
103928518c Change utils file isContributionValid to contributions and changed method isContributionValid to validateContribution. 2022-07-05 11:35:50 +02:00
elweyn
9bd5710933 Add check if user is owner of the contribution before deleting. 2022-07-05 09:37:41 +02:00
elweyn
62e7abe76e Add mutation to soft delete a contribution. 2022-07-05 09:22:32 +02:00
elweyn
9867bb6a6f Add RIGHT for DELETE_CONTRIBUTION. 2022-07-05 09:21:29 +02:00
Moriz Wahl
25b9a5a622
Merge branch 'master' into 2000-contribution-resolver 2022-07-04 15:20:31 +02:00
ogerly
1d86215375 change link color 2022-07-01 11:11:17 +02:00
Moriz Wahl
1bb06f5ad4
Merge pull request #2021 from gradido/v1.10.1
release: 1.10.1
2022-06-30 16:04:07 +02:00
Moriz Wahl
9c98087874 release: 1.10.1 2022-06-30 15:55:23 +02:00
Alexander Friedland
f49bb5b1c5
Merge pull request #2001 from gradido/1736-When-session-is-expired-redeem-link-is-not-transported
automatic session logout with info modal
2022-06-30 15:53:57 +02:00
Moriz Wahl
648b905d63 fix test 2022-06-30 15:44:49 +02:00
ogerly
ca8a3a0331 fix lint 2022-06-30 15:30:13 +02:00
ogerly
31e8f11f79 change locales static 10 Minutes 2022-06-30 15:29:11 +02:00
Alexander Friedland
286c717a3a
Update frontend/src/locales/de.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-06-30 14:49:28 +02:00
Alexander Friedland
4134e7593e
Update frontend/src/locales/en.json
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-06-30 14:49:19 +02:00
Alexander Friedland
0fdccda597
Update frontend/src/store/store.test.js
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-06-30 14:20:17 +02:00
Alexander Friedland
ef373e6ae0
Update frontend/src/store/store.test.js
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-06-30 14:13:54 +02:00
Alexander Friedland
fa32054f96
Update frontend/src/components/SessionLogoutTimeout.spec.js
Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
2022-06-30 14:11:22 +02:00
ogerly
0e3f6a4d73 change JWT_EXPIRES_IN to 10m 2022-06-30 13:51:40 +02:00
ogerly
7e0374586e delete mp3 in public/sound 2022-06-30 12:25:21 +02:00
Moriz Wahl
41c266b022 fix locales 2022-06-30 11:28:54 +02:00
Moriz Wahl
2cdaf97f05 remove emacs artifact 2022-06-30 11:20:51 +02:00
Moriz Wahl
81ee4a1011 Merge branch '1736-When-session-is-expired-redeem-link-is-not-transported' of github.com:gradido/gradido into 1736-When-session-is-expired-redeem-link-is-not-transported 2022-06-30 11:19:39 +02:00
Moriz Wahl
b2fff23b6b raise coverage, try to test timers 2022-06-30 11:19:19 +02:00
elweyn
ba88599ca7 Change mutation to query amount and memo, check in test that amount and memo have the right values. 2022-06-29 13:31:57 +02:00
elweyn
70b22f3dbe Remove unused import of FULL_CREATION_AVAILABLE const. 2022-06-29 12:00:35 +02:00
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
Moriz Wahl
fddaa99ada use vue-timers as recommended 2022-06-28 16:07:45 +02:00
Alexander Friedland
f179148ab7
Merge branch 'master' into 1736-When-session-is-expired-redeem-link-is-not-transported 2022-06-28 13:35:41 +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