8035 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	a9f64d2fd6	Merge pull request #1762 from gradido/define-context-object ... refactor: Define Context Interface	2022-04-12 19:54:24 +02:00
Moriz Wahl	263d0ab812	Merge branch 'master' into define-context-object	2022-04-12 19:45:19 +02:00
Moriz Wahl	11193f29fa	Merge pull request #1742 from gradido/fix-elopage-status ... fix: Elopage Status	2022-04-12 19:44:59 +02:00
Moriz Wahl	51a95132c4	Merge branch 'master' into fix-elopage-status	2022-04-12 19:33:51 +02:00
Ulf Gebhardt	b1dd255d1e	Merge pull request #1749 from gradido/frontend_decay_start_block_as_static ... Refactor: Frontend decay start block as static config value	2022-04-12 19:22:08 +02:00
Ulf Gebhardt	9332eeff36	Merge branch 'master' into frontend_decay_start_block_as_static	2022-04-12 19:06:04 +02:00
Moriz Wahl	de6421201d	use getUser helper to get moderator form context	2022-04-12 19:04:29 +02:00
Moriz Wahl	4a71acab55	Merge branch 'master' into fix-elopage-status	2022-04-12 18:47:00 +02:00
ogerly	fb8fed7cc5	fix yarn lint	2022-04-12 16:54:37 +02:00
Alexander Friedland	ef9f1c7d38	Merge branch 'master' into 1668-Admin-make-User-Details-tabbed	2022-04-12 16:27:59 +02:00
Alexander Friedland	ffeddda436	Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list	2022-04-12 16:25:42 +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
Alexander Friedland	e116172cba	Merge pull request #1758 from gradido/1757-to-locales-Still-valid-14-days ... better date format for reddem valid date	2022-04-12 16:22:22 +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
Wolfgang Huß	35c5bf4c41	Merge branch 'master' of github.com:gradido/gradido into 1734-emails-get-wallet-link	2022-04-12 15:40:33 +02:00
Wolfgang Huß	563afcbf2a	Add EMAIL_CLIENT_URI in config ... - Increment config version. - Correct usage of EMAIL_CLIENT_URI.	2022-04-12 15:36:05 +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	cc50cc3a3e	Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list	2022-04-12 15:12:49 +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	38b2b2b6c7	Merge pull request #1754 from gradido/1753-darker-background-summary-transaktion-links ... add insert shadow in summary links transaction type	2022-04-12 15:07:51 +02:00
Ulf Gebhardt	87aed30cfd	good catch	2022-04-12 14:57:46 +02:00
Wolfgang Huß	ea5589a840	Add wallet link to transaction mail, first approach	2022-04-12 12:18:04 +02:00
ogerly	4c75c79c14	remove package vue-qrcode	2022-04-12 09:18:30 +02:00
ogerly	de4931e1e0	avatar added with the first letters of the first and last name	2022-04-12 09:12:19 +02:00
ogerly	37aaf3bc63	remove package vue-qrcode from app & system	2022-04-12 08:50:25 +02:00
ogerly	ab76b05ba6	remove package qrcode from system	2022-04-12 08:44:18 +02:00
ogerly	04fb116ce9	remove QrCodeReader.vue & vue-qrcode-reader from system	2022-04-12 08:43:06 +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
Moriz Wahl	f752d8d045	type ExpressContext	2022-04-11 17:25:59 +02:00
Moriz Wahl	71d1701102	undo apollo log plugin hack	2022-04-11 16:31:21 +02:00
Moriz Wahl	902dce6390	Context interface in balance resolver	2022-04-11 16:24:38 +02:00
Moriz Wahl	d7bec83d25	use Context interface in Transaction resolver	2022-04-11 16:22:32 +02:00
Moriz Wahl	00bba07b11	define hack to pass already queried data to balance resolver	2022-04-11 16:22:09 +02:00
Moriz Wahl	6cc8410720	helper function to get user from context	2022-04-11 16:15:57 +02:00
Moriz Wahl	b0606424d4	Context interface in transaction link resolver	2022-04-11 16:08:39 +02:00
Moriz Wahl	71cb56db0e	no unused lint instruction	2022-04-11 16:04:04 +02:00
Moriz Wahl	8900592b90	use Context interface in GDT resolver	2022-04-11 16:03:12 +02:00
Moriz Wahl	e430ceefa3	remove unused lint rule	2022-04-11 15:59:23 +02:00
Moriz Wahl	9a390c11db	use Context interface in admin resolver	2022-04-11 15:57:59 +02:00
Moriz Wahl	4d09123b0e	remove global no explicit any lint rule	2022-04-11 15:55:05 +02:00
Moriz Wahl	e183a9bde0	remove unused modules	2022-04-11 15:53:00 +02:00
Moriz Wahl	97ee572c3a	Merge branch 'fix-elopage-status' into define-context-object	2022-04-11 15:50:52 +02:00
Moriz Wahl	57298a4d3a	use Context interface in user resolver	2022-04-11 15:50:46 +02:00
Moriz Wahl	7ec35bbfb2	define context interface	2022-04-11 15:50:02 +02:00
Moriz Wahl	f57f67846e	reconstruct context object	2022-04-11 14:58:00 +02:00
ogerly	6a6edfde62	change text links_sum in locales	2022-04-10 20:03:53 +02:00