IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-01-20 20:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,234 Commits 1 Branch 0 Tags
Commit Graph

4234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ogerly
5089152be7 adminbereich, übersicht, usersuche, schöpfen, schöpfung bestätigen 2021-11-22 14:56:30 +01:00
Moriz Wahl
9c02869ea0 fix test CreationFormular 2021-11-19 15:51:29 +01:00
Moriz Wahl
d8dfec9e7f fix test NavBar 2021-11-19 15:44:09 +01:00
Moriz Wahl
75b31176c7 fix test UserTable 2021-11-19 15:41:01 +01:00
Moriz Wahl
a7735a0468 fix test for main.js 2021-11-19 15:34:04 +01:00
Alexander Friedland
ce04dc903c
Merge branch 'master' into ADMINBEREICH-first-step 2021-11-19 11:18:25 +01:00
ogerly
686f9bfd4e admin area extended according to concept and functions added and improved. 
workflow stands for the mass creation and for the confirmation of creations.

all changes made which were indicated by moritz.
all translations will be done in one step at a later date.
 2021-11-19 11:17:52 +01:00
Ulf Gebhardt
5cd65190e7
Merge branch 'master' into setup-admin-interface 2021-11-19 02:52:34 +01:00
elweyn
d8def24e0c Their was an error in the UserResolver due to a check undefined and false would fall out of the update change it to !== undefined. 2021-11-18 10:28:54 +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
72c17d349d
Merge branch 'master' into ADMINBEREICH-first-step 2021-11-18 00:35:06 +01:00
Ulf Gebhardt
68fc7bab1b
Merge branch 'master' into login_call_updateUserInfos 2021-11-17 17:02:35 +01:00
ogerly
7cc4d8e5e2 adminbereich, übersicht, usersuche, schöpfen, schöpfung bestätigen 2021-11-17 16:21:23 +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
ogerly
4cb7abdc9b add momentjs, add component CreateFormular.vue formular for creating gdd 2021-11-11 06:51:21 +01:00
elweyn
e97798d73c Withdrew comments. 2021-11-11 06:42:27 +01:00
elweyn
e976c6854d Adding hasElopage and publisherId logic, hasElopage is called and checks if in ElopageBuys their is a user with this email, if hasElopage and publisherId is filled store it in the user table. 2021-11-11 06:41:56 +01:00
elweyn
1baf756c08 HasElopage has been called, search loginUser catch instead of if no user, context get's the pubKey at the end of the login call instead of the start. 2021-11-11 06:31:00 +01:00
elweyn
7655a647fe Implementation of the LoginElopageBuys repository. 2021-11-11 06:15:21 +01:00