Matrix/element-web
Matrix/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-09-09 22:55:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'release-v0.9.5'

Browse source
This commit is contained in:
Matthew Hodgson 2016-12-24 19:29:42 +00:00
commit 6e0f83a298
5 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.md
View file

@ -1,3 +1,11 @@
Changes in [0.9.5](https://github.com/vector-im/riot-web/releases/tag/v0.9.5) (2016-12-24)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.4...v0.9.5)
* make electron send email validation URLs with a nextlink of riot.im rather than file:///
* add gnu-tar to debian electron build deps
* fix win32 shortcut in start menu
Changes in [0.9.4](https://github.com/vector-im/riot-web/releases/tag/v0.9.4) (2016-12-22) Changes in [0.9.4](https://github.com/vector-im/riot-web/releases/tag/v0.9.4) (2016-12-22)
========================================================================================== ==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.3...v0.9.4) [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.9.3...v0.9.4)

1
README.md
View file

@ -122,6 +122,7 @@ The only platform that can build packages for all three platforms is macOS:
``` ```
brew install wine --without-x11 brew install wine --without-x11
brew install mono brew install mono
brew install gnu-tar
npm install npm install
npm run build:electron npm run build:electron
``` ```

2
electron/src/squirrelhooks.js
View file

@ -3,7 +3,7 @@ const spawn = require('child_process').spawn;
const app = require('electron').app; const app = require('electron').app;
function run_update_exe(args, done) { function run_update_exe(args, done) {
const updateExe = path.resolve(path.dirname(process.execPath), '..', 'Update.exe'); const updateExe = path.resolve(path.dirname(process.execPath), 'Update.exe');
spawn(updateExe, args, { spawn(updateExe, args, {
detached: true detached: true
}).on('close', done); }).on('close', done);

4
package.json
View file

@ -2,7 +2,7 @@
"name": "riot-web", "name": "riot-web",
"productName": "Riot", "productName": "Riot",
"main": "electron/src/electron-main.js", "main": "electron/src/electron-main.js",
"version": "0.9.4", "version": "0.9.5",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.", "author": "Vector Creations Ltd.",
"repository": { "repository": {
@ -67,7 +67,7 @@
"highlight.js": "^9.0.0", "highlight.js": "^9.0.0",
"linkifyjs": "^2.1.3", "linkifyjs": "^2.1.3",
"matrix-js-sdk": "0.7.2", "matrix-js-sdk": "0.7.2",
"matrix-react-sdk": "0.8.3", "matrix-react-sdk": "0.8.4",
"modernizr": "^3.1.0", "modernizr": "^3.1.0",
"q": "^1.4.1", "q": "^1.4.1",
"react": "^15.4.0", "react": "^15.4.0",

17
src/vector/index.js
View file

@ -136,11 +136,20 @@ var onNewScreen = function(screen) {
// click back to the client having registered. // click back to the client having registered.
// It's up to us to recognise if we're loaded with // It's up to us to recognise if we're loaded with
// this URL and tell MatrixClient to resume registration. // this URL and tell MatrixClient to resume registration.
//
// If we're in electron, we should never pass through a file:// URL otherwise
// the identity server will try to 302 the browser to it, which breaks horribly.
// so in that instance, hardcode to use riot.im/app for now instead.
var makeRegistrationUrl = function() { var makeRegistrationUrl = function() {
return window.location.protocol + '//' + if (window.location.protocol === "file:") {
window.location.host + return 'https://riot.im/app/#/register';
window.location.pathname + }
'#/register'; else {
return window.location.protocol + '//' +
window.location.host +
window.location.pathname +
'#/register';
}
} }
window.addEventListener('hashchange', onHashChange); window.addEventListener('hashchange', onHashChange);