7905 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	4a71acab55	Merge branch 'master' into fix-elopage-status	2022-04-12 18:47:00 +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
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
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
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
Ulf Gebhardt	ab7b2a7028	test for correct startblock date in frontend	2022-04-07 13:06:47 +02:00
Ulf Gebhardt	2826f970fb	Merge branch 'master' into frontend_decay_start_block_as_static	2022-04-07 13:02:06 +02:00
Moriz Wahl	01b615d9c1	Merge branch 'master' into fix-elopage-status	2022-04-07 12:27:40 +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	d5d90c7050	remove decayStartBlock from all component interfaces	2022-04-06 15:24:17 +02:00
Ulf Gebhardt	3582805098	reference config decay start time when figuring out if its the decay start block	2022-04-06 15:23:47 +02:00
Ulf Gebhardt	ebb6c926d8	define decay start block in config statically	2022-04-06 15:22:57 +02:00
Ulf Gebhardt	bccc5d1ddb	backend remove startblock from balance object	2022-04-06 15:22:32 +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	37122ee604	Merge branch 'master' into fix-elopage-status	2022-04-06 14:08:51 +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
Moriz Wahl	39e40f68ae	Merge branch 'master' into fix-elopage-status	2022-04-06 13:56:16 +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	1b17653770	Merge branch 'master' into fix-elopage-status	2022-04-05 15:51:14 +02:00
Moriz Wahl	69dae586d8	check that recipient user has activated account in send coins	2022-04-05 15:12:36 +02:00
Moriz Wahl	f3948b39be	pass context object to hasElopage query	2022-04-05 14:50:45 +02:00
Moriz Wahl	affd8a6859	update browser list for unit tests	2022-04-05 14:50:08 +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