v1.6.0-rc.5

Remove feature flag docs from docs on release

CHANGELOG.md

@@ -1,3 +1,17 @@
+Changes in [1.6.0-rc.5](https://github.com/vector-im/riot-web/releases/tag/v1.6.0-rc.5) (2020-04-30)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.0-rc.4...v1.6.0-rc.5)
+
+ * Upgrade to React SDK 2.5.0-rc.5 and JS SDK 6.0.0-rc.1
+ * Remove feature flag docs from docs on release
+   [\#13375](https://github.com/vector-im/riot-web/pull/13375)
+
+Changes in [1.6.0-rc.4](https://github.com/vector-im/riot-web/releases/tag/v1.6.0-rc.4) (2020-04-23)
+====================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.0-rc.3...v1.6.0-rc.4)
+
+ * Upgrade to React SDK 2.5.0-rc.4 and JS SDK 5.3.1-rc.4
+
 Changes in [1.6.0-rc.3](https://github.com/vector-im/riot-web/releases/tag/v1.6.0-rc.3) (2020-04-17)
 ====================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.6.0-rc.2...v1.6.0-rc.3)

docs/labs.md

@@ -75,14 +75,6 @@ instead of verifying each of their devices.
 
 This feature is still in development and will be landing in several chunks.
 
-## Event indexing and E2EE search support using Seshat (`feature_event_indexing`)
-
-Adds support for search in E2E encrypted rooms. This enables an event indexer
-that downloads, stores, and indexes room messages for E2E encrypted rooms.
-
-The existing search will transparently work for encrypted rooms just like it
-does for non-encrypted.
-
 ## Bridge info tab (`feature_bridge_state`)
 
 Adds a "Bridge Info" tab to the Room Settings dialog, if a compatible bridge is
@@ -95,11 +87,6 @@ tab as the single source of truth just yet.
 This adds a presence indicator in the room list next to DM rooms where the other
 person is online.
 
-## Show padlocks on invite only rooms (`feature_invite_only_padlocks`)
-
-This adds padlocks to room list tiles and room header for invite only rooms.
-This feature flag (unlike most) is enabled by default.
-
 ## Custom themes (`feature_custom_themes`)
 
 Custom themes are possible through Riot's [theme support](./theming.md), though

electron_app/package.json

@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "1.6.0-rc.3",
+  "version": "1.6.0-rc.5",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "dependencies": {

package.json

@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "1.6.0-rc.3",
+  "version": "1.6.0-rc.5",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -68,8 +68,8 @@
     "favico.js": "^0.3.10",
     "gfm.css": "^1.1.2",
     "highlight.js": "^9.13.1",
-    "matrix-js-sdk": "5.3.1-rc.3",
-    "matrix-react-sdk": "2.5.0-rc.3",
+    "matrix-js-sdk": "6.0.0-rc.1",
+    "matrix-react-sdk": "2.5.0-rc.5",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
     "postcss-easings": "^2.0.0",
     "prop-types": "^15.7.2",

riot.im/develop/config.json

@@ -21,8 +21,6 @@
         "feature_mjolnir": "labs",
         "feature_dm_verification": "labs",
         "feature_cross_signing": "enable",
-        "feature_invite_only_padlocks": "enable",
-        "feature_event_indexing": "disable",
         "feature_bridge_state": "labs",
         "feature_presence_in_room_list": "labs",
         "feature_custom_themes": "labs"

yarn.lock

@@ -4148,15 +4148,15 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojibase-data@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-5.0.1.tgz#ce6fe36b4affd3578e0be8779211018a2fdae960"
-  integrity sha512-rYWlogJ2q5P78U8Xx1vhsXHcYKu1wFnr7+o6z9QHssZ1SsJLTCkJINZIPHRFWuDreAUK457TkqHpdOXElu0fzA==
+emojibase-data@^4.0.2:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-4.2.1.tgz#3d1f0c69ddbb2ca7b7014f5e34654190802a40df"
+  integrity sha512-O0vxoPMgVkRq/uII/gdAjz9RwNv6ClJrd3J9QCCRC4btZRmeut/qohC/Fi+NNXUcjY08RWNTvxSnq/vij8hvrw==
 
-emojibase-regex@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-4.0.1.tgz#a2cd4bbb42825422da9ec72f15e970bc2c90b46a"
-  integrity sha512-S42UHkFfz15i4NNz+wi9iMKFo+B6Kalc6PJLpYX0BUANViXw4vSyYZMFdBGRLduSabWHuEcTLZl9xOa2YP3eJw==
+emojibase-regex@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-3.2.1.tgz#122935958c9a49c96bb29ac69ccbbac0b2e7022d"
+  integrity sha512-VAX2Rc2U/alu5q6P2cET2alzC63o1Uarm6Ea/b3ab+KOzxZT4JKmB0tCU1sTZvfNKa16KMLCK2k7hJBHJq4vWQ==
 
 emojis-list@^2.0.0:
   version "2.1.0"
@@ -7597,10 +7597,10 @@ mathml-tag-names@^2.1.1:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-matrix-js-sdk@5.3.1-rc.3:
-  version "5.3.1-rc.3"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.3.1-rc.3.tgz#fada68aaf9fadd2f423a297bba8193b5bd697316"
-  integrity sha512-YMfOdhlAFk4kHQ85S3kosVBWSr8iCJ8OaVpJr+lDFoXkvIrPgSn5zWesg+ny/bvQjWNRny7Ch7wcmozojKQqqg==
+matrix-js-sdk@6.0.0-rc.1:
+  version "6.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.0.0-rc.1.tgz#afdee9d49fe0a1040d56fc1b5014e628cc15b5a4"
+  integrity sha512-m3xkRFmf6VLXxDVeHPrIWFp9tvc8lGIZSlJ/ObY+mdn4gIGFjV77A+3gcuMynj0yb6DJtkexPlqP2G9wmMyQuQ==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"
@@ -7620,10 +7620,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-matrix-react-sdk@2.5.0-rc.3:
-  version "2.5.0-rc.3"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.5.0-rc.3.tgz#7d2c85db0dedf18de9bb02bee1ec91de61f8ec98"
-  integrity sha512-gncoNcI8EP7ojkjdMQ4VVUj3JteMyXRVbC2sfAaoWduWK05luGyhOOpI3MQJRPZELKPHgMw97qNTiOBecEDRwA==
+matrix-react-sdk@2.5.0-rc.5:
+  version "2.5.0-rc.5"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.5.0-rc.5.tgz#3b6c8dd05069a201a7fdd4265a8f20b3f1afeaca"
+  integrity sha512-CO8S6C3wfvCsgS7h48KPx/9yGFLS5O4HZjRfUsbhAD+/16rUy7f9t+8w1Z320xH+X/LMQsb47Y6C6TDZ4KIdlQ==
   dependencies:
     "@babel/runtime" "^7.8.3"
     blueimp-canvas-to-blob "^3.5.0"
@@ -7635,8 +7635,8 @@ matrix-react-sdk@2.5.0-rc.3:
     create-react-class "^15.6.0"
     diff-dom "^4.1.3"
     diff-match-patch "^1.0.4"
-    emojibase-data "^5.0.1"
-    emojibase-regex "^4.0.1"
+    emojibase-data "^4.0.2"
+    emojibase-regex "^3.0.0"
     escape-html "^1.0.3"
     file-saver "^1.3.3"
     filesize "3.5.6"
@@ -7650,7 +7650,7 @@ matrix-react-sdk@2.5.0-rc.3:
     is-ip "^2.0.0"
     linkifyjs "^2.1.6"
     lodash "^4.17.14"
-    matrix-js-sdk "5.3.1-rc.3"
+    matrix-js-sdk "6.0.0-rc.1"
     minimist "^1.2.0"
     pako "^1.0.5"
     png-chunks-extract "^1.0.0"