CringeStudios/element-desktop
5
0
Fork 0
mirror of https://github.com/CringeStudios/element-desktop.git synced 2025-01-18 15:34:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
RiotRobot 2020-05-05 11:09:22 +01:00
commit f9e126cb16
3 changed files with 195 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
CHANGELOG.md Normal file
View File

@ -0,0 +1,169 @@
Changes in [1.6.0](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0) (2020-05-05)
==============================================================================================
[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.6...v1.6.0)
Changes in [1.6.0-rc.6](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.6) (2020-05-01)
========================================================================================================
[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.5...v1.6.0-rc.6)
Changes in [1.6.0-rc.5](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.5) (2020-04-30)
========================================================================================================
[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.4...v1.6.0-rc.5)
* Remove feature flag docs from docs on release
[\#78](https://github.com/vector-im/riot-desktop/pull/78)
* package.json: Bump the Seshat dep.
[\#76](https://github.com/vector-im/riot-desktop/pull/76)
Changes in [1.6.0-rc.4](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.4) (2020-04-23)
========================================================================================================
[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.3...v1.6.0-rc.4)
Changes in [1.6.0-rc.3](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.3) (2020-04-17)
========================================================================================================
[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.2...v1.6.0-rc.3)
* widen search paths / fix vector-im/riot-web#13190 [to release]
[\#72](https://github.com/vector-im/riot-desktop/pull/72)
Changes in [1.6.0-rc.2](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.2) (2020-04-16)
========================================================================================================
[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.0-rc.1...v1.6.0-rc.2)
Changes in [1.6.0-rc.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.6.0-rc.1) (2020-04-15)
========================================================================================================
* Enable cross-signing / E2EE by default for DM on release
[\#70](https://github.com/vector-im/riot-desktop/pull/70)
* Add a release script
[\#69](https://github.com/vector-im/riot-desktop/pull/69)
* Fix Electron SSO handling to support multiple profiles
[\#67](https://github.com/vector-im/riot-desktop/pull/67)
* Add riot-desktop shortcuts for forward/back matching browsers&slack
[\#68](https://github.com/vector-im/riot-desktop/pull/68)
* package.json: Bump the Seshat version.
[\#66](https://github.com/vector-im/riot-desktop/pull/66)
* Bump minimist from 1.2.2 to 1.2.3
[\#64](https://github.com/vector-im/riot-desktop/pull/64)
* Add cfg to access the hak.json
[\#65](https://github.com/vector-im/riot-desktop/pull/65)
* Extract dep versions out to hak.json
[\#63](https://github.com/vector-im/riot-desktop/pull/63)
* Make the openssl version a variable
[\#62](https://github.com/vector-im/riot-desktop/pull/62)
* Update openssl
[\#61](https://github.com/vector-im/riot-desktop/pull/61)
* Fix spellcheck language fallback algorithm
[\#60](https://github.com/vector-im/riot-desktop/pull/60)
* package.json: Bump the required Seshat version.
[\#57](https://github.com/vector-im/riot-desktop/pull/57)
* Remove welcome user from config
[\#56](https://github.com/vector-im/riot-desktop/pull/56)
* electron-main: Immediatelly set the eventIndex variable to null when
closing.
[\#55](https://github.com/vector-im/riot-desktop/pull/55)
* Enable Seshat on Nightly
[\#54](https://github.com/vector-im/riot-desktop/pull/54)
* Register Mac electron specific Cmd+, shortcut to User Settings
[\#53](https://github.com/vector-im/riot-desktop/pull/53)
* Bump minimist from 1.2.0 to 1.2.2
[\#52](https://github.com/vector-im/riot-desktop/pull/52)
* package.json: Bump the required Seshat version.
[\#51](https://github.com/vector-im/riot-desktop/pull/51)
* Updates for Seshat 1.2.0 (not yet released) and support to delete events
from the index.
[\#47](https://github.com/vector-im/riot-desktop/pull/47)
* Add custom themes labs flag
[\#49](https://github.com/vector-im/riot-desktop/pull/49)
* Get the app ID from the cintext
[\#46](https://github.com/vector-im/riot-desktop/pull/46)
* Electron 8 changes. Deprecations. Updates.
[\#38](https://github.com/vector-im/riot-desktop/pull/38)
* Bump seshat dependency
[\#45](https://github.com/vector-im/riot-desktop/pull/45)
* Move deb control logic to builder
[\#44](https://github.com/vector-im/riot-desktop/pull/44)
* Add 'nightly' to brand too
[\#43](https://github.com/vector-im/riot-desktop/pull/43)
* Enable seshat in labs on nightly
[\#42](https://github.com/vector-im/riot-desktop/pull/42)
* Add config for Riot Nightly
[\#41](https://github.com/vector-im/riot-desktop/pull/41)
* Add a windows signing script
[\#40](https://github.com/vector-im/riot-desktop/pull/40)
* riot-desktop open SSO in browser so user doesn't have to auth twice
[\#37](https://github.com/vector-im/riot-desktop/pull/37)
* Remove the certificate config for windows
[\#39](https://github.com/vector-im/riot-desktop/pull/39)
* Missed an await
[\#36](https://github.com/vector-im/riot-desktop/pull/36)
* Exit with exit code on exception
[\#35](https://github.com/vector-im/riot-desktop/pull/35)
* Fix the set-version script
[\#34](https://github.com/vector-im/riot-desktop/pull/34)
* Pass through the env var we actually use to docker
[\#33](https://github.com/vector-im/riot-desktop/pull/33)
* Upgrade to electron 8.0.1 and implement spellchecking
[\#30](https://github.com/vector-im/riot-desktop/pull/30)
* Fix check script
[\#31](https://github.com/vector-im/riot-desktop/pull/31)
* Support fetching the latest develop build
[\#29](https://github.com/vector-im/riot-desktop/pull/29)
* Hopefully enable subpixel font rendering
[\#28](https://github.com/vector-im/riot-desktop/pull/28)
* Add our native modules separately into the files
[\#27](https://github.com/vector-im/riot-desktop/pull/27)
* Fix setversion script's yarn call on windows
[\#26](https://github.com/vector-im/riot-desktop/pull/26)
* Split 32/64 bit building
[\#25](https://github.com/vector-im/riot-desktop/pull/25)
* Build on 32 bit Windows
[\#23](https://github.com/vector-im/riot-desktop/pull/23)
* Build seshat on Linux
[\#22](https://github.com/vector-im/riot-desktop/pull/22)
* Native module builds: matrix-seshat for mac & win
[\#21](https://github.com/vector-im/riot-desktop/pull/21)
* Port desktop fixes
[\#20](https://github.com/vector-im/riot-desktop/pull/20)
* Add accelerators to context menu options like cut&paste in electron
[\#19](https://github.com/vector-im/riot-desktop/pull/19)
* Build the deb into a repo
[\#18](https://github.com/vector-im/riot-desktop/pull/18)
* Better Docker Support
[\#17](https://github.com/vector-im/riot-desktop/pull/17)
* Use a custom control file for the Debian package
[\#14](https://github.com/vector-im/riot-desktop/pull/14)
* Support config directories
[\#15](https://github.com/vector-im/riot-desktop/pull/15)
* Don't bail if we can't notarise
[\#16](https://github.com/vector-im/riot-desktop/pull/16)
* Set version automatically
[\#13](https://github.com/vector-im/riot-desktop/pull/13)
* Sign natively on Windows
[\#12](https://github.com/vector-im/riot-desktop/pull/12)
* Fix the linting errors
[\#11](https://github.com/vector-im/riot-desktop/pull/11)
* Electron API Updates
[\#10](https://github.com/vector-im/riot-desktop/pull/10)
* Package webapp into an asar archive
[\#9](https://github.com/vector-im/riot-desktop/pull/9)
* Sanitise scripts
[\#8](https://github.com/vector-im/riot-desktop/pull/8)
* Exit after importing key
[\#6](https://github.com/vector-im/riot-desktop/pull/6)
* Use portable mkdirp
[\#5](https://github.com/vector-im/riot-desktop/pull/5)
* Add explicit 'node' to scripts
[\#4](https://github.com/vector-im/riot-desktop/pull/4)
* Check properly
[\#3](https://github.com/vector-im/riot-desktop/pull/3)
* Add rimraf
[\#2](https://github.com/vector-im/riot-desktop/pull/2)
* Build electron app from pre-built tarball
[\#1](https://github.com/vector-im/riot-desktop/pull/1)

16
package.json
View File

@ -2,7 +2,7 @@
"name": "riot-desktop",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.5.6",
"version": "1.6.0",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -47,7 +47,7 @@
"find-npm-prefix": "^1.0.2",
"fs-extra": "^8.1.0",
"glob": "^7.1.6",
"matrix-js-sdk": "^2.4.6-rc.1",
"matrix-js-sdk": "6.0.0",
"mkdirp": "^1.0.3",
"needle": "^2.3.2",
"node-pre-gyp": "^0.14.0",
@ -99,9 +99,13 @@
"output": "dist"
},
"afterSign": "scripts/electron_afterSign",
"protocols": [{
"name": "riot",
"schemes": ["riot"]
}]
"protocols": [
{
"name": "riot",
"schemes": [
"riot"
]
}
]
}
}

44
yarn.lock
View File

@ -33,6 +33,13 @@
esutils "^2.0.2"
js-tokens "^4.0.0"
"@babel/runtime@^7.8.3":
version "7.9.2"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06"
integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==
dependencies:
regenerator-runtime "^0.13.4"
"@develar/schema-utils@~2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.1.0.tgz#eceb1695bfbed6f6bb84666d5d3abe5e1fd54e17"
@ -415,14 +422,6 @@ aws4@^1.8.0:
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.0.tgz#24390e6ad61386b0a747265754d2a17219de862c"
integrity sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==
babel-runtime@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
dependencies:
core-js "^2.4.0"
regenerator-runtime "^0.11.0"
balanced-match@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@ -478,11 +477,6 @@ bluebird-lst@^1.0.9:
dependencies:
bluebird "^3.5.5"
bluebird@3.5.5:
version "3.5.5"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
version "3.7.2"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@ -974,11 +968,6 @@ copy-concurrently@^1.0.0:
rimraf "^2.5.4"
run-queue "^1.0.0"
core-js@^2.4.0:
version "2.6.10"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f"
integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==
core-util-is@1.0.2, core-util-is@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@ -2873,14 +2862,13 @@ map-age-cleaner@^0.1.1:
dependencies:
p-defer "^1.0.0"
matrix-js-sdk@^2.4.6-rc.1:
version "2.4.6-rc.1"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.6-rc.1.tgz#27524e3db8444f0c879aa1c532e7c8d02f31de60"
integrity sha512-0L37WWq0qqJKGt93/lS29dgKcVGZ6b7thbbcv1/5vXPfvr3BaLL3Hce/krMQfToWktaNCUvi0bzUshyRY3VWqQ==
matrix-js-sdk@6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.0.0.tgz#2374a583878073871a0202dc237691ef15540575"
integrity sha512-NBHb5JIKetCVhOdfETyhUL9lYs2M+v8W/uczTzW6IX9XFOtNaha8X82waXlRt6RJpZRm5aJveODkybvo9VOLtg==
dependencies:
"@babel/runtime" "^7.8.3"
another-json "^0.2.0"
babel-runtime "^6.26.0"
bluebird "3.5.5"
browser-request "^0.3.3"
bs58 "^4.0.1"
content-type "^1.0.2"
@ -4054,10 +4042,10 @@ readdir-scoped-modules@^1.0.0, readdir-scoped-modules@^1.1.0:
graceful-fs "^4.1.2"
once "^1.3.0"
regenerator-runtime@^0.11.0:
version "0.11.1"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
regenerator-runtime@^0.13.4:
version "0.13.5"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
regexp.prototype.flags@^1.2.0:
version "1.2.0"