10160 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Friedland	ea62b1afaa	Merge branch 'master' into 1729-load-spinner-if-pending-balance	2022-04-04 22:09:20 +02:00
Alexander Friedland	9b47bf3c40	Merge branch 'master' into 1727-Change-button-text-and-observe-spelling	2022-04-04 22:08:53 +02:00
Alexander Friedland	39f4be9606	Merge pull request #1724 from gradido/1723-remembered-and-selected-accordingly-send-per-link ... transaction type remains when jumping from the verification back	2022-04-04 22:07:27 +02:00
ogerly	1b88c23b05	fixed test for pagination	2022-04-04 17:59:57 +02:00
ogerly	04d55d7a1e	fixed lint	2022-04-04 16:36:58 +02:00
ogerly	197305b81e	change text button edit to back	2022-04-04 16:26:59 +02:00
ogerly	d45d8cd02b	fixed test TransactionForm.spec.js	2022-04-04 16:18:10 +02:00
ogerly	41fe52fcc9	fixed lint	2022-04-04 16:17:18 +02:00
ogerly	7ad9aae50a	change variable radio_selected to radioSelected	2022-04-04 16:16:41 +02:00
Alexander Friedland	a47f0ac218	Merge branch 'master' into 1706-After-unsuccessful-sending-email-is-cleared	2022-04-04 13:34:19 +02:00
Alexander Friedland	035d10753e	Merge branch 'master' into 1727-Change-button-text-and-observe-spelling	2022-04-04 13:33:37 +02:00
Alexander Friedland	33bcb859b9	Merge branch 'master' into 1729-load-spinner-if-pending-balance	2022-04-04 13:33:03 +02:00
Alexander Friedland	c00efbfcb8	Merge branch 'master' into 1723-remembered-and-selected-accordingly-send-per-link	2022-04-04 13:32:50 +02:00
Alexander Friedland	e6ed76e6b4	Merge pull request #1726 from gradido/1725-text-for-toast-expand-link-copied ... text for toast expand link copied	2022-04-04 13:28:29 +02:00
Alexander Friedland	cc340d2718	Update frontend/src/components/GddSend/TransactionConfirmationSend.spec.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-04-04 13:17:16 +02:00
Alexander Friedland	16aa988558	Update frontend/src/components/Status.spec.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-04-04 13:16:09 +02:00
Alexander Friedland	5b1f8d1164	Update frontend/src/components/Status.spec.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-04-04 13:16:00 +02:00
Alexander Friedland	e3f76d6d35	Update frontend/src/components/GddSend/TransactionForm.spec.js ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-04-04 13:08:58 +02:00
ogerly	4ada891a89	remove only	2022-04-04 13:05:21 +02:00
ogerly	998514c62b	out commend toast test success used	2022-04-04 13:05:21 +02:00
Alexander Friedland	98ae90c05e	Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list	2022-04-04 11:32:36 +02:00
ogerly	0642b19791	fixed test for navigator.clipboard	2022-04-04 11:16:32 +02:00
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