6840 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	56e7e3b28b	use node 16 since node 17 uses ssl3	2022-03-10 11:52:27 +01:00
Ulf Gebhardt	2bf6e5a98a	python3	2022-03-09 21:28:03 +01:00
Ulf Gebhardt	9943dce7e7	node 17 with node-gyp dependencies	2022-03-09 21:25:17 +01:00
Ulf Gebhardt	9390cd7fd2	downgraded node version to 16.14 to have proper python compiler	2022-03-09 21:14:58 +01:00
Ulf Gebhardt	0275417f3d	updated node version frontend	2022-03-09 21:11:58 +01:00
Ulf Gebhardt	5c308e41b9	workflow for stylelint	2022-03-09 21:00:01 +01:00
Ulf Gebhardt	28f8c9e8ac	stylelint for scss	2022-03-09 20:58:12 +01:00
Ulf Gebhardt	eb681467de	no inline style	2022-03-09 20:30:26 +01:00
Moriz Wahl	8211538d6f	Merge pull request #1584 from gradido/model-transaction-link ... feat: Model Transaction Link	2022-03-09 17:23:26 +01:00
Moriz Wahl	dbb42c30ec	increase timeout by factoe 100	2022-03-09 17:07:32 +01:00
Moriz Wahl	f961772854	add soft delete to transaction link model	2022-03-09 16:51:56 +01:00
Moriz Wahl	01648aaa0d	add soft delete for transaction links	2022-03-09 16:51:17 +01:00
Moriz Wahl	d4ce46b271	update db version	2022-03-09 16:34:54 +01:00
Moriz Wahl	0bc070b784	Merge branch 'master' into model-transaction-link	2022-03-09 15:51:52 +01:00
Moriz Wahl	a84a1f0d4b	Merge pull request #1538 from gradido/test-login-user-resolver ... feat: Test Login in User Resolver	2022-03-09 15:51:38 +01:00
Moriz Wahl	d7d232f2f4	Merge branch 'master' into test-login-user-resolver	2022-03-09 15:44:06 +01:00
Moriz Wahl	55e50b10c7	reduce length of code in migration	2022-03-09 15:14:15 +01:00
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	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
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