J. Ryan Stinnett
4e42dbe418
Fix address type props to state conversion
...
The address picker recently started tracking props and state versions of valid
address types separately
(https://github.com/matrix-org/matrix-react-sdk/pull/3408 ), where props
represents the maximal set of possible types and the state is the current
available types right now (since it can change while the dialog is open).
For the case where there is no a IS, a regression was introduced by that PR by
mutating the props in place instead returning a modified copy for the state.
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3408
Fixes https://github.com/vector-im/riot-web/issues/10878
2019-09-17 15:00:32 +01:00
Michael Telatynski
2a67970d32
Merge pull request #3445 from matrix-org/t3chguy/nvl/historical_preview
...
Only put a room in Historical if === 'leave' not peeked
2019-09-17 10:56:46 +01:00
RiotRobot
dd0ffa8e72
Merge branch 'master' into develop
2019-09-16 17:49:46 +01:00
RiotRobot
9a6e44a700
Merge branch 'release-v1.5.3'
2019-09-16 17:48:08 +01:00
RiotRobot
74cbdf28ed
v1.5.3
2019-09-16 17:47:22 +01:00
RiotRobot
a1b13e51a0
Prepare changelog for v1.5.3
2019-09-16 17:47:22 +01:00
RiotRobot
44cf99d5d4
released js-sdk
2019-09-16 17:44:16 +01:00
David Baker
51dd0cd88a
Merge pull request #3448 from matrix-org/bwindels/joinrdfix
...
Release: Directory should use the alias or server information to join the room
2019-09-16 17:34:44 +01:00
Michael Telatynski
5d1056e1ef
don't fire onFinished twice
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-16 18:20:31 +02:00
Michael Telatynski
597433d549
Reuse showRoom for onJoinClick so we join using alias if its available
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-16 18:20:24 +02:00
Bruno Windels
129d3693b2
Merge pull request #3444 from matrix-org/t3chguy/nvl/fix_room_directory
...
Reuse showRoom for onJoinClick so we join using alias if its available
2019-09-16 16:13:28 +00:00
Bruno Windels
deddf77a05
Merge pull request #3446 from matrix-org/bwindels/fixscalarurlcheck
...
Fix: make sure scalarUrls is never undefined
2019-09-16 15:43:03 +00:00
J. Ryan Stinnett
e50889d9e6
Merge pull request #3447 from matrix-org/jryans/react-16-lock-tweak
...
Tweak lock file to pull in only one React version
2019-09-16 15:28:10 +02:00
J. Ryan Stinnett
16a412e7d0
Tweak lock file to pull in only one React version
...
Yarn deps can be a bit fiddly when targeting specific versions. This tweaks the
lock file to only pull in a single React version.
For others who may need to do something like this again, I recommend deleting
specific package entries from `yarn.lock` and re-running `yarn install`. That
should make it pick the right thing while also leaving other packages as they
were.
2019-09-16 14:07:05 +01:00
Bruno Windels
166364ba03
Fix: make sure scalarUrls is never undefined
2019-09-16 10:12:15 +02:00
Michael Telatynski
3fdaeea3a2
allow rooms we were banned from into Historical also
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-15 22:24:23 +01:00
Michael Telatynski
4fb4c5b744
Only put a room in Historical if === 'leave' not peeked
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-15 22:19:07 +01:00
Michael Telatynski
7f5d38772d
don't fire onFinished twice
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-15 21:30:01 +01:00
Michael Telatynski
54d98c22ba
Reuse showRoom for onJoinClick so we join using alias if its available
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-15 21:25:36 +01:00
Travis Ralston
e18b38c409
Merge pull request #3437 from matrix-org/travis/fix-deactivate
...
Wrap deactivation check with sanity conditions
2019-09-13 15:59:04 -06:00
Travis Ralston
3150d65bd7
De-async _calculateCanPermissions
2019-09-13 12:43:57 -06:00
Travis Ralston
d18d15311f
Remove extraneous guard on deactivation check
2019-09-13 12:43:47 -06:00
RiotRobot
0556d34534
v1.5.3-rc.3
2019-09-13 16:21:15 +01:00
RiotRobot
195afab8fb
Prepare changelog for v1.5.3-rc.3
2019-09-13 16:21:15 +01:00
RiotRobot
93d76cef36
js-sdk rc.1 to get report API
2019-09-13 16:17:40 +01:00
David Baker
7afd80e55b
Merge pull request #3408 from matrix-org/t3chguy/community_member_invite_IS_text
...
Fix identity server text in AddressPickerDialog
2019-09-13 15:45:22 +01:00
David Baker
05a26373e8
Merge pull request #3438 from matrix-org/travis/revoke-1
...
Change copy for sharing an email
2019-09-13 15:42:53 +01:00
RiotRobot
63f75a36e4
v1.5.3-rc.2
2019-09-13 14:23:39 +01:00
RiotRobot
3889917cba
Prepare changelog for v1.5.3-rc.2
2019-09-13 14:23:38 +01:00
Bruno Windels
40bd1845d2
Merge pull request #3441 from matrix-org/bwindels/fixroomdir-itemclick-bis
...
Fix: stop propagation click handler for <TR> doesn't run
2019-09-13 13:08:42 +00:00
David Baker
3986d78d9e
Merge pull request #3443 from matrix-org/dbkr/fixroomdir-itemclick-bis_2
...
Fix: stop propagation click handler for <TR> doesn't run
2019-09-13 14:08:35 +01:00
Bruno Windels
6d13ea0043
stop propagation click handler for <TR> doesn't run
2019-09-13 14:07:36 +01:00
David Baker
3fb72cd1b7
Merge pull request #3442 from matrix-org/dbkr/report_event_2
...
Add way to report the content of a message
2019-09-13 13:42:35 +01:00
Michael Telatynski
c3d01715ff
Improve ReportEventDialog as per PR feedback
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-13 13:41:50 +01:00
Michael Telatynski
92af11bce7
fix indentation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-13 13:40:31 +01:00
Michael Telatynski
fc49290459
Add way to report the content of a message
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-13 13:40:25 +01:00
Bruno Windels
f73f08e998
stop propagation click handler for <TR> doesn't run
2019-09-13 14:33:09 +02:00
David Baker
e548e4d7a5
Merge pull request #3436 from matrix-org/travis/deactivate-release
...
Fix synapse deactivate button for release
2019-09-13 13:26:19 +01:00
David Baker
ca03a35296
Merge pull request #3440 from matrix-org/dbkr/fixroomdir-itemclick
...
Fix: clicking on a room directory item takes you to the room
2019-09-13 11:00:58 +01:00
Bruno Windels
820869d99b
fix clicking on room dir item
2019-09-13 11:00:55 +01:00
Bruno Windels
fcfdcb4fd3
Merge pull request #3439 from matrix-org/bwindels/fixroomdir-itemclick
...
Fix: clicking on a room directory item takes you to the room
2019-09-13 09:55:37 +00:00
Bruno Windels
bf460dbd3d
fix clicking on room dir item
2019-09-13 11:09:02 +02:00
Travis Ralston
f25529eed7
Change copy for sharing an email
...
Fixes https://github.com/vector-im/riot-web/issues/10758
2019-09-12 22:39:32 -06:00
Travis Ralston
27828a3785
Wrap deactivation check with sanity conditions
...
To ensure the matrixClient is not null (the problem) and that unexpected errors don't brick the app.
Fixes https://github.com/vector-im/riot-web/issues/10854
2019-09-12 18:31:58 -06:00
Travis Ralston
f4ebde1596
Wrap deactivation check with sanity conditions
...
To ensure the matrixClient is not null (the problem) and that unexpected errors don't brick the app.
Fixes https://github.com/vector-im/riot-web/issues/10854
2019-09-12 18:30:27 -06:00
Michael Telatynski
3fef6e6b22
Support Synapse deactivate on MemberInfo without Room (timeline pill)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-12 18:28:16 -06:00
RiotRobot
d394e76254
v1.5.3-rc.1
2019-09-12 18:37:13 +01:00
RiotRobot
a8df9956d9
Prepare changelog for v1.5.3-rc.1
2019-09-12 18:37:13 +01:00
David Baker
29eef9ad10
Merge pull request #3435 from matrix-org/dbkr/fix-filter-x_2
...
Fix: only hide clear filter button when blurred & no more search term
2019-09-12 18:27:22 +01:00
Bruno Windels
d64cd58e93
only hide x button when blurred && no more search term
2019-09-12 18:26:12 +01:00