Compare commits
289 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b128431128 | |||
| d606ad99b7 | |||
| 3598df0d28 | |||
| b90017ff15 | |||
| 4e6c2fdd1c | |||
| 25439702bb | |||
| 145fb69bdd | |||
| f759bfb1f6 | |||
| fb87d97d25 | |||
| 0a4614247f | |||
| 790eeb1a09 | |||
| 6640e709f8 | |||
| c4ecf40d1c | |||
| 02ab1fded2 | |||
| b2eebeee18 | |||
| f2bd4a4b5c | |||
| ecfefd6b21 | |||
| 50e430d8dc | |||
| 96cc5154cd | |||
| e9f0f84152 | |||
| 7eb14ad12c | |||
| e5641fe71c | |||
| 0b3c0f4a77 | |||
| 3987621b12 | |||
| be5aa59e39 | |||
| ecc86def9e | |||
| 358b676d04 | |||
| fece64039d | |||
| b93f98252b | |||
| 9b2fa966f1 | |||
| d2e28122b3 | |||
| ebb08a57c8 | |||
| 030fc041be | |||
| 0771549ef3 | |||
| 445a5b4f38 | |||
| c2fccb7e14 | |||
| d3cf60fafb | |||
| 6c5c3c3454 | |||
| 82a27d7fa3 | |||
| 2ea7ad6d7b | |||
| 3a30feaa52 | |||
| 98c9dd23d5 | |||
| fb0bbf31c4 | |||
| e87c44c38b | |||
| 371ea7c078 | |||
| 0e00677851 | |||
| 7f50fb3023 | |||
| 9dc61307fa | |||
| 83d9ca080a | |||
| a8a5d9e053 | |||
| 5bab9a7e34 | |||
| 81c2bf6814 | |||
| e69f7602ea | |||
| d2e4d3bc1c | |||
| 0e2ee5f127 | |||
| dd7ae83226 | |||
| 48a16464d5 | |||
| 76d4a4f3fe | |||
| 8afdbab9d5 | |||
| 9235c0dcfa | |||
| ff8f617fc6 | |||
| 181efcfbae | |||
| d291a7cccd | |||
| 5c722f31ff | |||
| c56b54eddd | |||
| 4d02d28aef | |||
| cb061d80fa | |||
| 9b055171ab | |||
| 3df214c56e | |||
| 53f44c5459 | |||
| 137665685d | |||
| 3d1c2fa5f1 | |||
| 6dad8e695e | |||
| 1eb82d97ae | |||
| a17a9521b4 | |||
| 2dc1c5c618 | |||
| d5a07a446d | |||
| 7232c01a80 | |||
| b8f7025f2a | |||
| 73e4fcafdc | |||
| 45661dd960 | |||
| 18ba570c74 | |||
| 5923417654 | |||
| 8b99a72f2c | |||
| 981bd94615 | |||
| 083dd4eeec | |||
| 8d4d16bde1 | |||
| 8e218f12b4 | |||
| 3dcf194960 | |||
| ee9f781adc | |||
| e5eb617447 | |||
| 864057e8ee | |||
| cb51ad929e | |||
| 83c20f5d5d | |||
| ff93ace4cc | |||
| ae3158ff00 | |||
| 3bec9c5eb4 | |||
| 964a3bc35b | |||
| ed51a8794d | |||
| b8556671c5 | |||
| 6b2c8539a3 | |||
| e165c42377 | |||
| 845bb3fa09 | |||
| 0abaff5aed | |||
| e4837af72e | |||
| 82f51fb476 | |||
| f012dd5f31 | |||
| c94d5c1a9a | |||
| 9eb449484e | |||
| 5aed7a375d | |||
| aa82513c7e | |||
| 4107c64ac2 | |||
| ff214c48f5 | |||
| a012522e88 | |||
| 9036f14e84 | |||
| e450f31588 | |||
| 7c15c6847b | |||
| 9cb26c8748 | |||
| 1396a26b6d | |||
| 8d88e3be11 | |||
| c98e977533 | |||
| 189e7e628b | |||
| 1d43870433 | |||
| 33920d72f6 | |||
| 4b8985f850 | |||
| 0be1d8e854 | |||
| db3db2c49e | |||
| fb2f063f58 | |||
| 1853e55431 | |||
| d90cd33541 | |||
| 45b62e9866 | |||
| 6b509a1222 | |||
| 316a1b835f | |||
| ddc20e2a60 | |||
| 104a4150ae | |||
| e046a72750 | |||
| df3fb83da3 | |||
| 7ee534388b | |||
| c84d279d69 | |||
| 21ee1828b3 | |||
| 96ef7b4075 | |||
| f14e725d13 | |||
| f1ff09f303 | |||
| c8b26a1002 | |||
| 5c341154b7 | |||
| 8684fae473 | |||
| 7c1eafd050 | |||
| 0243ec0096 | |||
| ce36dec767 | |||
| b8d4866824 | |||
| c988f4d093 | |||
| 62d48014c9 | |||
| d3cc6f594b | |||
| 32dab7a1ba | |||
| a46b718b4a | |||
| d6931252c1 | |||
| aefb782892 | |||
| 3d20a64502 | |||
| be34c84704 | |||
| 534155fcd5 | |||
| f569fddf15 | |||
| 41d6995da4 | |||
| 8757c8cae0 | |||
| e899fece3c | |||
| 659e71e150 | |||
| a70f3fe622 | |||
| c8a3471135 | |||
| 740b221769 | |||
| e455453bcd | |||
| 7a2866feb9 | |||
| c631858ab3 | |||
| 8dd616462a | |||
| 03ee99281f | |||
| fa1e383db1 | |||
| 976c818406 | |||
| 3ecbfae371 | |||
| 5845a1ec7a | |||
| edcf516cef | |||
| 8644a5ead9 | |||
| 4382e8aaee | |||
| 3487960559 | |||
| b7aa0db66d | |||
| 7262291dda | |||
| bc835950b3 | |||
| b751c74374 | |||
| ed0cc7a23a | |||
| df5ffb5a6d | |||
| 7a75592898 | |||
| 4d6dc14156 | |||
| 2c54cf9e39 | |||
| 1e9e9538b9 | |||
| e739d1b850 | |||
| 4081555048 | |||
| 992bd15f4a | |||
| c173a67bae | |||
| 7f78c75246 | |||
| 853661f3bb | |||
| e4a7dc6998 | |||
| 7f82cecf6c | |||
| 0625669352 | |||
| e77e67db70 | |||
| 9c7feb3150 | |||
| d95db207bf | |||
| 0296919dfb | |||
| 0cbc85f81f | |||
| 2c84cb6702 | |||
| b2b0536e08 | |||
| 03ff2cebdd | |||
| 74f85756a5 | |||
| a204629a9d | |||
| 050f04bed7 | |||
| e72422976d | |||
| 723d269915 | |||
| 0930d7dbea | |||
| 1abe5771fd | |||
| 6c6178b7d9 | |||
| 2d763238d3 | |||
| d34fda26d3 | |||
| 78e80cd2b2 | |||
| 76728abc86 | |||
| 4e1422da6b | |||
| c2ad79f05a | |||
| 4a060c6d8b | |||
| 265c14d697 | |||
| e36b63f38c | |||
| 13cc13924e | |||
| 7673d2aa51 | |||
| 3667507ee8 | |||
| 95f0aaac68 | |||
| ad67096b9a | |||
| 69c133e868 | |||
| c34e78cfc4 | |||
| 34b3d069f8 | |||
| e3a3dec8a2 | |||
| 700515cce3 | |||
| e36d972d94 | |||
| f3a47a2ae5 | |||
| b071c14066 | |||
| 90d51cf328 | |||
| 5fae676f7c | |||
| 4ffbe03f58 | |||
| 5ea6a602ca | |||
| 41fc17a62a | |||
| 0a92bccc4e | |||
| aa47b56a54 | |||
| 0d25d33fe5 | |||
| da0d9b5989 | |||
| 6c3b226e58 | |||
| 8273fba131 | |||
| c99ca372d6 | |||
| 324774ec2f | |||
| da25f49cd7 | |||
| 967623c784 | |||
| 17502349d5 | |||
| 4fc0c3603c | |||
| 0d483ab5f3 | |||
| 2c56baae02 | |||
| 177896b4be | |||
| 2b526f3ea1 | |||
| 154f55fafd | |||
| 3c0d0c13a9 | |||
| 3d48880240 | |||
| 85fca9dee8 | |||
| 8d8580a213 | |||
| d2f4bb2dd3 | |||
| 351f9b32ea | |||
| 38efebb8d3 | |||
| fe3f0be920 | |||
| 6785d75ad2 | |||
| 78ae1ada3c | |||
| d77ab891a0 | |||
| 9fc7435ea2 | |||
| c198dd381f | |||
| 095130a569 | |||
| 738b59fd42 | |||
| c340032bd1 | |||
| de597d4f5d | |||
| 854b537695 | |||
| f4816b99ff | |||
| 56ae96fc75 | |||
| f8643e9a96 | |||
| a7f0b11002 | |||
| 7924a149b4 | |||
| a24c3ada53 | |||
| 50271b7123 | |||
| 409bb5ff4d | |||
| fa1059e202 | |||
| f8e00e43e3 | |||
| 504a575feb |
@@ -16,4 +16,6 @@ electron/dist
|
||||
electron/pub
|
||||
**/.idea
|
||||
/config.json
|
||||
/config.json.*
|
||||
/config.local*.json
|
||||
/src/component-index.js
|
||||
|
||||
@@ -1,3 +1,146 @@
|
||||
Changes in [0.15.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.2) (2018-05-17)
|
||||
============================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.1...v0.15.2)
|
||||
|
||||
* Update to matrix-react-sdk v0.12.5 to fix image size jumps
|
||||
|
||||
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)
|
||||
|
||||
* No changes since rc.6
|
||||
|
||||
Changes in [0.15.0-rc.6](https://github.com/vector-im/riot-web/releases/tag/v0.15.0-rc.6) (2018-05-15)
|
||||
======================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0-rc.5...v0.15.0-rc.6)
|
||||
|
||||
* Update to matrix-react-sdk 0.12.4-rc.6
|
||||
|
||||
Changes in [0.15.0-rc.5](https://github.com/vector-im/riot-web/releases/tag/v0.15.0-rc.5) (2018-05-15)
|
||||
======================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0-rc.4...v0.15.0-rc.5)
|
||||
|
||||
* Update to matrix-react-sdk 0.12.4-rc.5
|
||||
|
||||
Changes in [0.15.0-rc.4](https://github.com/vector-im/riot-web/releases/tag/v0.15.0-rc.4) (2018-05-14)
|
||||
======================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0-rc.3...v0.15.0-rc.4)
|
||||
|
||||
* Update from Weblate.
|
||||
[\#6726](https://github.com/vector-im/riot-web/pull/6726)
|
||||
* Update to matrix-react-sdk 0.12.4-rc.4
|
||||
|
||||
Changes in [0.15.0-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.15.0-rc.3) (2018-05-11)
|
||||
======================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0-rc.2...v0.15.0-rc.3)
|
||||
|
||||
* Update to matrix-react-sdk 0.12.4-rc.3
|
||||
|
||||
Changes in [0.15.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.15.0-rc.2) (2018-05-09)
|
||||
======================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.15.0-rc.1...v0.15.0-rc.2)
|
||||
|
||||
* Update to matrix-react-sdk 0.12.4-rc.2
|
||||
|
||||
Changes in [0.15.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.15.0-rc.1) (2018-05-09)
|
||||
======================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.3-rc.1...v0.15.0-rc.1)
|
||||
|
||||
* No changes since 0.14.3-rc.1
|
||||
|
||||
Changes in [0.14.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.3-rc.1) (2018-05-09)
|
||||
======================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2...v0.14.3-rc.1)
|
||||
|
||||
* Update from Weblate.
|
||||
[\#6688](https://github.com/vector-im/riot-web/pull/6688)
|
||||
* Don't show presence on matrix.org
|
||||
[\#6638](https://github.com/vector-im/riot-web/pull/6638)
|
||||
* Enforce loading babel-polyfill first
|
||||
[\#6625](https://github.com/vector-im/riot-web/pull/6625)
|
||||
* Update hoek
|
||||
[\#6624](https://github.com/vector-im/riot-web/pull/6624)
|
||||
* Fix args in the release wrapper script
|
||||
[\#6614](https://github.com/vector-im/riot-web/pull/6614)
|
||||
|
||||
Changes in [0.14.2](https://github.com/vector-im/riot-web/releases/tag/v0.14.2) (2018-04-30)
|
||||
============================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.3...v0.14.2)
|
||||
|
||||
* No changes since rc.3
|
||||
|
||||
Changes in [0.14.2-rc.3](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.3) (2018-04-26)
|
||||
======================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.2...v0.14.2-rc.3)
|
||||
|
||||
* Fix CSS dependency versions to be the same as those in react-sdk to fix
|
||||
left panel header positions.
|
||||
|
||||
Changes in [0.14.2-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.2) (2018-04-26)
|
||||
======================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.2-rc.1...v0.14.2-rc.2)
|
||||
|
||||
* Fix Download of attachments in e2e encrypted rooms in Firefox
|
||||
|
||||
Changes in [0.14.2-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.2-rc.1) (2018-04-25)
|
||||
======================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.1...v0.14.2-rc.1)
|
||||
|
||||
* Update from Weblate.
|
||||
[\#6602](https://github.com/vector-im/riot-web/pull/6602)
|
||||
* Add readme bit on cross-origin renderer
|
||||
[\#6600](https://github.com/vector-im/riot-web/pull/6600)
|
||||
* Update from Weblate.
|
||||
[\#6573](https://github.com/vector-im/riot-web/pull/6573)
|
||||
* Copy media from react-sdk
|
||||
[\#6588](https://github.com/vector-im/riot-web/pull/6588)
|
||||
* Fix favicon
|
||||
[\#6580](https://github.com/vector-im/riot-web/pull/6580)
|
||||
* Update from Weblate.
|
||||
[\#6569](https://github.com/vector-im/riot-web/pull/6569)
|
||||
* move everything not explicitly riot (or status) branded into matrix-react-
|
||||
sdk
|
||||
[\#6500](https://github.com/vector-im/riot-web/pull/6500)
|
||||
* Remove presence management
|
||||
[\#5881](https://github.com/vector-im/riot-web/pull/5881)
|
||||
* change vector-web repo to riot-web in changelog
|
||||
[\#6480](https://github.com/vector-im/riot-web/pull/6480)
|
||||
* Update from Weblate.
|
||||
[\#6473](https://github.com/vector-im/riot-web/pull/6473)
|
||||
* Bump source-map-loader version to avoid bug /w inline base64 maps
|
||||
[\#6472](https://github.com/vector-im/riot-web/pull/6472)
|
||||
* Add CSS for new group admin radio button
|
||||
[\#6415](https://github.com/vector-im/riot-web/pull/6415)
|
||||
* Rxl881/sticker picker styling
|
||||
[\#6447](https://github.com/vector-im/riot-web/pull/6447)
|
||||
* Stickerpacks
|
||||
[\#6242](https://github.com/vector-im/riot-web/pull/6242)
|
||||
* Force gemini on HomePage
|
||||
[\#6368](https://github.com/vector-im/riot-web/pull/6368)
|
||||
* Rename the Riot-Web Translations Room
|
||||
[\#6348](https://github.com/vector-im/riot-web/pull/6348)
|
||||
* Add disable-presence-by-hs option to sample config
|
||||
[\#6350](https://github.com/vector-im/riot-web/pull/6350)
|
||||
* Reword the BugReportDialog.js as per @lampholder
|
||||
[\#6354](https://github.com/vector-im/riot-web/pull/6354)
|
||||
|
||||
Changes in [0.14.1](https://github.com/vector-im/riot-web/releases/tag/v0.14.1) (2018-04-12)
|
||||
============================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.0...v0.14.1)
|
||||
|
||||
* Remove presence management feature from labs
|
||||
* Fix an issue where Riot would fail to load at all if certain
|
||||
extensions were installed on Firefox
|
||||
* Fix an issue where e2e cryptography could be disabled due to
|
||||
a migration error.
|
||||
|
||||
Changes in [0.14.0](https://github.com/vector-im/riot-web/releases/tag/v0.14.0) (2018-04-11)
|
||||
============================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.14.0-rc.6...v0.14.0)
|
||||
|
||||
@@ -49,6 +49,15 @@ We have put some coarse mitigations into place to try to protect against this
|
||||
situation, but it's still not good practice to do it in the first place. See
|
||||
https://github.com/vector-im/riot-web/issues/1977 for more details.
|
||||
|
||||
The same applies for end-to-end encrypted content, but since this is decrypted
|
||||
on the client, Riot needs a way to supply the decrypted content from a separate
|
||||
origin to the one Riot is hosted on. This currently done with a 'cross origin
|
||||
renderer' which is a small piece of javascript hosted on a different domain.
|
||||
To avoid all Riot installs needing one of these to be set up, riot.im hosts
|
||||
one on usercontent.riot.im which is used by default. See 'config.json' if you'd
|
||||
like to host your own. https://github.com/vector-im/riot-web/issues/6173 tracks
|
||||
progress on replacing this with something better.
|
||||
|
||||
Building From Source
|
||||
====================
|
||||
|
||||
|
||||
@@ -27,5 +27,8 @@
|
||||
"whitelistedHSUrls": ["https://matrix.org"],
|
||||
"whitelistedISUrls": ["https://vector.im", "https://matrix.org"],
|
||||
"siteId": 1
|
||||
},
|
||||
"enable_presence_by_hs_url": {
|
||||
"https://matrix.org": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "riot-web",
|
||||
"productName": "Riot",
|
||||
"main": "src/electron-main.js",
|
||||
"version": "0.14.0",
|
||||
"version": "0.15.2",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "Vector Creations Ltd.",
|
||||
"dependencies": {
|
||||
|
||||
@@ -19,5 +19,8 @@
|
||||
"piwik": {
|
||||
"url": "https://piwik.riot.im/",
|
||||
"siteId": 1
|
||||
},
|
||||
"enable_presence_by_hs_url": {
|
||||
"https://matrix.org": false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,14 +70,19 @@ module.exports = function (config) {
|
||||
// This isn't required by any of the tests, but it stops karma
|
||||
// logging warnings when it serves a 404 for them.
|
||||
{
|
||||
pattern: 'src/skins/vector/img/*',
|
||||
pattern: 'node_modules/matrix-react-sdk/res/img/*',
|
||||
watched: false, included: false, served: true, nocache: false,
|
||||
},
|
||||
{
|
||||
pattern: 'res/themes/**',
|
||||
watched: false, included: false, served: true, nocache: false,
|
||||
},
|
||||
],
|
||||
|
||||
proxies: {
|
||||
// redirect img links to the karma server. See above.
|
||||
"/img/": "/base/src/skins/vector/img/",
|
||||
"/img/": "/base/node_modules/matrix-react-sdk/res/img/",
|
||||
"/themes/": "/base/res/themes/",
|
||||
},
|
||||
|
||||
// preprocess matching files before serving them to the browser
|
||||
|
||||
@@ -1483,7 +1483,7 @@
|
||||
"resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
|
||||
"integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
|
||||
"requires": {
|
||||
"hoek": "4.2.0"
|
||||
"hoek": "4.2.1"
|
||||
}
|
||||
},
|
||||
"boxen": {
|
||||
@@ -2210,7 +2210,7 @@
|
||||
"resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
|
||||
"integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
|
||||
"requires": {
|
||||
"hoek": "4.2.0"
|
||||
"hoek": "4.2.1"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4939,7 +4939,7 @@
|
||||
"requires": {
|
||||
"boom": "4.3.1",
|
||||
"cryptiles": "3.1.2",
|
||||
"hoek": "4.2.0",
|
||||
"hoek": "4.2.1",
|
||||
"sntp": "2.0.2"
|
||||
}
|
||||
},
|
||||
@@ -4955,9 +4955,9 @@
|
||||
"integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4="
|
||||
},
|
||||
"hoek": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
|
||||
"integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ=="
|
||||
"version": "4.2.1",
|
||||
"resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
|
||||
"integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="
|
||||
},
|
||||
"hoist-non-react-statics": {
|
||||
"version": "2.3.1",
|
||||
@@ -8167,7 +8167,7 @@
|
||||
"resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
|
||||
"integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",
|
||||
"requires": {
|
||||
"hoek": "4.2.0"
|
||||
"hoek": "4.2.1"
|
||||
}
|
||||
},
|
||||
"socket.io": {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "riot-web",
|
||||
"productName": "Riot",
|
||||
"main": "electron_app/src/electron-main.js",
|
||||
"version": "0.14.0",
|
||||
"version": "0.15.2",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"repository": {
|
||||
@@ -58,30 +58,21 @@
|
||||
"babel-runtime": "^6.11.6",
|
||||
"bluebird": "^3.5.0",
|
||||
"browser-request": "^0.3.3",
|
||||
"classnames": "^2.1.2",
|
||||
"draft-js": "^0.11.0-alpha",
|
||||
"extract-text-webpack-plugin": "^0.9.1",
|
||||
"favico.js": "^0.3.10",
|
||||
"filesize": "3.5.6",
|
||||
"flux": "2.1.1",
|
||||
"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.10.0",
|
||||
"matrix-react-sdk": "0.12.1",
|
||||
"matrix-js-sdk": "0.10.2",
|
||||
"matrix-react-sdk": "0.12.5",
|
||||
"modernizr": "^3.1.0",
|
||||
"pako": "^1.0.5",
|
||||
"prop-types": "^15.5.10",
|
||||
"react": "^15.6.0",
|
||||
"react-beautiful-dnd": "^4.0.1",
|
||||
"react-dom": "^15.6.0",
|
||||
"react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#5e97aef",
|
||||
"sanitize-html": "^1.11.1",
|
||||
"text-encoding-utf-8": "^1.0.1",
|
||||
"ua-parser-js": "^0.7.10",
|
||||
"url": "^0.11.0",
|
||||
"velocity-vector": "vector-im/velocity#059e3b2"
|
||||
"url": "^0.11.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"autoprefixer": "^6.6.0",
|
||||
@@ -143,7 +134,7 @@
|
||||
"react-addons-perf": "^15.4.0",
|
||||
"react-addons-test-utils": "^15.6.0",
|
||||
"rimraf": "^2.4.3",
|
||||
"source-map-loader": "^0.1.5",
|
||||
"source-map-loader": "^0.2.3",
|
||||
"webpack": "^1.12.14",
|
||||
"webpack-dev-server": "^1.16.2"
|
||||
},
|
||||
@@ -153,7 +144,7 @@
|
||||
"build": {
|
||||
"appId": "im.riot.app",
|
||||
"category": "Network",
|
||||
"electronVersion": "1.8.3",
|
||||
"electronVersion": "2.0.0",
|
||||
"//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
|
||||
"asar": false,
|
||||
"dereference": true,
|
||||
|
||||
@@ -7,6 +7,15 @@
|
||||
|
||||
set -e
|
||||
|
||||
orig_args=$@
|
||||
|
||||
# chomp any args starting with '-' as these need to go
|
||||
# through to the release script and otherwise we'll get
|
||||
# confused about what the version arg is.
|
||||
while [[ "$1" == -* ]]; do
|
||||
shift
|
||||
done
|
||||
|
||||
cd `dirname $0`
|
||||
|
||||
for i in matrix-js-sdk matrix-react-sdk
|
||||
@@ -38,4 +47,4 @@ git commit package.json -m "$tag"
|
||||
|
||||
cd ..
|
||||
|
||||
exec ./node_modules/matrix-js-sdk/release.sh -z "$@"
|
||||
exec ./node_modules/matrix-js-sdk/release.sh -z "$orig_args"
|
||||
|
||||
|
Before Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 1015 B |
|
Before Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 654 B |
|
Before Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 655 B |
|
Before Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 558 B |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 659 B |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 811 B |
|
Before Width: | Height: | Size: 566 B |
|
Before Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 668 B |
|
Before Width: | Height: | Size: 672 B |
|
Before Width: | Height: | Size: 4.7 KiB |
|
Before Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 669 B |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 568 B |
|
Before Width: | Height: | Size: 5.9 KiB |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 668 B |
|
Before Width: | Height: | Size: 785 B |
|
Before Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 5.0 KiB |
|
Before Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 568 B |
|
Before Width: | Height: | Size: 3.5 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 641 B |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 5.1 KiB |
|
Before Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 566 B |
|
Before Width: | Height: | Size: 661 B |
|
Before Width: | Height: | Size: 6.2 KiB |
|
Before Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 709 B |
|
Before Width: | Height: | Size: 560 B |
|
Before Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 5.6 KiB |