14631 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	b26ce5af08	Merge branch 'master' into preserve-email-on-login	2023-05-19 16:52:23 +02:00
Moriz Wahl	f54748f65a	Merge pull request #2989 from gradido/refactor-receiver-in-send-coins ... feat(frontend): send coins via identifier	2023-05-19 16:51:52 +02:00
Hannes Heine	8472b4d807	Merge branch 'master' into preserve-email-on-login	2023-05-19 16:31:23 +02:00
Hannes Heine	351c4a0e35	Merge branch 'master' into refactor-receiver-in-send-coins	2023-05-19 16:31:12 +02:00
Hannes Heine	a25fcb6ea4	Merge pull request #2916 from gradido/2878-trigger-export-klicktipp ... feat(backend): export user events to klicktipp	2023-05-19 16:30:30 +02:00
elweyn	cfb0d7a61a	Remove jsonstringify.	2023-05-19 16:09:17 +02:00
elweyn	5de921f4f3	Update logging.	2023-05-19 16:06:23 +02:00
elweyn	81754449e9	Removed commented code, implemented Singleton.	2023-05-19 15:55:29 +02:00
Claus-Peter Huebner	2439663ea4	revert client versioning back to directory based as decided with moritz ... and hannes	2023-05-19 15:53:26 +02:00
Hannes Heine	471a746005	Merge branch 'master' into 2878-trigger-export-klicktipp	2023-05-19 15:32:57 +02:00
elweyn	39fde59e59	Fix tests to previous changes.	2023-05-19 15:32:15 +02:00
elweyn	b4a50dbcda	Fix tests to the changes that were made.	2023-05-19 15:20:19 +02:00
elweyn	c1a086ea57	Fix content type.	2023-05-19 14:56:50 +02:00
Claus-Peter Huebner	a81b05e85f	Merge remote-tracking branch 'origin/master' into 2946-feature-x-com-3-introduce-business-communities	2023-05-19 14:46:21 +02:00
elweyn	7727eec05f	Fix header logo, and social media icons.	2023-05-19 14:38:01 +02:00
Hannes Heine	4fee11e146	Merge branch 'master' into 2473-feature-emails-further-design-of-html-emails	2023-05-19 14:25:48 +02:00
Hannes Heine	0ad8bb21df	Merge pull request #2996 from gradido/bug-reload-for-specific-changes ... fix(backend): add extension pug json and css to nodemon.	2023-05-19 14:25:00 +02:00
elweyn	5abc03baf1	Change font size of the body.	2023-05-19 12:03:41 +02:00
elweyn	0d74f62478	Add extension pug json and css to nodemon.	2023-05-19 11:46:20 +02:00
elweyn	54100c6245	Correct some layouting, and some textes.	2023-05-19 11:44:29 +02:00
Hannes Heine	204a2d2471	Merge branch 'master' into 2897-incorrect-errormessage-for-wrong-contribution-link	2023-05-19 10:34:02 +02:00
Moriz Wahl	c95ecd1941	feat(frontend): preserve email after login	2023-05-19 09:38:31 +02:00
elweyn	5d4d424ef1	Remove unused variable.	2023-05-19 09:34:32 +02:00
Moriz Wahl	42fc9501c0	add email to store	2023-05-19 09:27:52 +02:00
elweyn	e77385e27d	Merge branch '2473-feature-emails-further-design-of-html-emails' of https://github.com/gradido/gradido into 2473-feature-emails-further-design-of-html-emails	2023-05-19 09:20:18 +02:00
elweyn	f4c19117b4	Change test from string tests to snapshots.	2023-05-19 09:20:09 +02:00
Hannes Heine	8978e73392	Merge branch 'master' into 2473-feature-emails-further-design-of-html-emails	2023-05-19 09:18:58 +02:00
Moriz Wahl	e446ad7e6d	Update frontend/src/validation-rules.js ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2023-05-19 09:01:15 +02:00
Moriz Wahl	36b1a3fb72	Update frontend/src/validation-rules.js ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2023-05-19 09:01:07 +02:00
Moriz Wahl	e007c2a193	Update frontend/src/validation-rules.js ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2023-05-19 09:00:56 +02:00
Moriz Wahl	a9c35a4c12	Update frontend/src/validation-rules.js ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2023-05-19 09:00:46 +02:00
Moriz Wahl	8172a813d0	Update frontend/src/validation-rules.js ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2023-05-19 09:00:35 +02:00
Moriz Wahl	22f7a69287	Update frontend/src/components/GddSend/TransactionForm.spec.js ... Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>	2023-05-19 09:00:09 +02:00
Moriz Wahl	f5ab3a1e4f	Merge branch 'master' into refactor-receiver-in-send-coins	2023-05-18 20:39:50 +02:00
Moriz Wahl	b073821f64	Merge pull request #2988 from gradido/send-coins-via-alias ... feat(backend): send coins via alias	2023-05-18 20:36:28 +02:00
Ulf Gebhardt	cf941518ed	lint fixes	2023-05-18 11:56:50 +02:00
Ulf Gebhardt	74b9c86e66	remove reference to api 2.0 from bare_metal .env.dist	2023-05-18 11:54:36 +02:00
Ulf Gebhardt	403c0f1f64	removed Decimal Scalar to meet coverage requirement, no decimal is used yet	2023-05-18 11:48:01 +02:00
Ulf Gebhardt	15ca48a332	implement PublicKeyResolver for 1.1 using inheritance	2023-05-18 11:45:51 +02:00
Ulf Gebhardt	5e4c4b274c	removed all test resolvers	2023-05-18 11:45:18 +02:00
elweyn	ca25be61da	Add 15px bottom of p-content.	2023-05-17 18:01:36 +02:00
elweyn	89d72de59d	Change display table to block.	2023-05-17 17:57:24 +02:00
Moriz Wahl	ee93c5e2b1	Merge branch 'master' into send-coins-via-alias	2023-05-17 16:25:00 +02:00
Moriz Wahl	85bfcd9df3	constants to upper case	2023-05-17 16:24:05 +02:00
elweyn	02e271ac5a	Change content display to block margin and padding	2023-05-17 16:16:01 +02:00
elweyn	b82bad3a1f	Correct margin of content.	2023-05-17 15:54:00 +02:00
elweyn	5cf067de7d	Change on css	2023-05-17 15:42:00 +02:00
elweyn	6796c1a6b9	Merge branch 'master' into 2473-feature-emails-further-design-of-html-emails	2023-05-17 15:18:28 +02:00
Ulf Gebhardt	6d1ed8badb	Merge pull request #2975 from gradido/replace-jasonwebtoken-with-jose ... refactor(backend): replace jasonwebtoken with jose	2023-05-17 14:16:16 +02:00
Ulf Gebhardt	97ed8df148	Merge branch 'master' into replace-jasonwebtoken-with-jose	2023-05-17 13:56:03 +02:00