IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,221 Commits 1 Branch 0 Tags
Commit Graph

9221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Moriz Wahl
fddaa99ada use vue-timers as recommended 2022-06-28 16:07:45 +02:00
ogerly
cf543641d7 change text in modal 2 2022-06-27 10:29: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
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
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
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
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
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
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