Compare commits

..

4 commits

Author SHA1 Message Date
su-ex
32f684a88a
New version v1.7.14 2020-11-30 19:09:21 +01:00
su-ex
26a25f1f34
Fix unknown version inside settings » about 2020-11-30 00:25:00 +01:00
su-ex
b6e2375d57
Adjust default config
- Disable anonymous usage data prompt: Close #5
- Disable bug reports
- No hosting signup link
- Link to own privacy policy
2020-11-30 00:06:20 +01:00
su-ex
f455ac64c3
Merge upstream v1.7.14 2020-11-26 14:00:13 +01:00
6 changed files with 6 additions and 16 deletions

View file

@ -40,6 +40,7 @@ setup:
web: export DIST_VERSION=$(WEB_OUT_DIST_VERSION)
web: setup
$(YARN) --cwd element-web dist
echo "$(VERSION)" > element-web/webapp/version
desktop-common: web
$(YARN) --cwd element-desktop run fetch --cfgdir ''

View file

@ -11,30 +11,19 @@
"https://scalar-staging.vector.im/api",
"https://scalar-staging.riot.im/scalar/api"
],
"hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
"bug_report_endpoint_url": "https://element.io/bugreports/submit",
"roomDirectory": {
"servers": [
"matrix.org"
]
},
"piwik": {
"url": "https://piwik.riot.im/",
"siteId": 1,
"policyUrl": "https://element.io/cookie-policy"
},
"enable_presence_by_hs_url": {
"https://matrix.org": false,
"https://matrix-client.matrix.org": false
},
"terms_and_conditions_links": [
{
"url": "https://element.io/privacy",
"url": "https://schildi.chat/desktop/privacy",
"text": "Privacy Policy"
},
{
"url": "https://element.io/cookie-policy",
"text": "Cookie Policy"
}
]
}

@ -1 +1 @@
Subproject commit a50c16924fc9628512e8539b35cff7c41bcf361e
Subproject commit 937f8a8c8682d47dc834619be4dd29956dca447a

@ -1 +1 @@
Subproject commit bb73fedb2ab82c0194f0f9b9bdffb30414ab979b
Subproject commit 9eeb0af50abbb52345103f429b2e16c96a5ffb18

@ -1 +1 @@
Subproject commit f536e5c6116667335218fa8b8dfe782b70f57200
Subproject commit 79a5b44eb508074511c661eb3d92b3d6a26b0f33

@ -1 +1 @@
Subproject commit c846b00b3236e5c62000eae87d5608969ca00ec6
Subproject commit 2a308ab739bfe4b7b272db403bb500fd93db84ea