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
4,185 Commits 1 Branch 0 Tags
Commit Graph

4185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hannes Heine
ab0d29bc31
Update frontend/src/views/Pages/Register.vue 2021-11-22 23:50:44 +01:00
Hannes Heine
ed3d9ca422
Merge branch 'master' into 1002-language-selection-register-store 2021-11-22 23:49:52 +01:00
Hannes Heine
9297dc9f5a
Merge pull request #1099 from gradido/bugfix_registration 
Adding a check that the user is activated before letting them login.
 2021-11-22 23:47:21 +01:00
Ulf Gebhardt
73c9f7c2ab
Merge branch 'master' into bugfix_registration 2021-11-22 23:27:58 +01:00
Hannes Heine
e922a4895c
Merge pull request #1128 from gradido/bugfix_transactions_alterAutoIncrAfterRollback 
Changed the Auto increment so that it is done after the rollback and …
 2021-11-22 23:27:46 +01:00
Hannes Heine
6bf0c032e9
Update frontend/src/views/Pages/thx.vue 2021-11-22 23:27:17 +01:00
Hannes Heine
57e01cba27
Update frontend/src/locales/en.json 2021-11-22 23:27:09 +01:00
Hannes Heine
38ee1d46b8
Update frontend/src/locales/de.json 2021-11-22 23:27:02 +01:00
elweyn
fccc7b4434 Changed the Auto increment so that it is done after the rollback and not in the finally block. 2021-11-22 23:17:11 +01:00
Hannes Heine
c863501029
Merge pull request #1095 from gradido/login_call_unsecureLogin 
Login call unsecure login
 2021-11-22 22:40:28 +01:00
Ulf Gebhardt
6dab777005
use correct pubKey, use hex instead of buffer 2021-11-22 22:00:57 +01:00
Hannes Heine
1d9042ca4b
Update backend/src/graphql/resolver/UserResolver.ts 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2021-11-22 21:42:09 +01:00
Ulf Gebhardt
82ea3dc11a
Merge branch 'master' into login_call_unsecureLogin 2021-11-22 16:26:08 +01:00
Moriz Wahl
4fc0af06c0
Merge pull request #1045 from gradido/setup-admin-interface 
feat: Setup Admin Interface
 2021-11-22 16:25:51 +01:00
Ulf Gebhardt
0fd2110fa1
removed duplicate import 2021-11-22 16:06:48 +01:00
Ulf Gebhardt
8eb5c74ba8
encode buffer to hex when decoding the jwt, not everytime we use it 2021-11-22 15:55:57 +01:00
Ulf Gebhardt
0341ae0d13
Merge branch 'master' into login_call_unsecureLogin 2021-11-22 15:54:37 +01:00
Ulf Gebhardt
5cd65190e7
Merge branch 'master' into setup-admin-interface 2021-11-19 02:52:34 +01:00
Ulf Gebhardt
640c5ec88d
Merge pull request #1084 from gradido/login_call_updateUserInfos 
login_call_updateUserInfos
 2021-11-18 01:48:24 +01:00
Ulf Gebhardt
68fc7bab1b
Merge branch 'master' into login_call_updateUserInfos 2021-11-17 17:02:35 +01:00
Moriz Wahl
9745433e4c
Merge pull request #1079 from gradido/await-backaned-tests 
fix: Await Resolved Promises in Backend Unit Tests
 2021-11-17 14:18:24 +01:00
Moriz Wahl
a528be6a77
Merge branch 'master' into await-backaned-tests 2021-11-17 13:43:27 +01:00
Moriz Wahl
be937680cc Merge branch 'master' into await-backaned-tests 2021-11-17 13:33:18 +01:00
Moriz Wahl
7576fe3e0e
Merge pull request #1102 from gradido/raise-coverage-frontend 
feat: Raise Test Coverage Frontend
 2021-11-17 13:26:58 +01:00
Moriz Wahl
a3e8ca49e5 diable authentication 2021-11-17 13:26:18 +01:00
Moriz Wahl
990aabfd0c Merge branch 'master' into setup-admin-interface 2021-11-17 13:04:56 +01:00
Moriz Wahl
fd994936d5
Update frontend/src/views/Pages/SendOverview/GddSend/QrCode.vue 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2021-11-17 12:58:18 +01:00
Ulf Gebhardt
415b9254e4
Merge branch 'login_call_getUserInfos' into login_call_updateUserInfos 
# Conflicts:
#	backend/src/graphql/resolver/TransactionResolver.ts
 2021-11-17 00:50:18 +01:00
Ulf Gebhardt
f09c3b4964
replace implementation of getPublicKey to no longer require the sessionId. Furthermore the call now no longer calls getUserInfos on the login_server but just queries the database itself 2021-11-17 00:40:16 +01:00
Ulf Gebhardt
540cbd0e1f
reimplement publisherId on updateUserInfos 2021-11-17 00:20:43 +01:00
Ulf Gebhardt
4fccc19b68
missing import 2021-11-17 00:13:44 +01:00
Ulf Gebhardt
f0bfe7a7a1
Merge branch 'apollo_jwt_withdrawSessionId' into login_call_updateUserInfos 2021-11-17 00:12:12 +01:00
Ulf Gebhardt
c9f167d07b
Update backend/src/graphql/resolver/UserResolver.ts 
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
 2021-11-17 00:10:16 +01:00
Ulf Gebhardt
eb06b9a528
Update backend/src/graphql/resolver/UserResolver.ts 
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
 2021-11-17 00:09:30 +01:00
Ulf Gebhardt
1f5c740359
Merge branch 'master' into apollo_jwt_withdrawSessionId 2021-11-17 00:06:09 +01:00
Moriz Wahl
259a663f05 test global components 2021-11-16 13:27:52 +01:00
Moriz Wahl
e8859544f7 feat: Raise Test Coverage Frontend 2021-11-16 13:06:53 +01:00
Ulf Gebhardt
b54558fa68
Merge pull request #1096 from gradido/login_call_logout 
login_call_logout
 2021-11-15 23:51:48 +01:00
einhornimmond
c6b1bed387 Merge remote-tracking branch 'origin/login_hotfixes_1.5.1_reopen' into bugfix_registration 2021-11-12 13:31:01 +01:00
elweyn
9a75604a7a Change prozess so that a user that has not activate his account gets a warning that he needs to click the activation link in the email. Withdrew sendActivationMail again. 2021-11-12 10:55:43 +01:00
elweyn
1bf8e8451d Textes for the new pages added. 2021-11-12 10:06:51 +01:00
elweyn
fefcb7251a Routes can route to /thx/login & /activateEmail , thx page now integrates email not activated logic. 2021-11-12 10:06:31 +01:00
elweyn
b1e419530c Fix sorting of locale. 2021-11-12 08:31:48 +01:00
elweyn
f5044e8579 Change register message & error toast message account not active yet. 2021-11-12 07:54:14 +01:00
elweyn
14db7bd058 Added a no-email-verify to locale check if the error message contains the message email not verified then throw another message than normal. 2021-11-12 07:38:57 +01:00
elweyn
4389e47cab Adding a check that the user is activated before letting them login. 2021-11-12 07:17:30 +01:00
elweyn
cbc6570d65 Encode doesn't need sessionId anymore. 2021-11-11 12:32:37 +01:00
elweyn
e76646b327 Withdrew the sessionId from the JWT. 2021-11-11 12:10:14 +01:00
elweyn
a73a36b971 Withdrew the JWT changes and store the Buffer again instead of the hex key. 2021-11-11 10:09:08 +01:00
elweyn
e97798d73c Withdrew comments. 2021-11-11 06:42:27 +01:00