diff --git a/CHANGELOG.md b/CHANGELOG.md index ceb729b82c..e74228e435 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,38 @@ +Changes in [1.3.0](https://github.com/vector-im/riot-web/releases/tag/v1.3.0) (2019-07-18) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0-rc.3...v1.3.0) + + * Upgrade to React SDK 1.4.0 and JS SDK 2.2.0 + * Message editing and reactions features enabled + * Remove edits and reactions feature flags from docs and config + [\#10365](https://github.com/vector-im/riot-web/pull/10365) + +Changes in [1.3.0-rc.3](https://github.com/vector-im/riot-web/releases/tag/v1.3.0-rc.3) (2019-07-15) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0-rc.2...v1.3.0-rc.3) + + * Update to react-sdk rc.3 to fix a bug where a room admin could generate a room + that would cause Riot to error, and some stuck notifications. + +Changes in [1.3.0-rc.2](https://github.com/vector-im/riot-web/releases/tag/v1.3.0-rc.2) (2019-07-12) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.3.0-rc.1...v1.3.0-rc.2) + + * Upgrade to React SDK 1.4.0-rc.2 and JS SDK 2.2.0-rc.2 + * Fix regression from Riot 1.3.0-rc.1 when listing devices in user settings + +Changes in [1.3.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.3.0-rc.1) (2019-07-12) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.4...v1.3.0-rc.1) + + * Upgrade to React SDK 1.4.0-rc.1 and JS SDK 2.2.0-rc.1 + * Update from Weblate + [\#10328](https://github.com/vector-im/riot-web/pull/10328) + * Upgrade dependencies + [\#10308](https://github.com/vector-im/riot-web/pull/10308) + * Upgrade dependencies + [\#10260](https://github.com/vector-im/riot-web/pull/10260) + Changes in [1.2.4](https://github.com/vector-im/riot-web/releases/tag/v1.2.4) (2019-07-11) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.3...v1.2.4) diff --git a/config.sample.json b/config.sample.json new file mode 100644 index 0000000000..751e2839c6 --- /dev/null +++ b/config.sample.json @@ -0,0 +1,43 @@ +{ + "default_server_config": { + "m.homeserver": { + "base_url": "https://matrix.org", + "server_name": "matrix.org" + }, + "m.identity_server": { + "base_url": "https://vector.im" + } + }, + "disable_custom_urls": false, + "disable_guests": false, + "disable_login_language_selector": false, + "disable_3pid_login": false, + "brand": "Riot", + "integrations_ui_url": "https://scalar.vector.im/", + "integrations_rest_url": "https://scalar.vector.im/api", + "integrations_jitsi_widget_url": "https://scalar.vector.im/api/widgets/jitsi.html", + "bug_report_endpoint_url": "https://riot.im/bugreports/submit", + "defaultCountryCode": "GB", + "showLabsSettings": false, + "features": { + "feature_groups": "labs", + "feature_pinning": "labs" + }, + "default_federate": true, + "default_theme": "light", + "roomDirectory": { + "servers": [ + "matrix.org" + ] + }, + "welcomeUserId": "@riot-bot:matrix.org", + "piwik": { + "url": "https://piwik.riot.im/", + "whitelistedHSUrls": ["https://matrix.org"], + "whitelistedISUrls": ["https://vector.im", "https://matrix.org"], + "siteId": 1 + }, + "enable_presence_by_hs_url": { + "https://matrix.org": false + } +} diff --git a/docs/labs.md b/docs/labs.md index 3d568a2b85..579bb1e113 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -29,17 +29,4 @@ Once enabled, send a custom state event to a room to set values: That's it. Now should see your new counter under the header. -## Reactions - -`feature_reactions` allows reacting to messages with emoji and displaying -reactions from other people. This feature is currently under active development, -and only portions have been implemented so far. - -## Message editing - -`feature_message_editing` allows editing messages after they have been sent, -accessible from the reaction/context bar when hovering a message. -This feature is currently under active development, -and only portions have been implemented so far. - [#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org diff --git a/electron_app/package.json b/electron_app/package.json index c8802cd241..24aaedca13 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.2.4", + "version": "1.3.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/electron_app/riot.im/config.json b/electron_app/riot.im/config.json index e24d8ecf0d..a995a4e9e3 100644 --- a/electron_app/riot.im/config.json +++ b/electron_app/riot.im/config.json @@ -30,9 +30,7 @@ } }, "features": { - "feature_lazyloading": "enable", - "feature_reactions": "enable", - "feature_message_editing": "enable" + "feature_lazyloading": "enable" }, "enable_presence_by_hs_url": { "https://matrix.org": false diff --git a/package.json b/package.json index 55f922e3ed..9296117829 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.2.4", + "version": "1.3.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -45,7 +45,7 @@ "build": "yarn build:js-sdk && yarn build:react-sdk && yarn reskindex && yarn build:res && yarn build:bundle", "build:dev": "yarn build:js-sdk && yarn build:react-sdk && yarn reskindex && yarn build:res && yarn build:bundle:dev", "dist": "scripts/package.sh", - "install:electron": "install-app-deps", + "install:electron": "electron-builder install-app-deps", "electron": "yarn install:electron && npx electron .", "start:res": "node scripts/copy-res.js -w", "start:js": "webpack-dev-server --host=0.0.0.0 --output-filename=bundles/_dev_/[name].js --output-chunk-filename=bundles/_dev_/[name].js -w --progress --mode development", @@ -75,8 +75,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "2.1.1", - "matrix-react-sdk": "1.3.1", + "matrix-js-sdk": "2.2.0", + "matrix-react-sdk": "1.4.0", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz", "prop-types": "^15.6.2", diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json index b687235c3c..2c295053ff 100644 --- a/riot.im/develop/config.json +++ b/riot.im/develop/config.json @@ -25,9 +25,7 @@ "feature_tabbed_settings": "labs", "feature_sas": "labs", "feature_room_breadcrumbs": "labs", - "feature_state_counters": "labs", - "feature_reactions": "enable", - "feature_message_editing": "enable" + "feature_state_counters": "labs" }, "welcomeUserId": "@riot-bot:matrix.org", "piwik": { diff --git a/src/vector/getconfig.js b/src/vector/getconfig.js index 392b32fe07..984b105190 100644 --- a/src/vector/getconfig.js +++ b/src/vector/getconfig.js @@ -37,7 +37,7 @@ export async function getVectorConfig(relativeLocation) { function getConfig(configJsonFilename) { return new Promise(function(resolve, reject) { request( - { method: "GET", url: configJsonFilename }, + { method: "GET", url: configJsonFilename, qs: { cachebuster: Date.now() } }, (err, response, body) => { try { if (err || response.status < 200 || response.status >= 300) { diff --git a/yarn.lock b/yarn.lock index 08fcdcaaf2..adbc5a57c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5986,10 +5986,10 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -matrix-js-sdk@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.1.1.tgz#c4d9ed81e18e2c2fce9fff168fdf41f37c390b6a" - integrity sha512-dpVuwrQjOJn8eqtP9TRoSX6WIbdZG7+RCmqkJtfvpjB+iNgtDhodIWfrNearSBhJYezipUFu9nrt9akKfWBXxQ== +matrix-js-sdk@2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.2.0.tgz#c96a2caa4c92e5998443027579d7e76d4bcd4d21" + integrity sha512-gab7wuscgTKbXY5x136t9qSnDbOuq785ezd++NoFLEau0YjDos0YKolAm0TValUC9LY30CoVqqMfyPJ68CMezQ== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -6010,10 +6010,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.3.1.tgz#47bcb451684e09c7306db9751000e4c5af713bb7" - integrity sha512-qQ9O7sBkcTWbUUkv82fSZVXyXVNkL9WJkWqrAlzTUzf8pzVENqtKunQeDbrfzuYan2bHre+ot14KFwSkywOhcw== +matrix-react-sdk@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.4.0.tgz#dd7a6b9f73355174eeba37ce4ae4eb8bba98d57d" + integrity sha512-kZIkTU4tYNzOJX0hcWRWiyswuHJBP2svnbDg+GvCXFsDKZM566G3Hg5gU11QFVFAmQokO3DVazpQi6nlKt5dCg== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -6040,7 +6040,7 @@ matrix-react-sdk@1.3.1: linkifyjs "^2.1.6" lodash "^4.17.14" lolex "2.3.2" - matrix-js-sdk "2.1.1" + matrix-js-sdk "2.2.0" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0"