Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: element-hq/element-web
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.15.0
Choose a base ref
...
head repository: element-hq/element-web
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.15.1
Choose a head ref
  • 5 commits
  • 4 files changed
  • 1 contributor

Commits on May 16, 2018

  1. Fix hoek version in package-lock.json

    @dbkr
    dbkr committed May 16, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fb87d97 View commit details

  2. Bump to Electron 2.0.0(!)

    @dbkr
    dbkr committed May 16, 2018
    Copy the full SHA
    f759bfb View commit details

  3. v0.15.1

    @dbkr
    dbkr committed May 16, 2018
    Copy the full SHA
    145fb69 View commit details

  4. Prepare changelog for v0.15.1

    @dbkr
    dbkr committed May 16, 2018
    Copy the full SHA
    2543970 View commit details

  5. v0.15.1

    @dbkr
    dbkr committed May 16, 2018
    Copy the full SHA
    4e6c2fd View commit details
Showing with 14 additions and 7 deletions.
  1. +7 −0 CHANGELOG.md
  2. +1 −1 electron_app/package.json
  3. +4 −4 package-lock.json
  4. +2 −2 package.json
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Changes in [0.15.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.1) (2018-05-16)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0...v0.15.1)

* Fix package-lock.json which was causing errors building the Electron app
* Update Electron version

Changes in [0.15.0](https://github.com/vector-im/riot-web/releases/tag/v0.15.0) (2018-05-16)
============================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0-rc.6...v0.15.0)
2 changes: 1 addition & 1 deletion electron_app/package.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "0.15.0",
"version": "0.15.1",
"description": "A feature-rich client for Matrix.org",
"author": "Vector Creations Ltd.",
"dependencies": {
8 changes: 4 additions & 4 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "0.15.0",
"version": "0.15.1",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@@ -144,7 +144,7 @@
"build": {
"appId": "im.riot.app",
"category": "Network",
"electronVersion": "1.8.4",
"electronVersion": "2.0.0",
"//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
"asar": false,
"dereference": true,