7897 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
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	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
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
ogerly	6a6edfde62	change text links_sum in locales	2022-04-10 20:03:53 +02:00
ogerly	50be004ce4	add jest.fn((d)	2022-04-10 14:47:43 +02:00
ogerly	2e37b81abc	fix style lint	2022-04-10 13:32:46 +02:00
ogerly	94382d9834	better date format for reddem valid date	2022-04-10 12:51:05 +02:00
ogerly	3101719c67	fix yarn lint	2022-04-10 12:30:50 +02:00
ogerly	8a621ec7ce	add insert shadow in summary links transaction type	2022-04-10 12:09:02 +02:00
ogerly	7a3b73580f	git fix yarn locales	2022-04-10 10:33:52 +02:00
ogerly	65fbc27bb3	add function showGdtBalance()	2022-04-10 10:32:08 +02:00
ogerly	cd41e548cd	remove status row, fixed tests	2022-04-10 10:30:27 +02:00
ogerly	bfd8f202e3	add gdt.gdt locales	2022-04-10 10:29:47 +02:00
Ulf Gebhardt	a5e10c2ed9	Merge pull request #1747 from gradido/jwt_duration_30m ... Feature: JWT duration is now 30min by default	2022-04-06 23:02:08 +02:00
Ulf Gebhardt	97b7ba9db0	Merge branch 'master' into jwt_duration_30m	2022-04-06 19:29:25 +02:00
Ulf Gebhardt	b15d0b8a61	Merge pull request #1746 from gradido/docu_scope_of_gradido ... Docu: Scope of Gradido	2022-04-06 15:06:15 +02:00
Ulf Gebhardt	aacc5716b0	Merge branch 'master' into docu_scope_of_gradido	2022-04-06 14:55:45 +02:00
Moriz Wahl	4cca429f89	Merge pull request #1743 from gradido/fix-sending-to-inactivated-user ... fix: Check That Recipient User Has Activated Account to Receive Coins	2022-04-06 14:08:35 +02:00
Moriz Wahl	04774300d5	Merge branch 'master' into fix-sending-to-inactivated-user	2022-04-06 13:56:27 +02:00
Ulf Gebhardt	423aac93a9	new backend config version ... corrected backend config field order to match the actual config	2022-04-06 13:56:19 +02:00
Ulf Gebhardt	0565c0c255	default value for JWT expire is 30m instead of 10m ... Read value for JWT expire in `.env.template` new config version v4	2022-04-06 13:55:49 +02:00
Ulf Gebhardt	5880df2de0	Merge pull request #1737 from gradido/fix_config_default_reset_password ... Fix: Fixed config dist version to properly reflect new password reset url	2022-04-06 12:58:50 +02:00
Ulf Gebhardt	2b0b5e6e5c	gradido as platform drawio	2022-04-06 12:57:26 +02:00
Ulf Gebhardt	3d6e236bfe	scope of gradido presentation	2022-04-06 12:57:03 +02:00
Moriz Wahl	9c9cc631ee	Merge branch 'master' into fix_config_default_reset_password	2022-04-05 15:51:43 +02:00
Moriz Wahl	69dae586d8	check that recipient user has activated account in send coins	2022-04-05 15:12:36 +02:00
Alexander Friedland	c54ec6cf6a	Merge pull request #1677 from gradido/503-Transaction-List-Pagination-Pages-clickable ... 503 transaction list pagination pages clickable	2022-04-05 14:49:37 +02:00
Moriz Wahl	6a5ad7e6b5	Merge branch '503-Transaction-List-Pagination-Pages-clickable' of github.com:gradido/gradido into 503-Transaction-List-Pagination-Pages-clickable	2022-04-05 14:35:46 +02:00
Moriz Wahl	e942cd2069	remove unused locale due to deletion of pagination component	2022-04-05 14:35:35 +02:00
Moriz Wahl	7dbf8fe010	Merge branch 'master' into fix_config_default_reset_password	2022-04-05 14:33:29 +02:00
Alexander Friedland	e819c1868d	Merge branch 'master' into 503-Transaction-List-Pagination-Pages-clickable	2022-04-05 13:50:46 +02:00
Moriz Wahl	ddeb936634	remove unused pagination component	2022-04-05 13:30:06 +02:00
Moriz Wahl	f8412acb5e	improve tests	2022-04-05 13:27:43 +02:00
Alexander Friedland	22d10deea6	Merge pull request #1722 from gradido/1706-After-unsuccessful-sending-email-is-cleared ... if no recipientEmail else form.email	2022-04-05 13:12:26 +02:00
Moriz Wahl	a6b5dddc61	email is restored after clicking back from transaction confirmation	2022-04-05 13:01:33 +02:00
Ulf Gebhardt	676beda15f	also adjust bare_metal deployment .env.dist	2022-04-05 12:25:40 +02:00
Ulf Gebhardt	79013f3aa8	fixed config dist version to properly reflect new password reset url	2022-04-05 12:22:52 +02:00
Alexander Friedland	066f898805	Merge branch 'master' into 503-Transaction-List-Pagination-Pages-clickable	2022-04-05 09:43:09 +02:00
Alexander Friedland	13de1d07e0	Merge branch 'master' into 1706-After-unsuccessful-sending-email-is-cleared	2022-04-04 22:58:12 +02:00
Alexander Friedland	3da5b458c2	Merge pull request #1728 from gradido/1727-Change-button-text-and-observe-spelling ... 1727 change button text and observe spelling	2022-04-04 22:55:57 +02:00
Alexander Friedland	51d4e855b4	Merge branch 'master' into 1727-Change-button-text-and-observe-spelling	2022-04-04 22:41:19 +02:00
Alexander Friedland	4225388d60	Merge pull request #1730 from gradido/1729-load-spinner-if-pending-balance ... 1729 load spinner if pending balance	2022-04-04 22:41:07 +02:00
Alexander Friedland	ea62b1afaa	Merge branch 'master' into 1729-load-spinner-if-pending-balance	2022-04-04 22:09:20 +02:00
Alexander Friedland	9b47bf3c40	Merge branch 'master' into 1727-Change-button-text-and-observe-spelling	2022-04-04 22:08:53 +02:00