3679 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
einhornimmond	3174d9bdda	Merge pull request #990 from gradido/revert-988-apollo_fix ... Revert "deliver a decay block every time"	2021-10-15 12:39:06 +02:00
einhornimmond	0e7236e9ef	change symbol name and <	2021-10-15 12:29:56 +02:00
einhornimmond	2f3ad854d5	fix fix fix	2021-10-15 12:25:05 +02:00
einhornimmond	dece5f357b	fix	2021-10-15 12:15:18 +02:00
einhornimmond	4cd7efe184	fix to checko for 2 after comma instead of 4	2021-10-15 12:05:06 +02:00
Hannes Heine	cc9e3b54c9	Revert "deliver a decay block every time"	2021-10-15 12:02:14 +02:00
einhornimmond	bf6a3419d5	Merge pull request #989 from gradido/apollo_fix2 ... update first name, last name and username in community server db on c…	2021-10-15 11:59:33 +02:00
einhornimmond	72b45ce5b3	move in correct branch	2021-10-15 11:49:58 +02:00
einhornimmond	a1f8022295	Merge pull request #988 from gradido/apollo_fix ... deliver a decay block every time	2021-10-15 11:40:48 +02:00
einhornimmond	33796181d6	update first name, last name and username in community server db on change	2021-10-15 11:40:25 +02:00
einhornimmond	870d029cd3	deliver a decay block every time	2021-10-15 11:26:48 +02:00
Moriz Wahl	d73092ddcd	Merge pull request #978 from gradido/activate-registration ... refactor: Activate Registration	2021-10-15 10:59:47 +02:00
Moriz Wahl	81cb5f7704	remove link back to community selection	2021-10-15 10:49:34 +02:00
Alexander Friedland	bad95f9124	Merge pull request #980 from gradido/976-summe-gdd-schoepfung ... fix: summe-gdd-schoepfun	2021-10-15 10:39:24 +02:00
Moriz Wahl	dcbb5839ca	Merge pull request #985 from gradido/982-transaction-id ... fix: Use TransactionId as Collapse Identifier	2021-10-15 10:37:35 +02:00
Moriz Wahl	bc698f8bd0	fix: Use TransactionId as Collapse Identifier	2021-10-15 10:08:54 +02:00
Alexander Friedland	9a183e0712	Merge pull request #979 from gradido/977-icon-nicht-auf-einer-hoehe-transactionslist ... icon in one row - fix	2021-10-14 18:25:47 +02:00
ogerly	70ea239267	fix: summe-gdd-schoepfun	2021-10-14 18:10:28 +02:00
ogerly	5db8afde1a	icon in one row - fix	2021-10-14 17:20:02 +02:00
Moriz Wahl	f8ddb53dba	refactor: Activate Registration	2021-10-14 17:19:41 +02:00
Alexander Friedland	ab684c22b8	Merge pull request #974 from gradido/901-Total-of-Transaction-Calculcation-not-properly-rounded ... error rounding in transactions list fixed	2021-10-14 16:23:58 +02:00
Alexander Friedland	8aecbd72f1	aa	2021-10-14 16:14:05 +02:00
ogerly	180c3de11c	error rounding in transactions list fixed	2021-10-14 16:06:05 +02:00
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
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
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
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
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