10160 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
elweyn	2cc7a6dee6	Fixing tests since we now use link and code.	2022-04-06 19:16:30 +02:00
elweyn	41b35f2c5e	Add link to the TransactionLink and change code by link in frontend.	2022-04-06 18:45:27 +02:00
elweyn	d984ff2582	Add COMMUNITY_REDEEM_LINK to the config.	2022-04-06 18:44:19 +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
elweyn	ff24798767	Add free line after import.	2022-04-06 11:10:09 +02:00
elweyn	54f5a0123f	Remove the base url from the frontend.	2022-04-06 11:03:22 +02:00
elweyn	e49892d69c	Changed the value of code so that it get's the configured COMMUNITY_URL and redeem/ from the backend.	2022-04-06 10:56:27 +02:00
ogerly	0e988b1491	add tab system from bootstrap	2022-04-06 10:43:10 +02:00
Claus-Peter Hübner	3ad89dab71	Federation Review-2	2022-04-06 03:14:32 +02:00
Claus-Peter Hübner	5ead0e7a21	Federation Review-2 and gradido-core brainstorming	2022-04-06 03:13:56 +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
Alexander Friedland	08ff60f55b	Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list	2022-04-05 15:28:22 +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
Ulf Gebhardt	79013f3aa8	fixed config dist version to properly reflect new password reset url	2022-04-05 12:22:52 +02:00
Alexander Friedland	fd5dca7eba	Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list	2022-04-05 09:43:18 +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	826dbf6380	Merge branch 'master' into 1682-new-design-for-the-login-and-registration-area	2022-04-05 09:43:01 +02:00
Claus-Peter Hübner	09b2f3f9c3	gradido where did you go - first ideas	2022-04-05 02:26:43 +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	227f81f35a	Merge branch 'master' into 1633-Display-QR-Code-on-link-in-transaction-list	2022-04-04 22:10:11 +02:00