3684 Commits

Author	SHA1	Message	Date
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
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
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
elweyn	5d4d424ef1	Remove unused variable.	2023-05-19 09:34:32 +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
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	97ed8df148	Merge branch 'master' into replace-jasonwebtoken-with-jose	2023-05-17 13:56:03 +02:00
ogerly	6e55acef7f	superfluous code removed, code optimised	2023-05-17 08:36:02 +02:00
elweyn	76290e5c81	Correct linting.	2023-05-16 18:53:50 +02:00
Moriz Wahl	b2a5f09df7	get things working, hurray	2023-05-16 18:09:14 +02:00
Moriz Wahl	9959a69693	Merge branch '2878-trigger-export-klicktipp' of github.com:gradido/gradido into 2878-trigger-export-klicktipp	2023-05-16 16:47:46 +02:00
Moriz Wahl	2ce14d1a89	refactor connection logic	2023-05-16 16:38:59 +02:00
elweyn	fb0f106948	Merge branch '2878-trigger-export-klicktipp' of https://github.com/gradido/gradido into 2878-trigger-export-klicktipp	2023-05-16 16:18:17 +02:00
Hannes Heine	013ea81614	Merge branch 'master' into 2878-trigger-export-klicktipp	2023-05-16 14:15:29 +02:00
Moriz Wahl	1fbebddd71	more tests for transactions and finding users by different identifiers	2023-05-16 05:00:06 +02:00
Moriz Wahl	2e865c6744	test send coins via alias	2023-05-16 04:38:19 +02:00
Moriz Wahl	6aa8ae9bf4	feat(backend): send coins via alias	2023-05-16 04:02:26 +02:00
Moriz Wahl	c5eb9311e6	test check username query	2023-05-15 22:47:19 +02:00
mahula	21799c9950	fix unit test	2023-05-15 22:47:07 +02:00
Moriz Wahl	89803133a0	add check username query	2023-05-15 22:38:59 +02:00
mahula	1c379e61b5	fix unit test	2023-05-15 22:34:47 +02:00
mahula	37d80d3bfa	fix unit test	2023-05-15 22:27:38 +02:00
mahula	7e036401f9	fix unit test	2023-05-15 22:15:37 +02:00
mahula	6bbe853297	fix unit test	2023-05-15 22:12:30 +02:00
mahula	baee42b222	Update backend/src/emails/templates/includes/header.pug ... Co-authored-by: Alexander Friedland <fridolin@tutanota.com>	2023-05-15 21:49:25 +02:00
mahula	30cb8e2752	Update backend/src/emails/templates/includes/webflow.css ... Co-authored-by: Alexander Friedland <fridolin@tutanota.com>	2023-05-15 21:47:29 +02:00
mahula	b12cc3f57d	set support email in email template tests	2023-05-15 21:40:57 +02:00
mahula	4068e0e245	Merge branch 'master' into 2473-feature-emails-further-design-of-html-emails	2023-05-15 21:34:25 +02:00
mahula	69e58def28	fix send email translated unit tests	2023-05-15 20:44:37 +02:00
mahula	3fb24bf360	fix css for header image	2023-05-15 17:50:53 +02:00
mahula	ac358ab0d8	change unit tests for email variants	2023-05-15 17:32:42 +02:00
mahula	3e248b8e8c	refine email template header	2023-05-15 14:51:04 +02:00
mahula	caf12d37d2	update email template css	2023-05-15 12:16:24 +02:00
mahula	c1efbd8c2a	update send email variants unit tests - part I ... - fix, restructure, update tests for first four emails	2023-05-15 09:54:23 +02:00