9538 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Friedland	9d0dbfbe55	Merge branch 'master' into 1682-new-design-for-the-login-and-registration-area	2022-04-03 13:35:45 +02:00
ogerly	2f6ed90f15	fixed test for pending animation icon	2022-04-03 13:02:53 +02:00
ogerly	f1555b4a27	fixed yarn lint	2022-04-03 12:55:52 +02:00
ogerly	a5546826a5	delete unused text	2022-04-03 12:55:18 +02:00
ogerly	f33c9694ad	if pending status true load spinner	2022-04-03 12:53:24 +02:00
ogerly	75d339903e	change text from button.btn-success to button.btn-primary	2022-04-03 12:05:56 +02:00
ogerly	0569680b35	change button[type=reset] text from reset to cancel	2022-04-03 12:05:07 +02:00
ogerly	d446afacbc	change button.btn-success to button.btn-primary	2022-04-03 12:03:56 +02:00
ogerly	00bb4a1abc	fixed yarn lint	2022-04-03 11:57:54 +02:00
ogerly	a0bdecbe1a	change text button	2022-04-03 11:56:49 +02:00
ogerly	b6b8baf2f8	fixed tests, change selected to radio_selected	2022-04-03 11:13:09 +02:00
ogerly	307f1092d5	text for toast expand link copied	2022-04-03 11:03:01 +02:00
ogerly	67f922fcd4	transaction type remains when jumping from the verification back	2022-04-03 10:46:38 +02:00
ogerly	f01f28cc82	if no recipientEmail else form.email	2022-04-03 09:48:21 +02:00
Ulf Gebhardt	2f0da9a97a	Merge pull request #1721 from gradido/v1.7.1 ... v1.7.1	2022-04-01 15:12:24 +02:00
Ulf Gebhardt	f76a85baee	v1.7.1	2022-04-01 15:04:02 +02:00
Moriz Wahl	b3c459c0a4	Merge pull request #1720 from gradido/fix-date-display-on-redeem-transaction-link ... fix: Localize Dates on Redeem Transaction Link Page	2022-04-01 14:58:50 +02:00
Moriz Wahl	f17b8d92f2	Merge branch 'master' into fix-date-display-on-redeem-transaction-link	2022-04-01 14:49:05 +02:00
Moriz Wahl	2b6a423123	Merge pull request #1718 from gradido/round-virtual-transaction-link-transaction ... fix: Round Virtual Transaction Link Transaction	2022-04-01 14:48:54 +02:00
Moriz Wahl	5e1ddb718b	fix tests	2022-04-01 14:48:34 +02:00
Moriz Wahl	fe4a6479be	Merge branch 'master' into round-virtual-transaction-link-transaction	2022-04-01 14:39:53 +02:00
Moriz Wahl	8923cda341	fix copy and paste mess	2022-04-01 14:35:42 +02:00
Ulf Gebhardt	efac4714d9	Merge branch 'master' into fix-date-display-on-redeem-transaction-link	2022-04-01 14:35:12 +02:00
Moriz Wahl	efbb8a3bcb	localize dates	2022-04-01 14:31:14 +02:00
Alexander Friedland	fbc2fe38a3	Merge pull request #1719 from gradido/decay-icon-deacy-information ... larger icon and deacy information if center	2022-04-01 14:23:56 +02:00
Moriz Wahl	cc86a81117	round decay values in transaction graphql model	2022-04-01 14:13:49 +02:00
Moriz Wahl	ff04cf0cb5	do not round in decay model as it is used in utils on creation	2022-04-01 14:08:55 +02:00
Moriz Wahl	a32e0a9d43	round down decay amount and balance	2022-04-01 14:04:01 +02:00
ogerly	35d5555350	change cols from 0, 12 / 6, 6 zu 1, 11 / 5, 7	2022-04-01 14:03:29 +02:00
Moriz Wahl	15e3aeb7e6	round virtual transaction link transaction	2022-04-01 13:57:25 +02:00
ogerly	3a33f0bf37	icon droplet-half larger end position	2022-04-01 13:52:23 +02:00
Ulf Gebhardt	e3bf239132	Merge pull request #1717 from gradido/fix_restore ... Fix: restore script load correct .env	2022-04-01 13:23:31 +02:00
Ulf Gebhardt	cf4299fe72	drop database aswell	2022-04-01 13:15:11 +02:00
Ulf Gebhardt	f74b84bd30	Merge branch 'master' into fix_restore	2022-04-01 13:11:23 +02:00
Alexander Friedland	b1b0a8c33b	Merge pull request #1716 from gradido/fix-disbled-button-if-totalBalance ... fix-disbled-button-if-totalBalance	2022-04-01 13:11:17 +02:00
Ulf Gebhardt	bb2e3abbf9	load database .env instead of backend .env	2022-04-01 13:08:35 +02:00
ogerly	95b49709c7	fix-disbled-button-if-totalBalance	2022-04-01 12:41:16 +02:00
Alexander Friedland	f0e11c2aba	Merge pull request #1713 from gradido/1712-Layouting-droplet ... icon droplet-halflarger and correctly positioned	2022-04-01 12:21:05 +02:00
ogerly	a8f1c9643d	icon droplet-halflarger and correctly positioned	2022-04-01 10:23:41 +02:00
Claus-Peter Hübner	746092cbd4	rework after first review discussion	2022-04-01 01:05:07 +02:00
Ulf Gebhardt	2baf1ddb28	Merge pull request #1709 from gradido/clean-up-registration-flow ... fix: Clean up Registration Flow	2022-03-31 23:35:09 +02:00
Moriz Wahl	2d09bc3b35	Merge branch 'master' into clean-up-registration-flow	2022-03-31 23:26:10 +02:00
Alexander Friedland	3ca9adc1ae	Merge pull request #1705 from gradido/1703-submit-button-disabled-when-total-amount-to-submit-is-minus ... 1703 submit button disabled when total amount to submit is minus	2022-03-31 23:25:31 +02:00
Moriz Wahl	da9553c1e2	Merge branch 'master' into clean-up-registration-flow	2022-03-31 23:20:09 +02:00
Moriz Wahl	84ad009969	fix tests	2022-03-31 23:17:58 +02:00
Alexander Friedland	8f81f922b3	Merge branch 'master' into 1703-submit-button-disabled-when-total-amount-to-submit-is-minus	2022-03-31 23:14:33 +02:00
Alexander Friedland	90bafd462a	Merge pull request #1704 from gradido/1686-When-sending-takes-longer-no-twice-results ... add extra disabled variable for send emit, disabled send by emit	2022-03-31 23:12:59 +02:00
Alexander Friedland	ecf6721c1e	Merge branch 'master' into 1686-When-sending-takes-longer-no-twice-results	2022-03-31 23:03:36 +02:00
Alexander Friedland	50b4cf5581	Merge branch 'master' into 1703-submit-button-disabled-when-total-amount-to-submit-is-minus	2022-03-31 23:03:25 +02:00
Moriz Wahl	72e1d7c3cd	no button after registration, fix link if self creator of link, redirect to login instad of redeem	2022-03-31 23:01:44 +02:00