Merge branch 'develop' into luke/new-guest-access-set-mxid-2

Implement PasswordNagBar

.gitignore

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

.modernizr.json

@@ -9,8 +9,6 @@
     "test/css/flexbox",
     "test/es5/specification",
     "test/css/objectfit",
-    "test/storage/localstorage",
-    "test/workers/webworkers",
-    "test/indexeddb"
+    "test/storage/localstorage"
   ]
-}
+}

CHANGELOG.md

@@ -1,104 +1,3 @@
-Changes in [0.9.10-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.9.10-rc.1) (2017-05-19)
-======================================================================================================
-[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.9...v0.9.10-rc.1)
-
- * CSS for left_aligned Dropdowns, and adjustments for Country dd in Login
-   [\#3959](https://github.com/vector-im/riot-web/pull/3959)
- * Add square flag pngs /w genflags.sh script
-   [\#3953](https://github.com/vector-im/riot-web/pull/3953)
- * Add config for riot-bot on desktop app build
-   [\#3954](https://github.com/vector-im/riot-web/pull/3954)
- * Desktop: 'copy link address'
-   [\#3952](https://github.com/vector-im/riot-web/pull/3952)
- * Reduce rageshake log size to 1MB
-   [\#3943](https://github.com/vector-im/riot-web/pull/3943)
- * CSS for putting country dd on same line as phone input
-   [\#3942](https://github.com/vector-im/riot-web/pull/3942)
- * fix #3894
-   [\#3919](https://github.com/vector-im/riot-web/pull/3919)
- * change vector->riot on the surface
-   [\#3894](https://github.com/vector-im/riot-web/pull/3894)
- * move manifest.json outward so it is scoped properly
-   [\#3888](https://github.com/vector-im/riot-web/pull/3888)
- * add to manifest
-   [\#3799](https://github.com/vector-im/riot-web/pull/3799)
- * Automatically update component-index
-   [\#3886](https://github.com/vector-im/riot-web/pull/3886)
- * move electron -> electron_app because npm smart
-   [\#3877](https://github.com/vector-im/riot-web/pull/3877)
- * Fix bug report endpoint in config.sample.json.
-   [\#3863](https://github.com/vector-im/riot-web/pull/3863)
- * Update 2 missed icons to the new icon
-   [\#3851](https://github.com/vector-im/riot-web/pull/3851)
- * Make left panel better for new users (mk II)
-   [\#3804](https://github.com/vector-im/riot-web/pull/3804)
- * match primary package.json
-   [\#3839](https://github.com/vector-im/riot-web/pull/3839)
- * Re-add productName
-   [\#3829](https://github.com/vector-im/riot-web/pull/3829)
- * Remove leading v in /version file, for SemVer and to match Electron ver
-   [\#3683](https://github.com/vector-im/riot-web/pull/3683)
- * Fix scope of callback
-   [\#3790](https://github.com/vector-im/riot-web/pull/3790)
- * Remember and Recall window layout/position state
-   [\#3622](https://github.com/vector-im/riot-web/pull/3622)
- * Remove babelcheck
-   [\#3808](https://github.com/vector-im/riot-web/pull/3808)
- * Include MXID and device id in rageshakes
-   [\#3809](https://github.com/vector-im/riot-web/pull/3809)
- * import Modal
-   [\#3791](https://github.com/vector-im/riot-web/pull/3791)
- * Pin filesize ver to fix break upstream
-   [\#3775](https://github.com/vector-im/riot-web/pull/3775)
- * Improve Room Directory Look & Feel
-   [\#3751](https://github.com/vector-im/riot-web/pull/3751)
- * Fix emote RRs alignment
-   [\#3742](https://github.com/vector-im/riot-web/pull/3742)
- * Remove unused `placeholder` prop on RoomDropTarget
-   [\#3741](https://github.com/vector-im/riot-web/pull/3741)
- * Modify CSS for matrix-org/matrix-react-sdk#833
-   [\#3732](https://github.com/vector-im/riot-web/pull/3732)
- * Warn when exiting due to single-instance
-   [\#3727](https://github.com/vector-im/riot-web/pull/3727)
- * Electron forgets it was maximized when you click on a notification
-   [\#3709](https://github.com/vector-im/riot-web/pull/3709)
- * CSS to make h1 and h2 the same size as h1.
-   [\#3719](https://github.com/vector-im/riot-web/pull/3719)
- * Prevent long room names/topics from pushing UI of the screen
-   [\#3721](https://github.com/vector-im/riot-web/pull/3721)
- * Disable dropdown highlight on focus
-   [\#3717](https://github.com/vector-im/riot-web/pull/3717)
- * Escape HTML Tags from Linux Notifications (electron)
-   [\#3564](https://github.com/vector-im/riot-web/pull/3564)
- * styling for spoilerized access token view in Settings
-   [\#3651](https://github.com/vector-im/riot-web/pull/3651)
- * Fix Webpack conf
-   [\#3690](https://github.com/vector-im/riot-web/pull/3690)
- * Add config.json to .gitignore
-   [\#3599](https://github.com/vector-im/riot-web/pull/3599)
- * add command line arg (--hidden) for electron app
-   [\#3641](https://github.com/vector-im/riot-web/pull/3641)
- * fix ImageView Download functionality
-   [\#3640](https://github.com/vector-im/riot-web/pull/3640)
- * Add cross-env into the mix
-   [\#3693](https://github.com/vector-im/riot-web/pull/3693)
- * Remember acceptance for unsupported browsers.
-   [\#3694](https://github.com/vector-im/riot-web/pull/3694)
- * Cosmetics to go with matrix-org/matrix-react-sdk#811
-   [\#3692](https://github.com/vector-im/riot-web/pull/3692)
- * Cancel quicksearch on ESC
-   [\#3680](https://github.com/vector-im/riot-web/pull/3680)
- * Optimise RoomList and implement quick-search functionality on it.
-   [\#3654](https://github.com/vector-im/riot-web/pull/3654)
- * Progress updates for rageshake uploads
-   [\#3648](https://github.com/vector-im/riot-web/pull/3648)
- * Factor out rageshake upload to a separate file
-   [\#3645](https://github.com/vector-im/riot-web/pull/3645)
- * rageshake: fix race when collecting logs
-   [\#3644](https://github.com/vector-im/riot-web/pull/3644)
- * Fix a flaky test
-   [\#3649](https://github.com/vector-im/riot-web/pull/3649)
-
 Changes in [0.9.9](https://github.com/vector-im/riot-web/releases/tag/v0.9.9) (2017-04-25)
 ==========================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.9-rc.2...v0.9.9)

electron_app/package.json

@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.9.10-rc.1",
+  "version": "0.9.9",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

electron_app/riot.im/config.json

@@ -6,11 +6,68 @@
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
     "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
-    "welcomeUserId": "@riot-bot:matrix.org",
     "enableLabs": true,
     "roomDirectory": {
         "servers": [
             "matrix.org"
-        ]
+        ],
+        "serverConfig": {
+            "matrix.org": {
+                "networks": [
+                    "_matrix",
+                    "gitter",
+                    "irc:freenode",
+                    "irc:mozilla",
+                    "irc:snoonet",
+                    "irc:oftc"
+                ]
+            }
+        },
+        "networks": {
+            "gitter": {
+                "protocol": "gitter",
+                "portalRoomPattern": "#gitter_.*:matrix.org",
+                "name": "Gitter",
+                "icon": "https://gitter.im/favicon.ico",
+                "example": "org/community",
+                "nativePattern": "[^\\s]+/[^\\s]+$"
+            },
+            "irc:freenode": {
+                "protocol": "irc",
+                "domain": "chat.freenode.net",
+                "portalRoomPattern": "#freenode_.*:matrix.org",
+                "name": "Freenode",
+                "icon": "https://matrix.org/_matrix/media/v1/download/matrix.org/DHLHpDDgWNNejFmrewvwEAHX",
+                "example": "#channel",
+                "nativePattern": "^#[^\\s]+$"
+            },
+            "irc:mozilla": {
+                "protocol": "irc",
+                "domain": "chat.freenode.net",
+                "portalRoomPattern": "#mozilla_.*:matrix.org",
+                "name": "Mozilla",
+                "icon": "https://matrix.org/_matrix/media/v1/download/matrix.org/DHLHpDDgWNNejFmrewvwEAHX",
+                "example": "#channel",
+                "nativePattern": "^#[^\\s]+$"
+            },
+            "irc:snoonet": {
+                "protocol": "irc",
+                "domain": "ipv6-irc.snoonet.org",
+                "portalRoomPattern": "#_snoonet_.*:matrix.org",
+                "name": "Snoonet",
+                "icon": "https://matrix.org/_matrix/media/v1/download/matrix.org/DHLHpDDgWNNejFmrewvwEAHX",
+                "example": "#channel",
+                "nativePattern": "^#[^\\s]+$"
+            },
+            "irc:oftc": {
+                "protocol": "irc",
+                "domain": "irc.oftc.net",
+                "portalRoomPattern": "#_oftc_.*:matrix.org",
+                "name": "OFTC",
+                "icon": "https://matrix.org/_matrix/media/v1/download/matrix.org/DHLHpDDgWNNejFmrewvwEAHX",
+                "example": "#channel",
+                "nativePattern": "^#[^\\s]+$"
+            }
+        }
     }
 }

electron_app/src/electron-main.js

@@ -86,12 +86,6 @@ function onLinkContextMenu(ev, params) {
             safeOpenURL(params.linkURL);
         },
     }));
-    popup_menu.append(new electron.MenuItem({
-        label: 'Copy Link Address',
-        click() {
-            electron.clipboard.writeText(params.linkURL);
-        },
-    }));
     popup_menu.popup();
     ev.preventDefault();
 }

package.json

@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.9.10-rc.1",
+  "version": "0.9.9",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "repository": {
@@ -27,23 +27,22 @@
   "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": "npm run reskindex && babel --source-maps -d lib src",
+    "build:compile": "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 reskindex && npm run build:res && npm run build:bundle",
-    "build:dev": "npm run reskindex && npm run build:res && npm run build:bundle:dev",
+    "build": "npm run build:res && npm run build:bundle",
+    "build:dev": "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 reskindex:watch\" \"npm run start:res\" \"npm run start:js\"",
-    "start:prod": "parallelshell \"npm run reskindex:watch\" \"npm run start:res\" \"npm run start:js:prod\"",
+    "start": "parallelshell \"npm run start:res\" \"npm run start:js\"",
+    "start:prod": "parallelshell \"npm run start:res\" \"npm run start:js:prod\"",
     "lint": "eslint src/",
     "lintall": "eslint src/ test/",
     "clean": "rimraf lib webapp electron/dist",
@@ -61,12 +60,11 @@
     "favico.js": "^0.3.10",
     "filesize": "3.5.6",
     "flux": "~2.0.3",
-    "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
     "linkifyjs": "^2.1.3",
-    "matrix-js-sdk": "0.7.8-rc.1",
-    "matrix-react-sdk": "0.8.9-rc.1",
+    "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop",
+    "matrix-react-sdk": "matrix-org/matrix-react-sdk#develop",
     "modernizr": "^3.1.0",
     "pako": "^1.0.5",
     "q": "^1.4.1",
@@ -74,7 +72,7 @@
     "react-dnd": "^2.1.4",
     "react-dnd-html5-backend": "^2.1.2",
     "react-dom": "^15.4.0",
-    "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
+    "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#39d858c",
     "sanitize-html": "^1.11.1",
     "ua-parser-js": "^0.7.10",
     "url": "^0.11.0"
@@ -143,7 +141,7 @@
   "build": {
     "appId": "im.riot.app",
     "category": "Network",
-    "electronVersion": "1.6.8",
+    "electronVersion": "1.6.2",
     "//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
     "asar": false,
     "dereference": true,