72 Commits

Author SHA1 Message Date
Claus-Peter Hübner
efa46f50f3 resolve conflicts 2022-11-25 03:09:54 +01:00
Claus-Peter Hübner
7543acfb53 Merge branch '2367-feature-add-federation-configs' of
github.com:gradido/gradido into 2367-feature-add-federation-configs
2022-11-25 03:06:52 +01:00
Claus-Peter Hübner
d021cb2918 renamend porperties to FEDERATION_xxx 2022-11-25 03:01:23 +01:00
clauspeterhuebner
68586eaae7
Update backend/.env.dist
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-11-25 01:37:36 +01:00
Claus-Peter Hübner
b4fbb09f26 define the federation config properties 2022-11-25 00:57:48 +01:00
Claus-Peter Hübner
926c2be4e7 add federation config properties 2022-11-11 00:20:35 +01:00
Moriz Wahl
d0d84af7ee fix merging errors 2022-10-27 06:50:25 +02:00
Moriz Wahl
0ac2a4d2c8 Merge branch 'master' into setup-hyperswarm 2022-10-27 06:42:57 +02:00
Claus-Peter Hübner
de234cc7df rework PR remarks 2022-09-22 23:29:51 +02:00
Claus-Peter Hübner
d29d9bd2ba add property changes in .env files as mentioned in PR 2022-09-20 19:11:57 +02:00
Moriz Wahl
1e5738f0aa fix: Windows 0D 0A Linebreaks to Unix 0A 2022-07-19 15:11:27 +02:00
Moriz Wahl
f0c83321fa fix broeken .envs and config 2022-07-19 14:55:02 +02:00
Moriz Wahl
b78ad2fb00 Merge branch 'master' into setup-hyperswarm 2022-07-19 14:43:19 +02:00
clauspeterhuebner
212952cf56
Update backend/.env.dist
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-07-18 19:30:25 +02:00
Claus-Peter Hübner
9af614d437 invert default setting of EVENT_PROTOCOL_ENABLED 2022-07-15 00:37:07 +02:00
Claus-Peter Hübner
859ac2cebd increase CONFIG_VERSION 2022-07-07 02:53:43 +02:00
Moriz Wahl
e4fc2cce6d
Merge branch 'master' into 1794-feature-event-protocol-1-implement-the-basics-of-the-business-event-protocol 2022-07-01 17:27:14 +02:00
Claus-Peter Hübner
7f5995d2fa add enable-check to EventProtocol configurable as CONFIG-Property 2022-07-01 00:40:10 +02:00
ogerly
0e3f6a4d73 change JWT_EXPIRES_IN to 10m 2022-06-30 13:51:40 +02:00
Wolfgang Huß
91959aea28 Fulfill Moriz suggestions 2022-06-20 16:08:35 +02:00
Moriz Wahl
4d58320426 new backend config version to have COMMUNITY_REDEEM_CONTRIBUTION_URL 2022-06-15 15:29:10 +02:00
Moriz Wahl
0106c0a733 move changes from template to dist 2022-05-10 19:55:19 +02:00
Moriz Wahl
e2efd0da9d add env and config for dht topic as switch 2022-05-04 19:28:18 +02:00
00e03af7f3
increase backend config version v6 2022-04-21 13:19:01 +02:00
19f2686b6e
Merge branch 'master' into 1637-generate-link-backend
# Conflicts:
#	frontend/src/components/ClipboardCopy.vue
#	frontend/src/components/GddSend/TransactionResultLink.vue
#	frontend/src/components/TransactionLinks/TransactionLink.vue
#	frontend/src/components/Transactions/TransactionLinkSummary.spec.js
2022-04-21 13:14:52 +02:00
Wolfgang Huß
8205e88b2f Comply Ulf's suggestions 2022-04-14 14:19:40 +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
elweyn
38ee27005f Merge branch '1637-generate-link-backend' of https://github.com/gradido/gradido into 1637-generate-link-backend 2022-04-08 08:15:13 +02:00
elweyn
2f2c00605f Change the config parameter community_redeem_url to a regex. 2022-04-08 08:14:12 +02:00
Hannes Heine
58093e32b9
Merge branch 'master' into 1637-generate-link-backend 2022-04-07 11:06:39 +02:00
elweyn
d984ff2582 Add COMMUNITY_REDEEM_LINK to the config. 2022-04-06 18:44:19 +02:00
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
79013f3aa8
fixed config dist version to properly reflect new password reset url 2022-04-05 12:22:52 +02:00
Moriz Wahl
5b10a87071 update env template 2022-03-30 13:59:55 +02:00
Moriz Wahl
8d1eff0765 new config version 2022-03-29 19:57:52 +02:00
Moriz Wahl
9eda41b24a Merge branch 'optin-valid-time' into show-valid-time-of-link-in-email 2022-03-29 00:59:47 +02:00
Moriz Wahl
0c0ce1b579 add new env variable to define email optin request time delay 2022-03-24 14:05:23 +01:00
Moriz Wahl
34d3893f1c Merge branch 'master' into optin-valid-time 2022-03-24 14:00:41 +01:00
20318546a8
Merge branch 'master' into enforce_config_version 2022-03-23 20:33:23 +01:00
eaed95cdf8
Merge branch 'master' into enforce_config_version 2022-03-23 19:56:36 +01:00
Moriz Wahl
3d613e72f5 add link to forgot-password 2022-03-23 16:48:35 +01:00
Moriz Wahl
2faad50919 set email code valid time to 24h 2022-03-23 13:33:07 +01:00
Moriz Wahl
807922a8d5 redeem code in email link config 2022-03-23 09:17:15 +01:00
Moriz Wahl
767387bb7c change {code} to {optin} to avoid confusion when redeem code is provided 2022-03-23 09:05:39 +01:00
677581b76e
enforce config on backend 2022-03-18 03:13:00 +01:00
elweyn
ac3340ec1c Change RESEND_TIME config name to EMAIL_CODE_VALID_TIME. 2022-03-14 12:49:34 +01:00
cc78849a46
typo 2022-01-27 01:30:57 +01:00
61c9073712
update configs and parameterize klicktipp options 2022-01-27 01:24:51 +01:00
e98113240d
fix docker setup by changing the default value for logging path
make the path configurable for the bare metal deployment and deploy old default value as default for bare metal deployment
2022-01-18 13:39:15 +01:00
90effb41b5
changed syntax again due to shell replacing $variables 2022-01-14 18:49:35 +01:00