Merge branch 'develop' into new-guest-access

Conflicts:
	src/component-index.js

.gitignore

@@ -14,3 +14,4 @@ npm-debug.log
 electron/dist
 electron/pub
 /config.json
+/src/component-index.js

package.json

@@ -27,22 +27,23 @@
   "matrix-react-parent": "matrix-react-sdk",
   "scripts": {
     "reskindex": "reskindex -h src/header",
+    "reskindex:watch": "reskindex -h src/header -w",
     "build:res": "node scripts/copy-res.js",
     "build:modernizr": "modernizr -c .modernizr.json -d src/vector/modernizr.js",
-    "build:compile": "babel --source-maps -d lib src",
+    "build:compile": "npm run reskindex && babel --source-maps -d lib src",
     "build:bundle": "cross-env NODE_ENV=production webpack -p --progress",
     "build:bundle:dev": "webpack --optimize-occurence-order --progress",
     "build:electron": "npm run clean && npm run build && build -wml --ia32 --x64",
-    "build": "npm run build:res && npm run build:bundle",
+    "build": "npm run reskindex && npm run build:res && npm run build:bundle",
-    "build:dev": "npm run build:res && npm run build:bundle:dev",
+    "build:dev": "npm run reskindex && npm run build:res && npm run build:bundle:dev",
     "dist": "scripts/package.sh",
     "install:electron": "install-app-deps",
     "electron": "npm run install:electron && electron .",
     "start:res": "node scripts/copy-res.js -w",
     "start:js": "webpack-dev-server --output-filename=bundles/_dev_/[name].js --output-chunk-file=bundles/_dev_/[name].js -w --progress",
     "start:js:prod": "cross-env NODE_ENV=production webpack-dev-server -w --progress",
-    "start": "parallelshell \"npm run start:res\" \"npm run start:js\"",
+    "start": "parallelshell \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js\"",
-    "start:prod": "parallelshell \"npm run start:res\" \"npm run start:js:prod\"",
+    "start:prod": "parallelshell \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js:prod\"",
     "lint": "eslint src/",
     "lintall": "eslint src/ test/",
     "clean": "rimraf lib webapp electron/dist",

res/manifest.json

@@ -0,0 +1,56 @@
+{
+    "name": "Riot - open team collaboration",
+    "short_name": "Riot",
+    "display": "standalone",
+    "theme_color": "#76CFA6",
+    "start_url": "index.html",
+    "icons": [
+        {
+            "src": "vector-icons/android-chrome-36x36.png",
+            "sizes": "36x36",
+            "type": "image\/png",
+            "density": "0.75"
+        },
+        {
+            "src": "vector-icons/android-chrome-48x48.png",
+            "sizes": "48x48",
+            "type": "image\/png",
+            "density": "1.0"
+        },
+        {
+            "src": "vector-icons/android-chrome-72x72.png",
+            "sizes": "72x72",
+            "type": "image\/png",
+            "density": "1.5"
+        },
+        {
+            "src": "vector-icons/android-chrome-96x96.png",
+            "sizes": "96x96",
+            "type": "image\/png",
+            "density": "2.0"
+        },
+        {
+            "src": "vector-icons/android-chrome-144x144.png",
+            "sizes": "144x144",
+            "type": "image\/png",
+            "density": "3.0"
+        },
+        {
+            "src": "vector-icons/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image\/png",
+            "density": "4.0"
+        }
+    ],
+    "related_applications": [
+        {
+            "platform": "play",
+            "url": "https://play.google.com/store/apps/details?id=im.vector.alpha",
+            "id": "im.vector.alpha"
+        },
+        {
+            "platform": "itunes",
+            "url": "https://itunes.apple.com/gb/app/riot-open-source-team-collaboration-via-matrix/id1083446067"
+        }
+    ]
+}

res/vector-icons/manifest.json

@@ -1,41 +0,0 @@
-{
-	"name": "Riot",
-	"icons": [
-		{
-			"src": "android-chrome-36x36.png",
-			"sizes": "36x36",
-			"type": "image\/png",
-			"density": "0.75"
-		},
-		{
-			"src": "android-chrome-48x48.png",
-			"sizes": "48x48",
-			"type": "image\/png",
-			"density": "1.0"
-		},
-		{
-			"src": "android-chrome-72x72.png",
-			"sizes": "72x72",
-			"type": "image\/png",
-			"density": "1.5"
-		},
-		{
-			"src": "android-chrome-96x96.png",
-			"sizes": "96x96",
-			"type": "image\/png",
-			"density": "2.0"
-		},
-		{
-			"src": "android-chrome-144x144.png",
-			"sizes": "144x144",
-			"type": "image\/png",
-			"density": "3.0"
-		},
-		{
-			"src": "android-chrome-192x192.png",
-			"sizes": "192x192",
-			"type": "image\/png",
-			"density": "4.0"
-		}
-	]
-}

scripts/copy-res.js

@@ -7,6 +7,7 @@
 // common parents. Hence, "res/{a,b}/**": the output will be "dest/a/..." and
 // "dest/b/...".
 const COPY_LIST = [
+    ["res/manifest.json", "webapp"],
     ["res/{media,vector-icons}/**", "webapp"],
     ["src/skins/vector/{fonts,img}/**", "webapp"],
     ["node_modules/emojione/assets/svg/*", "webapp/emojione/svg/"],

src/component-index.js

@@ -1,92 +0,0 @@
-/*
-Copyright 2015, 2016 OpenMarket Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
- * THIS FILE IS AUTO-GENERATED
- * You can edit it you like, but your changes will be overwritten,
- * so you'd just be trying to swim upstream like a salmon.
- * You are not a salmon.
- *
- * To update it, run:
- *    ./reskindex.js -h header
- */
-
-module.exports.components = require('matrix-react-sdk/lib/component-index').components;
-
-import structures$BottomLeftMenu from './components/structures/BottomLeftMenu';
-structures$BottomLeftMenu && (module.exports.components['structures.BottomLeftMenu'] = structures$BottomLeftMenu);
-import structures$CompatibilityPage from './components/structures/CompatibilityPage';
-structures$CompatibilityPage && (module.exports.components['structures.CompatibilityPage'] = structures$CompatibilityPage);
-import structures$HomePage from './components/structures/HomePage';
-structures$HomePage && (module.exports.components['structures.HomePage'] = structures$HomePage);
-import structures$LeftPanel from './components/structures/LeftPanel';
-structures$LeftPanel && (module.exports.components['structures.LeftPanel'] = structures$LeftPanel);
-import structures$RightPanel from './components/structures/RightPanel';
-structures$RightPanel && (module.exports.components['structures.RightPanel'] = structures$RightPanel);
-import structures$RoomDirectory from './components/structures/RoomDirectory';
-structures$RoomDirectory && (module.exports.components['structures.RoomDirectory'] = structures$RoomDirectory);
-import structures$RoomSubList from './components/structures/RoomSubList';
-structures$RoomSubList && (module.exports.components['structures.RoomSubList'] = structures$RoomSubList);
-import structures$RoomSubListHeader from './components/structures/RoomSubListHeader';
-structures$RoomSubListHeader && (module.exports.components['structures.RoomSubListHeader'] = structures$RoomSubListHeader);
-import structures$SearchBox from './components/structures/SearchBox';
-structures$SearchBox && (module.exports.components['structures.SearchBox'] = structures$SearchBox);
-import structures$ViewSource from './components/structures/ViewSource';
-structures$ViewSource && (module.exports.components['structures.ViewSource'] = structures$ViewSource);
-import views$context_menus$MessageContextMenu from './components/views/context_menus/MessageContextMenu';
-views$context_menus$MessageContextMenu && (module.exports.components['views.context_menus.MessageContextMenu'] = views$context_menus$MessageContextMenu);
-import views$context_menus$RoomTileContextMenu from './components/views/context_menus/RoomTileContextMenu';
-views$context_menus$RoomTileContextMenu && (module.exports.components['views.context_menus.RoomTileContextMenu'] = views$context_menus$RoomTileContextMenu);
-import views$dialogs$BugReportDialog from './components/views/dialogs/BugReportDialog';
-views$dialogs$BugReportDialog && (module.exports.components['views.dialogs.BugReportDialog'] = views$dialogs$BugReportDialog);
-import views$dialogs$ChangelogDialog from './components/views/dialogs/ChangelogDialog';
-views$dialogs$ChangelogDialog && (module.exports.components['views.dialogs.ChangelogDialog'] = views$dialogs$ChangelogDialog);
-import views$directory$NetworkDropdown from './components/views/directory/NetworkDropdown';
-views$directory$NetworkDropdown && (module.exports.components['views.directory.NetworkDropdown'] = views$directory$NetworkDropdown);
-import views$elements$ImageView from './components/views/elements/ImageView';
-views$elements$ImageView && (module.exports.components['views.elements.ImageView'] = views$elements$ImageView);
-import views$elements$Spinner from './components/views/elements/Spinner';
-views$elements$Spinner && (module.exports.components['views.elements.Spinner'] = views$elements$Spinner);
-import views$globals$GuestWarningBar from './components/views/globals/GuestWarningBar';
-views$globals$GuestWarningBar && (module.exports.components['views.globals.GuestWarningBar'] = views$globals$GuestWarningBar);
-import views$globals$MatrixToolbar from './components/views/globals/MatrixToolbar';
-views$globals$MatrixToolbar && (module.exports.components['views.globals.MatrixToolbar'] = views$globals$MatrixToolbar);
-import views$globals$NewVersionBar from './components/views/globals/NewVersionBar';
-views$globals$NewVersionBar && (module.exports.components['views.globals.NewVersionBar'] = views$globals$NewVersionBar);
-import views$globals$PasswordNagBar from './components/views/globals/PasswordNagBar';
-views$globals$PasswordNagBar && (module.exports.components['views.globals.PasswordNagBar'] = views$globals$PasswordNagBar);
-import views$login$VectorCustomServerDialog from './components/views/login/VectorCustomServerDialog';
-views$login$VectorCustomServerDialog && (module.exports.components['views.login.VectorCustomServerDialog'] = views$login$VectorCustomServerDialog);
-import views$login$VectorLoginFooter from './components/views/login/VectorLoginFooter';
-views$login$VectorLoginFooter && (module.exports.components['views.login.VectorLoginFooter'] = views$login$VectorLoginFooter);
-import views$login$VectorLoginHeader from './components/views/login/VectorLoginHeader';
-views$login$VectorLoginHeader && (module.exports.components['views.login.VectorLoginHeader'] = views$login$VectorLoginHeader);
-import views$messages$DateSeparator from './components/views/messages/DateSeparator';
-views$messages$DateSeparator && (module.exports.components['views.messages.DateSeparator'] = views$messages$DateSeparator);
-import views$messages$MessageTimestamp from './components/views/messages/MessageTimestamp';
-views$messages$MessageTimestamp && (module.exports.components['views.messages.MessageTimestamp'] = views$messages$MessageTimestamp);
-import views$rooms$DNDRoomTile from './components/views/rooms/DNDRoomTile';
-views$rooms$DNDRoomTile && (module.exports.components['views.rooms.DNDRoomTile'] = views$rooms$DNDRoomTile);
-import views$rooms$RoomDropTarget from './components/views/rooms/RoomDropTarget';
-views$rooms$RoomDropTarget && (module.exports.components['views.rooms.RoomDropTarget'] = views$rooms$RoomDropTarget);
-import views$rooms$RoomTooltip from './components/views/rooms/RoomTooltip';
-views$rooms$RoomTooltip && (module.exports.components['views.rooms.RoomTooltip'] = views$rooms$RoomTooltip);
-import views$rooms$SearchBar from './components/views/rooms/SearchBar';
-views$rooms$SearchBar && (module.exports.components['views.rooms.SearchBar'] = views$rooms$SearchBar);
-import views$settings$IntegrationsManager from './components/views/settings/IntegrationsManager';
-views$settings$IntegrationsManager && (module.exports.components['views.settings.IntegrationsManager'] = views$settings$IntegrationsManager);
-import views$settings$Notifications from './components/views/settings/Notifications';
-views$settings$Notifications && (module.exports.components['views.settings.Notifications'] = views$settings$Notifications);

src/vector/index.html

@@ -12,7 +12,7 @@
     <link rel="apple-touch-icon" sizes="144x144" href="vector-icons/apple-touch-icon-144x144.png">
     <link rel="apple-touch-icon" sizes="152x152" href="vector-icons/apple-touch-icon-152x152.png">
     <link rel="apple-touch-icon" sizes="180x180" href="vector-icons/apple-touch-icon-180x180.png">
-    <link rel="manifest" href="vector-icons/manifest.json">
+    <link rel="manifest" href="manifest.json">
     <link rel="shortcut icon" href="vector-icons/favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Riot">
     <meta name="application-name" content="Riot">