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 |
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 |
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 |
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 |
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 |
Bruno Windels
|
6d13ea0043
|
stop propagation click handler for <TR> doesn't run
|
2019-09-13 14:07:36 +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 |
Bruno Windels
|
820869d99b
|
fix clicking on room dir item
|
2019-09-13 11:00:55 +01: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 |
Bruno Windels
|
d64cd58e93
|
only hide x button when blurred && no more search term
|
2019-09-12 18:26:12 +01:00 |
Bruno Windels
|
87f8000621
|
only hide x button when blurred && no more search term
|
2019-09-12 17:17:15 +02:00 |
Michael Telatynski
|
f95ab2eeb1
|
Merge pull request #3290 from matrix-org/t3chguy/report_event
Add way to report the content of a message
|
2019-09-12 15:11:32 +01:00 |
Bruno Windels
|
1806e83247
|
Merge pull request #3428 from matrix-org/bwindels/breadcrumbs-after-10
Breadcrumbs: only show after having joined at least 10 rooms
|
2019-09-12 13:19:02 +00:00 |
Bruno Windels
|
fb5a85db81
|
put min room count in constant
|
2019-09-12 15:12:18 +02:00 |
David Baker
|
ef7d8c42a8
|
Fix merge
|
2019-09-12 13:09:59 +01:00 |
Bruno Windels
|
94bdedd25b
|
show breadcrumbs only after having joined at least 10 rooms
|
2019-09-12 14:07:46 +02:00 |
RiotRobot
|
b0abb52518
|
Merge branch 'master' into develop
|
2019-09-12 13:07:27 +01:00 |
Michael Telatynski
|
6dc69afe67
|
Merge branches 'develop' and 't3chguy/community_member_invite_IS_text' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/community_member_invite_IS_text
|
2019-09-12 12:53:32 +01:00 |
Michael Telatynski
|
b6309a4294
|
Improve ReportEventDialog as per PR feedback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2019-09-12 12:52:11 +01:00 |
Michael Telatynski
|
9a15d4cfc1
|
Merge branches 'develop' and 't3chguy/report_event' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/report_event
Conflicts:
src/i18n/strings/en_EN.json
|
2019-09-12 12:45:16 +01:00 |
Michael Telatynski
|
a40ecda993
|
Fix missed case of validAddressTypes being conditional
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2019-09-12 12:34:14 +01:00 |
Michael Telatynski
|
d7bac95270
|
Merge pull request #3421 from matrix-org/t3chguy/nvl/fix_sso_flash
Hide the change HS url button on SSO login flow if custom urls disabled
|
2019-09-12 12:29:03 +01:00 |
Bruno Windels
|
122e15156a
|
always show clear button in search box when focused
|
2019-09-12 12:21:18 +01:00 |
Michael Telatynski
|
7c54359d3a
|
Hide the change HS url button on SSO login flow if custom urls disabled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2019-09-12 12:17:52 +01:00 |
Michael Telatynski
|
5091658dc7
|
Update Copyright
|
2019-09-12 12:16:01 +01:00 |
Michael Telatynski
|
8eb8b00460
|
RoomDirectory: show spinner if loading more results
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2019-09-12 12:15:56 +01:00 |
Michael Telatynski
|
d197fd90ad
|
Merge branches 'develop' and 't3chguy/nvl/fix_sso_flash' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/nvl/fix_sso_flash
|
2019-09-12 10:25:54 +01:00 |
Bruno Windels
|
7c97078764
|
always show clear button in search box when focused
|
2019-09-12 11:12:06 +02:00 |
Michael Telatynski
|
a4a85dc541
|
Hide the change HS url button on SSO login flow if custom urls disabled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2019-09-11 23:02:52 +01:00 |