Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Please delete/ignore this #7652

Closed
wants to merge 23 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/patches
/build
/cert.pem
/dist
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Changes in [0.16.6](https://github.com/vector-im/riot-web/releases/tag/v0.16.6) (2018-10-08)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5...v0.16.6)

* Update to matrix-react-sdk v0.13.6

Changes in [0.16.5](https://github.com/vector-im/riot-web/releases/tag/v0.16.5) (2018-10-01)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.5-rc.1...v0.16.5)
Expand Down
1 change: 1 addition & 0 deletions config.chat.neocrypto.io.json
49 changes: 33 additions & 16 deletions config.sample.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,52 @@
{
"default_hs_url": "https://matrix.org",
"default_is_url": "https://vector.im",
"cross_origin_renderer_url": "https://usercontent.neocrypto.io/v1.html",
"default_hs_url": "https://neocrypto.io",
"default_is_url": "https://neocrypto.io",
"disable_custom_urls": false,
"disable_guests": false,
"disable_login_language_selector": false,
"disable_3pid_login": false,
"brand": "Riot",
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
"integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html",
"brand": "NeoCrypto",
"integrations_ui_url": "https://dimension.neocrypto.io/riot",
"integrations_rest_url": "https://dimension.neocrypto.io/api/v1/scalar",
"integrations_widgets_urls": ["https://dimension.neocrypto.io/widgets"],
"integrations_jitsi_widget_url": "https://dimension.neocrypto.io/api/widgets/jitsi.html",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"features": {
"feature_groups": "labs",
"feature_pinning": "labs"
"feature_groups": "enable",
"feature_pinning": "enable",
"feature_presence_management": "enable",
"feature_rich_quoting": "enable",
"feature_sticker_messages": "enable",
"feature_jitsi": "enable",
"feature_tag_panel": "enable"
},
"default_federate": true,
"welcomePageUrl": "home.html",
"default_theme": "light",
"default_theme": "dark",
"roomDirectory": {
"servers": [
"matrix.org"
"neocrypto.io"
]
},
"welcomeUserId": "@riot-bot:matrix.org",
"piwik": {
"url": "https://piwik.riot.im/",
"whitelistedHSUrls": ["https://matrix.org"],
"whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
"siteId": 1
"url": "https://analytics.neocrypto.io/",
"whitelistedHSUrls": ["https://matrix.org", "https://psyberia.im", "https://neocrypto.io"],
"whitelistedISUrls": ["https://vector.im", "https://matrix.org", "https://neocrypto.io"],
"siteId": "LJp1NOGMOMEk",
"policyUrl": "https://chat.neocrypto.io/neocrypto_io_cookie_policy"
},
"enable_presence_by_hs_url": {
"https://matrix.org": false
}
},
"terms_and_conditions_links": [
{
"url": "https://chat.neocrypto.io/privacy",
"text": "Privacy Policy"
},
{
"url": "https://chat.neocrypto.io/neocrypto_io_cookie_policy",
"text": "Cookie Policy"
}
]
}
Binary file modified electron_app/build/icon.icns
Binary file not shown.
Binary file modified electron_app/build/icon.ico
Binary file not shown.
Binary file modified electron_app/build/icons/128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified electron_app/build/icons/16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified electron_app/build/icons/24x24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified electron_app/build/icons/256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added electron_app/build/icons/32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified electron_app/build/icons/48x48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified electron_app/build/icons/512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified electron_app/build/icons/64x64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified electron_app/build/icons/96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified electron_app/img/riot.ico
Binary file not shown.
Binary file modified electron_app/img/riot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading