10160 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	ecbb59281e	Merge branch 'master' into fix-decay-rounding-with-transaction-links	2022-04-25 16:12:40 +02:00
Ulf Gebhardt	b4bb7fa429	Merge branch 'master' into fix_missing_config_for_redeem_url	2022-04-25 16:11:08 +02:00
Ulf Gebhardt	189ae1c3a3	Merge pull request #1748 from gradido/database_admin_pending_creations_decimal ... Refactor: Database admin pending creations use decimal	2022-04-25 16:10:49 +02:00
Moriz Wahl	b3449a28af	Merge branch 'more-user-resolver-tests' of github.com:gradido/gradido into more-user-resolver-tests	2022-04-25 16:06:30 +02:00
Moriz Wahl	22fcf28291	remove strange comments	2022-04-25 16:06:18 +02:00
Moriz Wahl	89dea79ce1	Merge branch 'master' into more-user-resolver-tests	2022-04-25 16:05:24 +02:00
Moriz Wahl	1d48c12573	Merge branch 'master' into fix-decay-rounding-with-transaction-links	2022-04-25 16:04:38 +02:00
Moriz Wahl	a4ae002693	round balance down before subtracting hold available amount	2022-04-25 16:01:26 +02:00
Ulf Gebhardt	a4a92812bf	adjusted migrtion number to 35	2022-04-25 15:14:55 +02:00
Ulf Gebhardt	0299fffbee	Merge branch 'master' into database_admin_pending_creations_decimal ... # Conflicts: # backend/src/config/index.ts	2022-04-25 15:13:03 +02:00
Moriz Wahl	fef49cafea	Merge pull request #1808 from gradido/eliminate-server-user-table ... refactor: Drop Server User Table	2022-04-25 15:00:56 +02:00
Ulf Gebhardt	e2957e0b34	config value for the redeem URL was missing	2022-04-25 14:17:45 +02:00
Moriz Wahl	5cd2c045aa	test coverage backend to 58%	2022-04-25 14:08:24 +02:00
Ulf Gebhardt	e9906f3908	Merge branch 'master' into database_admin_pending_creations_decimal	2022-04-25 14:08:00 +02:00
Moriz Wahl	0264931e58	test update user infos mutation. Remove publisher ID from update user infos as it is never used	2022-04-25 14:07:31 +02:00
Ulf Gebhardt	73fe46c39d	also change memo column	2022-04-25 14:03:38 +02:00
Moriz Wahl	e30d1f723f	test queryOptIn	2022-04-25 13:18:08 +02:00
ogerly	9277ede6a3	add margin left and right	2022-04-25 13:08:51 +02:00
ogerly	dc8a154842	add toggleable=lg	2022-04-25 13:06:52 +02:00
ogerly	2d4b8dd760	add #app min-width: 360px	2022-04-25 13:06:05 +02:00
ogerly	163c4a4ac8	add svg type	2022-04-25 13:04:58 +02:00
Moriz Wahl	276a1be889	test forgot password mutation	2022-04-25 12:49:23 +02:00
Moriz Wahl	d346a1d09d	test verify login	2022-04-25 11:52:10 +02:00
Moriz Wahl	fdb64071d6	join tables to update is_admin	2022-04-25 11:32:26 +02:00
Moriz Wahl	fb3137892f	Merge branch 'master' into eliminate-server-user-table	2022-04-25 11:21:00 +02:00
ogerly	98ec6e5d58	add text and change color	2022-04-25 10:15:28 +02:00
ogerly	b0c6754a53	remove unused code for mediascreen	2022-04-25 10:14:58 +02:00
ogerly	f0a142e326	add zindex1000, gradido-global-color-0E79BC	2022-04-25 10:13:56 +02:00
ogerly	3851ae2146	yarn lint fix	2022-04-22 20:33:24 +02:00
ogerly	8391c723b3	remove unused locales key	2022-04-22 20:33:07 +02:00
ogerly	56411e897a	merge master	2022-04-22 16:53:08 +02:00
Alexander Friedland	63e47d0c32	Merge pull request #1821 from gradido/1816-Expired-link-are-not-highlighted ... 1816 expired link are not highlighted	2022-04-22 16:13:27 +02:00
ogerly	70a153c67c	changed paddings from dropdown menu	2022-04-22 16:00:06 +02:00
Alexander Friedland	4b04c0e771	Merge branch 'master' into 1816-Expired-link-are-not-highlighted	2022-04-22 15:59:28 +02:00
Alexander Friedland	db8a837518	Merge pull request #1820 from gradido/1812-Put-QR-Code-into-Popup-on-generate ... 1812 put qr code into popup on generate	2022-04-22 15:58:27 +02:00
Alexander Friedland	53a192c25b	Merge branch 'master' into 1816-Expired-link-are-not-highlighted	2022-04-22 15:17:17 +02:00
Alexander Friedland	ee4feb5cac	Merge branch 'master' into 1812-Put-QR-Code-into-Popup-on-generate	2022-04-22 15:16:06 +02:00
Ulf Gebhardt	4de4451ee2	Merge pull request #1817 from gradido/federation_image ... Docu: Federation image	2022-04-22 13:29:39 +02:00
Ulf Gebhardt	c0836d03e1	Merge branch 'master' into 1676-feature-federation-technical-concept	2022-04-22 13:22:15 +02:00
Ulf Gebhardt	d3957ae527	Merge branch 'master' into federation_image	2022-04-22 13:18:25 +02:00
Alexander Friedland	dde695831a	Merge branch 'master' into 1816-Expired-link-are-not-highlighted	2022-04-22 13:08:28 +02:00
ogerly	f8e46cc1e1	remove another unused font-scale 1	2022-04-22 13:07:39 +02:00
ogerly	432e0c1e71	remove unused font-scale 1	2022-04-22 13:05:56 +02:00
Alexander Friedland	17ba05eecf	Merge pull request #1819 from gradido/1813-QR-Code-Popup ... 1813 qr code popup	2022-04-22 13:02:50 +02:00
ogerly	268289bc70	change button color	2022-04-22 12:59:55 +02:00
Alexander Friedland	c28b4eabbb	Merge branch 'master' into 1813-QR-Code-Popup	2022-04-22 12:44:30 +02:00
ogerly	d595c76d08	change props from text to link in FigureQrCode	2022-04-22 12:43:27 +02:00
Alexander Friedland	3163acabee	Merge branch 'master' into 1812-Put-QR-Code-into-Popup-on-generate	2022-04-22 12:19:20 +02:00
clauspeterhuebner	7614e768fa	Merge pull request #1822 from gradido/fix_windows_cross-env ... Fix: cross-env for windows	2022-04-22 12:18:44 +02:00
ogerly	0361b99a11	fixed test validUntil to string	2022-04-22 12:17:43 +02:00