Develop

README.md

@@ -241,18 +241,6 @@ apps using React.
 After creating a new component you must run `npm run reskindex` to regenerate
 the `component-index.js` for the app (used in future for skinning)
 
-**However, as of July 2016 this layering abstraction is broken due to rapid
-development on Riot forcing `matrix-react-sdk` to move fast at the expense of
-maintaining a clear abstraction between the two.**  Hacking on Riot inevitably
-means hacking equally on `matrix-react-sdk`, and there are bits of
-`matrix-react-sdk` behaviour incorrectly residing in the `riot-web` project
-(e.g. matrix-react-sdk specific CSS), and a bunch of Riot specific behaviour
-in the `matrix-react-sdk` (grep for `vector` / `riot`).  This separation problem will be
-solved asap once development on Riot (and thus matrix-react-sdk) has
-stabilised.  Until then, the two projects should basically be considered as a
-single unit.  In particular, `matrix-react-sdk` issues are currently filed
-against `riot-web` in github.
-
 Please note that Riot is intended to run correctly without access to the public
 internet.  So please don't depend on resources (JS libs, CSS, images, fonts)
 hosted by external CDNs or servers but instead please package all dependencies

config.sample.json

@@ -9,7 +9,7 @@
     "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://scalar.vector.im/api/widgets/jitsi.html",
+    "integrations_jitsi_widget_url": "https://dimension.neocrypto.io/api/widgets/jitsi.html",
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
     "features": {
         "feature_groups": "enable",
@@ -25,17 +25,14 @@
     "default_theme": "dark",
     "roomDirectory": {
         "servers": [
-            "psyberia.im",
-            "neocrypto.io",
-            "matrix.org"
+            "neocrypto.io"
         ]
     },
-    "welcomeUserId": "@riot-bot:matrix.org",
     "piwik": {
-        "url": "https://piwik.neocrypto.io/",
+        "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": 1
+        "siteId": 7
     },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false

electron_app/riot.im/config.json

@@ -1,3 +1,4 @@
+
 {
     "update_base_url": "https://chat.neocrypto.io/download/desktop/update/",
     "default_hs_url": "https://neocrypto.io",
@@ -10,7 +11,7 @@
     "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://scalar.vector.im/api/widgets/jitsi.html",
+    "integrations_jitsi_widget_url": "https://dimension.neocrypto.io/api/widgets/jitsi.html",
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
     "features": {
         "feature_groups": "enable",
@@ -29,14 +30,14 @@
             "neocrypto.io"
         ]
     },
-    "welcomeUserId": "_neocrypto_bot@:matrix.org",
     "piwik": {
-        "url": "https://piwik.neocrypto.io/",
+        "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": 1
+        "siteId": 7
     },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false
     }
 }
+