10160 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Friedland	eaf8c57e37	Merge branch 'master' into frontend-generate-link-for-send-gdd	2022-03-09 14:52:07 +01:00
Moriz Wahl	9550c31cac	set type for redeemed by, change order	2022-03-09 14:34:29 +01:00
Moriz Wahl	ea38251c0e	Merge branch 'master' into model-transaction-link	2022-03-09 14:30:53 +01:00
Moriz Wahl	1a715f8b71	simple resolver for createTransactionLink	2022-03-09 14:30:25 +01:00
Moriz Wahl	e88f561003	rights for createTransactionLink	2022-03-09 14:29:57 +01:00
Moriz Wahl	c9d24c3b61	add constructor	2022-03-09 14:29:20 +01:00
Moriz Wahl	e8e86d6351	set DB version	2022-03-09 14:28:28 +01:00
Moriz Wahl	75b91a2db3	set type for redeemed by, change order	2022-03-09 14:27:53 +01:00
Alexander Friedland	8110068d58	Merge pull request #1583 from gradido/1581-No-Pointer-Cursor-on-Transaction-List ... add style in App.vue, set class .pointer on transaction-list-item	2022-03-09 12:56:42 +01:00
Moriz Wahl	eb5b19e6d6	add code column to model and entity	2022-03-09 12:02:10 +01:00
Moriz Wahl	19084d7514	entity transaction link	2022-03-09 11:55:36 +01:00
ogerly	3dc82f780e	set bg-color on collaps	2022-03-09 11:51:23 +01:00
ogerly	67506c0ed6	add style in App.vue, set class .pointer on transaction-list-item	2022-03-09 11:44:50 +01:00
Moriz Wahl	5f5bde2f0f	migration to create transaction_links table	2022-03-09 11:38:24 +01:00
Alexander Friedland	dde510679e	Merge branch 'master' into frontend-generate-link-for-send-gdd	2022-03-09 11:30:33 +01:00
ogerly	ddaa1634a0	change i18n locales to en, change test date contain without text	2022-03-09 11:29:06 +01:00
Moriz Wahl	5fb81a629c	less divs	2022-03-09 11:22:15 +01:00
Moriz Wahl	a4c2ff3309	remove unnecesesary divs	2022-03-09 11:22:15 +01:00
Moriz Wahl	e4f2a2e055	refactor display of time passed for decay	2022-03-09 11:22:15 +01:00
Moriz Wahl	ef6567843c	map transaction typeId to locales	2022-03-09 11:22:15 +01:00
Moriz Wahl	fe10316d47	block for tests	2022-03-09 11:22:15 +01:00
Moriz Wahl	94e26ced63	add tests for amount filters	2022-03-09 11:22:15 +01:00
Moriz Wahl	18a17aca7a	render decay with GDD	2022-03-09 11:22:15 +01:00
Moriz Wahl	c219a35783	do not use amount filter in status component	2022-03-09 11:22:15 +01:00
ogerly	1bcabd26e8	remove substring in tests, merge master	2022-03-09 11:21:11 +01:00
Moriz Wahl	53611ba51e	GDD filter	2022-03-09 11:17:42 +01:00
Moriz Wahl	690e8a817e	hack the i18n for tests	2022-03-09 11:17:42 +01:00
Moriz Wahl	6770f010e2	feat: Use Vue Filter for Amounts	2022-03-09 11:17:42 +01:00
Moriz Wahl	437da5eeda	feat: Transaction Link Model	2022-03-09 11:05:01 +01:00
ogerly	e1256eddf2	test Data: selected in TransactionForm.spec.js	2022-03-09 11:04:49 +01:00
Moriz Wahl	7ddfeed97d	Merge pull request #1576 from gradido/use-filter-to-display-amounts ... feat: Use Vue Filter to Display Gradido Amounts	2022-03-09 10:50:46 +01:00
ogerly	d0885554d6	add locales for TransactionForm.vue	2022-03-09 09:01:01 +01:00
ogerly	a2550cae6a	yarn test fixed, resolve date error with substring, add selected 'send' on submit test	2022-03-09 08:51:07 +01:00
ogerly	8545ca1790	yarn lint --fix	2022-03-09 08:23:03 +01:00
ogerly	59bff37ba4	merge master, resolve conflicts	2022-03-09 08:20:51 +01:00
Claus-Peter Hübner	2bafa1812a	first steps	2022-03-09 02:23:59 +01:00
Moriz Wahl	a385f1772c	fix test	2022-03-08 18:19:01 +01:00
Moriz Wahl	25288ce835	Merge branch 'master' into use-filter-to-display-amounts	2022-03-08 18:06:42 +01:00
Moriz Wahl	18318404eb	Merge branch 'master' into test-login-user-resolver	2022-03-08 18:06:16 +01:00
Moriz Wahl	c5ff18f461	use @paths	2022-03-08 18:04:55 +01:00
Moriz Wahl	8300449324	Merge pull request #1572 from gradido/refactor-backend-relative-paths ... refactor: Resolve Relative Paths in Backend	2022-03-08 18:01:21 +01:00
ogerly	41a2b975a4	change lacales in english give away to send	2022-03-08 14:50:14 +01:00
ogerly	dafe98efc6	change lacales verschenken to versenden	2022-03-08 14:50:14 +01:00
Moriz Wahl	3d70dd0955	Merge branch 'master' into use-filter-to-display-amounts	2022-03-08 14:08:02 +01:00
Moriz Wahl	982be8d1ac	Merge branch 'master' into refactor-backend-relative-paths	2022-03-08 14:06:52 +01:00
Moriz Wahl	82ebcc0ae9	Merge branch 'master' into test-login-user-resolver	2022-03-08 14:06:21 +01:00
Moriz Wahl	ad44cf74dc	Merge pull request #1571 from gradido/refactor-frontend-directories ... refactor: Frontend Directory Structure and Routes	2022-03-08 14:05:48 +01:00
Moriz Wahl	e335a12aee	Merge branch 'master' into use-filter-to-display-amounts	2022-03-08 13:52:26 +01:00
Moriz Wahl	3a51ee645d	Merge branch 'master' into refactor-frontend-directories	2022-03-08 13:48:11 +01:00
Moriz Wahl	881b8a37c2	Merge branch 'master' into refactor-backend-relative-paths	2022-03-08 13:46:00 +01:00