9538 Commits

Author SHA1 Message Date
elweyn
d062a10a34 Fix linting. 2022-06-27 13:37:03 +02:00
ogerly
cf543641d7 change text in modal 2 2022-06-27 10:29:10 +02:00
Alexander Friedland
829a2c2570
Merge branch 'master' into 1910-carousel-should-also-have-changing-texts 2022-06-27 09:09:10 +02:00
ogerly
346084f797 change text in modal 2022-06-27 09:05:38 +02:00
ogerly
5dd1ec846d fix locales 2022-06-27 08:52:33 +02:00
Alexander Friedland
94b866c84d
Merge branch 'master' into 1736-When-session-is-expired-redeem-link-is-not-transported 2022-06-24 13:28:50 +02:00
ogerly
32bc865ca2 change modal style 2022-06-24 13:27:59 +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
ogerly
5763c5e350 set closeTime with diff count 2022-06-24 12:23:32 +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
ogerly
8673def9b1 add test store token and tokenTime 2022-06-23 13:50:47 +02:00
ogerly
6b670c7878 add test example 2022-06-23 10:59:05 +02:00
ogerly
ee80c65643 add logout emit an click event button 2022-06-23 07:24:43 +02:00
ogerly
c20e780695 add component SessionLogoutTimeout, add sound 2022-06-23 07:05:58 +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
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