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

3649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Moriz Wahl
0e75826b28
Update backend/src/graphql/resolver/UserResolver.ts 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2021-10-13 20:02:13 +02:00
Hannes Heine
8bfec7dcf8
Update frontend/src/views/Pages/Register.vue 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-10-13 16:37:47 +02:00
Hannes Heine
a7134cd33b
Update frontend/src/views/Pages/Login.vue 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-10-13 16:37:35 +02:00
Hannes Heine
40961fe7d3
Update frontend/src/store/store.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-10-13 16:37:22 +02:00
Moriz Wahl
56b5e03578 st coverage backend to 3% 2021-10-13 16:02:22 +02:00
elweyn
fff9361fe7 Withdrew the change to backend workflow since I don't have permission for it. 2021-10-13 13:38:46 +02:00
elweyn
ad11d482e0 Missing files.. 2021-10-13 13:35:58 +02:00
elweyn
58182d73c6 Added the publisherId to the login & createUser calls, adjusted the tests to the new code. 2021-10-13 13:26:46 +02:00
elweyn
5a14161284 Adding the publisherId to the login call and that it stores it to the user profile. 2021-10-13 12:07:23 +02:00
elweyn
f039f8a714 Merge branch '804-elopage-registration' of https://github.com/gradido/gradido into 804-elopage-registration 2021-10-13 11:32:58 +02:00
elweyn
a1b54e592e Changed the logic to catch error send by Klicktipp. 2021-10-13 11:32:00 +02:00
Hannes Heine
861fc21766
Update frontend/src/components/SidebarPlugin/SideBar.vue 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-10-13 05:35:48 +02:00
Hannes Heine
2506480a52
Update frontend/src/components/SidebarPlugin/SideBar.spec.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-10-13 05:35:06 +02:00
Hannes Heine
efed348a94
Change the Test name so that we see if their is a publisher ID or not 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-10-13 05:34:14 +02:00
elweyn
3fdb503ea6 Merge branch 'master' into 804-elopage-registration 2021-10-12 17:08:06 +02:00
elweyn
8f2289ebf2 Changed the test for the members area & it's link. 2021-10-12 17:07:27 +02:00
einhornimmond
29de8e224f
Merge pull request #960 from gradido/add_autocorrect_keys 
Add autocorrect keys
 2021-10-12 17:00:36 +02:00
elweyn
2d218e86ce Asking for hasElopage in login. 2021-10-12 16:50:26 +02:00
elweyn
d3198b037e Fixe model for User and adding hasElopage to User Object. 2021-10-12 16:50:07 +02:00
elweyn
36e6a459a4 Fixe small error. 2021-10-12 16:49:14 +02:00
elweyn
74ac8b7fcc Merge branch 'master' into 804-elopage-registration 2021-10-12 16:25:23 +02:00
einhornimmond
4464611759
Merge pull request #949 from gradido/login_checkForElopage 
check for elopage account
 2021-10-12 16:25:03 +02:00
einhorn_b
3b487ab2cb fix field name 2021-10-12 16:17:19 +02:00
einhornimmond
3ecf960ab6 fix lint 2021-10-12 15:56:02 +02:00
einhornimmond
0640eb24d5 remove copy user disabled field 2021-10-12 15:42:48 +02:00
einhornimmond
86efd0de80 fix bug 2021-10-12 15:34:50 +02:00
einhornimmond
1486476571 add auto correct keys to apollo, copy also disabled field of user 2021-10-12 15:24:14 +02:00
einhorn_b
3247dad586 update doc 2021-10-12 14:22:19 +02:00
elweyn
c55f959e9c Merge branch 'master' into 804-elopage-registration 2021-10-12 13:29:17 +02:00
elweyn
61896c421f Tested the new functionality, and fixed the links. 2021-10-12 13:15:35 +02:00
elweyn
f7d696eaca Tests that the hasElopage flag is changed. 2021-10-12 12:46:57 +02:00
elweyn
fb93b39a19 Changed the logic behind the link to elopage, when user has an account it sends to the login page, else it sends to the registration process of elopage 2021-10-12 12:31:37 +02:00
einhornimmond
ff75bbd558
Merge pull request #958 from gradido/gdt_checkForPid 
check pid on gdt server
 2021-10-12 12:07:29 +02:00
elweyn
67ea973845 Adding a hasEloage flag to the store. 2021-10-12 11:40:37 +02:00
einhornimmond
a55f4cd762
Merge pull request #957 from gradido/apollo_fixListTransactions 
add check for empty user list
 2021-10-11 13:14:45 +02:00
Einhornimmond
cceca9d517 change query name 2021-10-11 13:12:26 +02:00
Einhornimmond
3a5aa25fec update variable names 2021-10-11 13:11:50 +02:00
Moriz Wahl
144fa5f089
Merge pull request #950 from gradido/improve-navigation-guard-tests 
feat: Improve Test of Navigation Guard of Vue Router
 2021-10-11 11:34:25 +02:00
Einhornimmond
660e1e4b68 add call for checkpid on gdt server 2021-10-10 17:27:42 +02:00
Einhornimmond
2c90bbe314 add check for empty user list 2021-10-10 16:37:07 +02:00
einhornimmond
0da25df727 Merge branch 'login_checkForElopage' of github.com:gradido/gradido into login_checkForElopage 2021-10-10 15:31:37 +02:00
einhornimmond
909c7e3a9a fix lint 2021-10-10 15:31:28 +02:00
einhornimmond
7699700b93 fix lint 2021-10-10 15:29:44 +02:00
einhornimmond
546d371139 check always for hasElopage 
- put check into async task to let it run at the same time as the password check
 2021-10-10 15:25:01 +02:00
Moriz Wahl
c868ac93b5
Merge pull request #952 from gradido/clean-up-frontend-links 
refactor: Clean Up Frontend Links, Tests and Logic
 2021-10-08 19:42:27 +02:00
einhornimmond
17907b23ad fix bug 2021-10-08 10:28:46 +02:00
einhornimmond
e226a10b4b fix typo in docu 2021-10-08 10:27:25 +02:00
einhornimmond
93532004d5 add option in login call to check also for elopage account 2021-10-08 10:26:09 +02:00
Moriz Wahl
5bb0c2b5a5 Merge branch 'master' into clean-up-frontend-links 2021-10-07 19:22:47 +02:00
Moriz Wahl
3c409c9bfd porper tests for the checkboxes 2021-10-07 19:13:52 +02:00