1214 Commits

Author SHA1 Message Date
4e762a12fc
removed duplicate admin link (merge error) 2021-11-25 09:25:01 +01:00
77dc54155a
Merge branch 'master' into backend_rights
# Conflicts:
#	admin/src/router/guards.js
#	admin/src/store/store.js
#	backend/src/graphql/resolver/UserResolver.ts
#	frontend/src/components/SidebarPlugin/SideBar.vue
#	frontend/src/graphql/queries.js
#	frontend/src/routes/guards.js
2021-11-25 08:49:06 +01:00
6ea8d08963
fix tests 2021-11-24 19:38:42 +01:00
5184d1dd2d
fixed locales 2021-11-24 19:38:42 +01:00
bde8cc6067
add infos about jq software requirement 2021-11-24 19:38:42 +01:00
33783702bc
frontend lint 2021-11-24 19:38:42 +01:00
cefc963780
implemented isAdmin from backend 2021-11-24 19:38:42 +01:00
6119d38561
corrected ports 2021-11-24 19:37:06 +01:00
d49e4728a5
todo port & define port due to my setup 2021-11-24 19:37:06 +01:00
3301e0763d
separate router.beforeach & implement the authenticate route 2021-11-24 19:37:06 +01:00
a8995141c8
link to admin if isAdmin is true 2021-11-24 19:32:44 +01:00
c11ef2fbbb
admin_area language file 2021-11-24 19:32:44 +01:00
afda08a589
delete some weird docu stuff 2021-11-24 19:32:44 +01:00
636c4c8df3
implement verifyLogin 2021-11-23 14:05:02 +01:00
Moriz Wahl
e9ceb7e7a5
test that logout is dispatched when clicked on admin area 2021-11-23 12:48:59 +01:00
Moriz Wahl
599eaf495a
test window location assign 2021-11-23 12:48:59 +01:00
c1381da240
test admin link,
correct pointer class
2021-11-23 12:48:59 +01:00
b2bb67ab9c
fix tests 2021-11-23 12:48:59 +01:00
024eb30612
fixed locales 2021-11-23 12:48:59 +01:00
c8d188279f
add infos about jq software requirement 2021-11-23 12:48:59 +01:00
f21587ae3a
frontend lint 2021-11-23 12:48:59 +01:00
41d6a7ba45
implemented isAdmin from backend 2021-11-23 12:48:59 +01:00
c3801f37ab
corrected ports 2021-11-23 12:46:16 +01:00
35b45f4b3d
todo port & define port due to my setup 2021-11-23 12:46:16 +01:00
a82f612be8
separate router.beforeach & implement the authenticate route 2021-11-23 12:46:16 +01:00
f8404fc9a9
link to admin if isAdmin is true 2021-11-23 12:45:42 +01:00
a1e8114673
admin_area language file 2021-11-23 12:45:42 +01:00
0eb4bf8732
delete some weird docu stuff 2021-11-23 12:45:42 +01:00
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
73c9f7c2ab
Merge branch 'master' into bugfix_registration 2021-11-22 23:27:58 +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
68fc7bab1b
Merge branch 'master' into login_call_updateUserInfos 2021-11-17 17:02:35 +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
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
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
fe7d7dc5f8
implemented most of updateUserInfos on Apollo
also removed publisherId from updateUserInfos since this is now part of the login call.
2021-11-10 20:18:49 +01:00
Hannes Heine
8d2274406a
Update frontend/src/views/Pages/RegisterSelectCommunity.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2021-11-05 12:34:01 +01:00
Hannes Heine
c8570218c1
Update frontend/src/views/Pages/RegisterCommunity.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2021-11-05 12:33:50 +01:00
Hannes Heine
2b64cb9397
Update frontend/src/views/Pages/Register.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2021-11-05 12:33:39 +01:00
Hannes Heine
4483e69d0d
Update frontend/src/views/Pages/Login.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2021-11-05 12:33:29 +01:00
elweyn
3d3a77a0ea Changed the logic so that we check if the queries have been send but does not check the result. 2021-11-05 12:32:45 +01:00