2110 Commits

Author	SHA1	Message	Date
Alexander Friedland	672496499c	Merge branch 'master' into 1751-Make-GTT-visible-only-if-explicitly-clicked	2022-04-14 11:22:27 +02:00
ogerly	26fd677098	resolve conflict	2022-04-14 09:49:08 +02:00
Alexander Friedland	fcb3250b63	Merge branch 'master' into 1751-Make-GTT-visible-only-if-explicitly-clicked	2022-04-12 20:53:20 +02:00
Alexander Friedland	979a48e438	Merge branch 'master' into 1755-insert-additional-set-when-redeeming	2022-04-12 20:48:28 +02:00
Ulf Gebhardt	9332eeff36	Merge branch 'master' into frontend_decay_start_block_as_static	2022-04-12 19:06:04 +02:00
ogerly	fb8fed7cc5	fix yarn lint	2022-04-12 16:54:37 +02:00
Alexander Friedland	f2906dad9b	Merge branch 'master' into 1751-Make-GTT-visible-only-if-explicitly-clicked	2022-04-12 16:24:54 +02:00
Alexander Friedland	f9440a15cf	Merge branch 'master' into 1755-insert-additional-set-when-redeeming	2022-04-12 16:24:19 +02:00
ogerly	7224fd7cf7	resolve conflict	2022-04-12 16:21:26 +02:00
ogerly	841cf2514f	resolve conflict	2022-04-12 16:19:40 +02:00
Alexander Friedland	f625681c51	Merge branch 'master' into 1751-Make-GTT-visible-only-if-explicitly-clicked	2022-04-12 15:21:54 +02:00
Alexander Friedland	0cb00cf446	Merge branch 'master' into 1755-insert-additional-set-when-redeeming	2022-04-12 15:11:49 +02:00
Alexander Friedland	ecb8fadb60	Merge branch 'master' into 1757-to-locales-Still-valid-14-days	2022-04-12 15:09:42 +02:00
Alexander Friedland	1dbe9db5aa	Update frontend/src/pages/Transactions.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-04-11 17:51:32 +02:00
Alexander Friedland	146ea12730	Update frontend/src/pages/Transactions.vue ... Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>	2022-04-11 17:51:07 +02:00
ogerly	6a6edfde62	change text links_sum in locales	2022-04-10 20:03:53 +02:00
ogerly	50be004ce4	add jest.fn((d)	2022-04-10 14:47:43 +02:00
ogerly	2e37b81abc	fix style lint	2022-04-10 13:32:46 +02:00
ogerly	94382d9834	better date format for reddem valid date	2022-04-10 12:51:05 +02:00
ogerly	3101719c67	fix yarn lint	2022-04-10 12:30:50 +02:00
ogerly	5206dacf01	yarn locales fixx	2022-04-10 12:24:40 +02:00
ogerly	73af0574a4	new locales added: gdd_per_link.isFree	2022-04-10 12:23:56 +02:00
ogerly	8a621ec7ce	add insert shadow in summary links transaction type	2022-04-10 12:09:02 +02:00
ogerly	7a3b73580f	git fix yarn locales	2022-04-10 10:33:52 +02:00
ogerly	65fbc27bb3	add function showGdtBalance()	2022-04-10 10:32:08 +02:00
ogerly	cd41e548cd	remove status row, fixed tests	2022-04-10 10:30:27 +02:00
ogerly	bfd8f202e3	add gdt.gdt locales	2022-04-10 10:29:47 +02:00
Ulf Gebhardt	ab7b2a7028	test for correct startblock date in frontend	2022-04-07 13:06:47 +02:00
Ulf Gebhardt	d5d90c7050	remove decayStartBlock from all component interfaces	2022-04-06 15:24:17 +02:00
Ulf Gebhardt	3582805098	reference config decay start time when figuring out if its the decay start block	2022-04-06 15:23:47 +02:00
Ulf Gebhardt	ebb6c926d8	define decay start block in config statically	2022-04-06 15:22:57 +02:00
Moriz Wahl	6a5ad7e6b5	Merge branch '503-Transaction-List-Pagination-Pages-clickable' of github.com:gradido/gradido into 503-Transaction-List-Pagination-Pages-clickable	2022-04-05 14:35:46 +02:00
Moriz Wahl	e942cd2069	remove unused locale due to deletion of pagination component	2022-04-05 14:35:35 +02:00
Alexander Friedland	e819c1868d	Merge branch 'master' into 503-Transaction-List-Pagination-Pages-clickable	2022-04-05 13:50:46 +02:00
Moriz Wahl	ddeb936634	remove unused pagination component	2022-04-05 13:30:06 +02:00
Moriz Wahl	f8412acb5e	improve tests	2022-04-05 13:27:43 +02:00
Moriz Wahl	a6b5dddc61	email is restored after clicking back from transaction confirmation	2022-04-05 13:01:33 +02:00
Alexander Friedland	066f898805	Merge branch 'master' into 503-Transaction-List-Pagination-Pages-clickable	2022-04-05 09:43:09 +02:00
Alexander Friedland	13de1d07e0	Merge branch 'master' into 1706-After-unsuccessful-sending-email-is-cleared	2022-04-04 22:58:12 +02:00
Alexander Friedland	51d4e855b4	Merge branch 'master' into 1727-Change-button-text-and-observe-spelling	2022-04-04 22:41:19 +02:00
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
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