7008 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	54dee861dd	reduce length of code	2022-03-09 15:12:25 +01:00
Moriz Wahl	8bdd25cd01	add hold available amount to model	2022-03-09 15:09:01 +01:00
Moriz Wahl	14a0a4344d	Add hold_available_amount column	2022-03-09 15:07:55 +01:00
Moriz Wahl	f78f2d5977	remove default dates	2022-03-09 15:01:34 +01:00
Moriz Wahl	91c7b05185	remove default dates	2022-03-09 15:00:34 +01:00
Moriz Wahl	dee6fd9d0a	fix createdAt is now	2022-03-09 14:59:21 +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
Moriz Wahl	437da5eeda	feat: Transaction Link Model	2022-03-09 11:05:01 +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
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
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
Alexander Friedland	650163c00a	Merge pull request #1578 from gradido/show-community-name-in-creation-transaction ... community name in creation transaction is displayed cleanly	2022-03-08 13:39:51 +01:00
ogerly	680d43b2cd	community name in creation transaction is displayed cleanly	2022-03-08 09:41:05 +01:00
Alexander Friedland	412ce993f5	Merge branch 'master' into refactor-backend-relative-paths	2022-03-08 09:33:45 +01:00
Alexander Friedland	6186b314bb	Merge branch 'master' into refactor-frontend-directories	2022-03-08 09:09:59 +01:00
Moriz Wahl	eafa00b3bf	less divs	2022-03-08 07:37:28 +01:00
Moriz Wahl	2e75ceb73e	remove unnecesesary divs	2022-03-08 07:35:34 +01:00
Moriz Wahl	1c03aa00da	refactor display of time passed for decay	2022-03-08 07:27:07 +01:00
Moriz Wahl	2d2369ccaf	map transaction typeId to locales	2022-03-08 07:02:58 +01:00
Moriz Wahl	b2d731a641	block for tests	2022-03-08 06:53:36 +01:00
Moriz Wahl	acba22040c	add tests for amount filters	2022-03-08 06:51:56 +01:00
Moriz Wahl	938b811d8a	render decay with GDD	2022-03-08 06:36:15 +01:00
Moriz Wahl	53338ee223	do not use amount filter in status component	2022-03-08 06:26:23 +01:00
Moriz Wahl	0538b78cd1	fix bugs in Transacrion Components, fix tests for GDD transaction list, use filter in menu and status	2022-03-08 06:21:36 +01:00
Moriz Wahl	f58d1a843b	GDD filter	2022-03-08 05:15:58 +01:00
Moriz Wahl	aa8432384e	hack the i18n for tests	2022-03-08 04:37:34 +01:00
Moriz Wahl	09de529443	feat: Use Vue Filter for Amounts	2022-03-08 04:21:47 +01:00
clauspeterhuebner	034828a6f8	Merge pull request #1567 from gradido/1170_Send_new_Users_Gradido ... Planning: send new users gradido	2022-03-08 01:20:56 +01:00