6896 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	9a637e1209	Merge branch 'master' into eslint_style_rules	2022-03-11 00:09:52 +01:00
Hannes Heine	797d270b73	Merge pull request #1586 from gradido/query-transaction-link ... Query-transaction-link	2022-03-11 00:03:14 +01:00
Ulf Gebhardt	1f89e8038d	fix tabs in stylelintrc.js	2022-03-11 00:02:54 +01:00
Ulf Gebhardt	333095c927	use correct sass version	2022-03-10 23:54:21 +01:00
elweyn	7e3f86f60e	Remove unused import.	2022-03-10 23:49:28 +01:00
elweyn	bfba633b78	Change the logic to store the redeemer in transactionLink table.	2022-03-10 21:52:49 +01:00
elweyn	a805f65920	Change the logic to a better argument name for redeemUserId.	2022-03-10 21:37:23 +01:00
elweyn	280de3df9e	Add Args for the queryTransactionLink.	2022-03-10 21:36:53 +01:00
elweyn	ade691426e	Add logic for user that redeem the link.	2022-03-10 21:24:42 +01:00
Ulf Gebhardt	1951d834b3	fixed another error, ... remove duplicates	2022-03-10 21:16:24 +01:00
Ulf Gebhardt	30a16fafc4	fixed sass divison	2022-03-10 21:12:55 +01:00
Ulf Gebhardt	227273f22c	custom style defintions	2022-03-10 21:12:42 +01:00
Ulf Gebhardt	5d973a887e	properly use color.adjust	2022-03-10 21:03:58 +01:00
Ulf Gebhardt	735ed77ffb	sass color namespace	2022-03-10 20:55:45 +01:00
Ulf Gebhardt	1761d6380c	use sass map namespace	2022-03-10 20:47:38 +01:00
Ulf Gebhardt	78ac6184de	use sass instead of node-sass	2022-03-10 20:37:28 +01:00
Ulf Gebhardt	30072a3ec5	fix sass file loaded in test	2022-03-10 20:37:15 +01:00
Ulf Gebhardt	f0ab71fc66	Merge branch 'master' into eslint_style_rules	2022-03-10 20:09:38 +01:00
Ulf Gebhardt	8ac00d82ca	fix frontend lint	2022-03-10 20:09:28 +01:00
Ulf Gebhardt	fdab9b0894	admin lint	2022-03-10 19:50:10 +01:00
Ulf Gebhardt	e82306e4bb	stylelint fixes	2022-03-10 19:48:11 +01:00
elweyn	701f0549b8	Merge branch 'query-transaction-link' of https://github.com/gradido/gradido into query-transaction-link	2022-03-10 18:15:47 +01:00
Hannes Heine	92f02f9f39	Merge branch 'master' into query-transaction-link	2022-03-10 18:14:27 +01:00
elweyn	def310fa3b	Add QUERY_TRANSACTION_LINK to inalienable rights.	2022-03-10 18:10:03 +01:00
Moriz Wahl	cd0287e030	Merge pull request #1585 from gradido/create-transaction-link-mutation ... feat: Create Transaction Link Mutation	2022-03-10 18:09:54 +01:00
Moriz Wahl	47e491db84	update entity	2022-03-10 18:01:13 +01:00
Moriz Wahl	80650e60b8	remove apollo log plugin hack, improve model	2022-03-10 18:00:47 +01:00
Moriz Wahl	fae9d91004	add comment to explain why set to null in constructor	2022-03-10 16:00:15 +01:00
Moriz Wahl	3436253bbe	transaction link repository, use raw query to get sum of hold available amount	2022-03-10 15:33:26 +01:00
Moriz Wahl	9143990535	turn of logger when NODE_ENV === '"development"'	2022-03-10 15:05:32 +01:00
Moriz Wahl	91fe38fe8f	use db values instead of null	2022-03-10 14:28:42 +01:00
Ulf Gebhardt	8c14fb64c4	forbid inline style in admin	2022-03-10 12:57:13 +01:00
Ulf Gebhardt	049e1c4318	admin stylelint config file	2022-03-10 12:48:07 +01:00
Ulf Gebhardt	ec58862e7e	test workflow for stylelint admin	2022-03-10 12:38:56 +01:00
Ulf Gebhardt	a3fa10abd2	admin - yarn commands analyse-bundle, stylelint, i18n:report	2022-03-10 12:35:21 +01:00
Ulf Gebhardt	a8c5fca69d	moved vue-cli-plugin-i18n into dev dependencies	2022-03-10 12:34:31 +01:00
Ulf Gebhardt	5b72d01c7d	vue stylelint	2022-03-10 12:22:53 +01:00
Ulf Gebhardt	56e7e3b28b	use node 16 since node 17 uses ssl3	2022-03-10 11:52:27 +01:00
Hannes Heine	70780878f5	Merge branch 'master' into query-transaction-link	2022-03-10 01:49:12 +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	dbc8382f33	Merge branch 'create-transaction-link-mutation' of github.com:gradido/gradido into create-transaction-link-mutation	2022-03-09 18:25:32 +01:00
Moriz Wahl	5f42748358	error message and constant for transaction link duration	2022-03-09 18:25:17 +01:00
Moriz Wahl	7edacb9c8f	Merge branch 'master' into create-transaction-link-mutation	2022-03-09 18:19:17 +01:00
Moriz Wahl	8107066d2b	balance includes transactions to hold available, calculateBalance checks for pending transaction links	2022-03-09 18:18:22 +01:00