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

7983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ulf Gebhardt
2968421b7e
Merge pull request #973 from gradido/fix_publisher_id_config 
fix publisherId config
 2021-10-14 15:58:24 +02:00
Ulf Gebhardt
5baf5e26c6
fix publisherId config 2021-10-14 15:49:23 +02:00
ogerly
3728b4ff0c apexchats step work 2021-10-14 15:38:34 +02:00
Moriz Wahl
e58c5726cb
Merge pull request #968 from gradido/community-production 
refactor: In Production only Show one Community
 2021-10-14 14:56:48 +02:00
Hannes Heine
5725e9c999
Merge pull request #959 from gradido/804-elopage-registration 
804 elopage registration
 2021-10-14 12:37:44 +02:00
Alexander Friedland
1c57473d4a
Update frontend/src/views/Layout/DashboardLayout_gdd.spec.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-10-14 10:09:47 +02:00
Alexander Friedland
d64055a78f
Update frontend/src/views/Layout/DashboardLayout_gdd.spec.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-10-14 10:09:40 +02:00
Alexander Friedland
35af053f19
Update frontend/src/views/Layout/DashboardLayout_gdd.spec.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-10-14 10:09:24 +02:00
Alexander Friedland
d103da4054
Update frontend/src/views/Layout/DashboardLayout_gdd.spec.js 
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
 2021-10-14 10:09:00 +02:00
Moriz Wahl
96564394d8
Update backend/src/graphql/resolver/UserResolver.ts 
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
 2021-10-13 20:02:25 +02:00
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
ogerly
b2363198c2 router.test.js fix SendOverview 2021-10-13 16:47:37 +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
ogerly
907a9fe696 merge master, merge conflict fixed 2021-10-13 16:34:29 +02:00
ogerly
709888df55 Merge branch 'master' into 707-Separate-Account-Overview-from-Send-Form 2021-10-13 16:28:26 +02:00
ogerly
db1124da3f separate pages: overview and send. 
apexcharts library inserted.
example charts created: lienen and bar charts.
example charts inserted
 2021-10-13 16:13:28 +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
Moriz Wahl
481bd63794 production from NODE_ENV, please test 2021-10-13 12:08:22 +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
Moriz Wahl
f2ec81e2b2 feat: In Production only Show one Community 2021-10-12 21:28:29 +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
b6bfd55c98 fix lint 2021-10-12 15:21:45 +02:00
einhorn_b
715d51272c check if recipiant account is not disabled 2021-10-12 14:42:31 +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