Skip to content

Commit 1ac5df3

Browse files
turt2liveturt2live
committed
Merge branch 'develop' into travis/feature/wellknown2
2 parents 39d1293 + 6f8c6bf commit 1ac5df3

9 files changed

Lines changed: 32 additions & 12 deletions

File tree

‎.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: User Interface or Usability Bug report
33
about: Please include screenshots in UI/UX bug reports
44
title: ''
5-
labels: ''
5+
labels: bug, ui/ux
66
assignees: ''
77

88
---

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
Changes in [1.1.2](https://github.com/vector-im/riot-web/releases/tag/v1.1.2) (2019-05-15)
2+
==========================================================================================
3+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.1...v1.1.2)
4+
5+
* react-sdk v1.1.2 to fix single sign-on and GIF autoplaying
6+
7+
Changes in [1.1.1](https://github.com/vector-im/riot-web/releases/tag/v1.1.1) (2019-05-14)
8+
==========================================================================================
9+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.0...v1.1.1)
10+
11+
* react-sdk v1.1.1 to fix regressions with registration
12+
113
Changes in [1.1.0](https://github.com/vector-im/riot-web/releases/tag/v1.1.0) (2019-05-07)
214
==========================================================================================
315
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.0-rc.1...v1.1.0)

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ WORKDIR /src
1515

1616
COPY . /src
1717
RUN dos2unix /src/scripts/docker-link-repos.sh && sh /src/scripts/docker-link-repos.sh
18-
RUN yarn install
18+
RUN yarn --network-timeout=100000 install
1919
RUN yarn build
2020

2121
# Copy the config now so that we don't create another layer in the app image

‎config.sample.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
"features": {
2222
"feature_groups": "labs",
2323
"feature_pinning": "labs",
24-
"feature_reactions": "labs"
24+
"feature_reactions": "labs",
25+
"feature_message_editing": "labs"
2526
},
2627
"default_federate": true,
2728
"default_theme": "light",

‎docs/labs.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,11 @@ That's it. Now should see your new counter under the header.
3535
reactions from other people. This feature is currently under active development,
3636
and only portions have been implemented so far.
3737

38+
## Message editing
39+
40+
`feature_message_editing` allows editing messages after they have been sent,
41+
accessible from the reaction/context bar when hovering a message.
42+
This feature is currently under active development,
43+
and only portions have been implemented so far.
44+
3845
[#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org

‎electron_app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "riot-web",
33
"productName": "Riot",
44
"main": "src/electron-main.js",
5-
"version": "1.1.0",
5+
"version": "1.1.2",
66
"description": "A feature-rich client for Matrix.org",
77
"author": "New Vector Ltd.",
88
"dependencies": {

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "riot-web",
33
"productName": "Riot",
44
"main": "electron_app/src/electron-main.js",
5-
"version": "1.1.0",
5+
"version": "1.1.2",
66
"description": "A feature-rich client for Matrix.org",
77
"author": "New Vector Ltd.",
88
"repository": {
@@ -74,7 +74,7 @@
7474
"gfm.css": "^1.1.2",
7575
"highlight.js": "^9.13.1",
7676
"matrix-js-sdk": "1.1.0",
77-
"matrix-react-sdk": "1.1.0",
77+
"matrix-react-sdk": "1.1.2",
7878
"modernizr": "^3.6.0",
7979
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
8080
"prop-types": "^15.6.2",

‎scripts/docker-link-repos.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ git clone $JS_SDK_REPO js-sdk
1313
cd js-sdk
1414
git checkout $JS_SDK_BRANCH
1515
yarn link
16-
yarn install
16+
yarn --network-timeout=100000 install
1717
cd ../
1818

1919
echo "Linking react-sdk"
@@ -22,7 +22,7 @@ cd react-sdk
2222
git checkout $REACT_SDK_BRANCH
2323
yarn link
2424
yarn link matrix-js-sdk
25-
yarn install
25+
yarn --network-timeout=100000 install
2626
cd ../
2727

2828
echo "Setting up riot-web with react-sdk and js-sdk packages"

‎yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5769,10 +5769,10 @@ matrix-mock-request@^1.2.3:
57695769
bluebird "^3.5.0"
57705770
expect "^1.20.2"
57715771

5772-
matrix-react-sdk@1.1.0:
5773-
version "1.1.0"
5774-
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.0.tgz#3f1c139cb4c33190b9dcb36a6e776d3ad53334f6"
5775-
integrity sha512-3JjyzbrmokzCl5Ss/0dWjUyc8EuO3uWvD3LBHZhTkFHe1uSiHjC2+Oy8hiJha8tubJtCWnQPE7tXIffkYmvdAQ==
5772+
matrix-react-sdk@1.1.2:
5773+
version "1.1.2"
5774+
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.2.tgz#bff86db4fc521deb3076467707dcc338bbff0542"
5775+
integrity sha512-MKALTgxSULFSJZagts9+oMu/SZFNHHfZcMKgDWJELdgTIcHUg/rIOFt2y1ghkbpWJjC2wGM8J5E0TAsL0aeWcQ==
57765776
dependencies:
57775777
babel-plugin-syntax-dynamic-import "^6.18.0"
57785778
babel-runtime "^6.26.0"

0 commit comments

Comments
 (0)