Commit Graph

17887 Commits (0ab9efc594f7918851fa55d579e9ecf4c825892c)

Author SHA1 Message Date
J. Ryan Stinnett 0ab9efc594 Delay IS access tokens 2019-09-23 12:28:41 +01:00
J. Ryan Stinnett e98b753c21 Use alternate MSISDN submit URL when returned by HS
This changes MSISDN token submission to send to an arbitrary URL (instead of the
current IS) when the HS provides such a URL.

Fixes https://github.com/vector-im/riot-web/issues/10923
2019-09-23 12:21:25 +01:00
J. Ryan Stinnett 351a3ebd67
Merge pull request #3462 from matrix-org/jryans/msc2290
Use separate 3PID add and bind flow for supporting HSes
2019-09-20 14:37:03 +01:00
J. Ryan Stinnett f9a09d271b Use separate MSISDN add and bind flow for supporting HSes
This changes the paths used for binding MSISDNs for discovery to use the new
separate bind / unbind APIs on supporting servers.

Fixes https://github.com/vector-im/riot-web/issues/10839
2019-09-20 12:45:22 +01:00
J. Ryan Stinnett ff69ad02b9 Use separate email add and bind flow for supporting HSes
This changes the paths used for binding emails for discovery to use the new
separate bind / unbind APIs on supporting servers.

Part of https://github.com/vector-im/riot-web/issues/10839
2019-09-20 12:19:43 +01:00
Michael Telatynski 46e0a7cafa
Merge pull request #3460 from matrix-org/t3chguy/room_avatar
Add roomavatar slash command to set avatar of the current room
2019-09-19 16:01:35 +01:00
Michael Telatynski 54643d28d4
Merge pull request #3458 from matrix-org/t3chguy/register_disable_no_custom_url_spinner
Don't show spinner if registration is disabled
2019-09-19 15:59:49 +01:00
J. Ryan Stinnett 9a1305bf4a Extract separate add / bind methods on AddThreepid 2019-09-19 15:53:50 +01:00
Michael Telatynski d5c96b86d4 fix test
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-19 10:31:34 +01:00
Michael Telatynski d1fb31a6dc Merge branches 'develop' and 't3chguy/register_disable_no_custom_url_spinner' of github.com:matrix-org/matrix-react-sdk into t3chguy/register_disable_no_custom_url_spinner 2019-09-19 10:07:42 +01:00
Michael Telatynski f8b1b36051 Fix copy-paste issue
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-19 09:48:35 +01:00
Michael Telatynski 4983378230 Merge branches 'develop' and 't3chguy/room_avatar' of github.com:matrix-org/matrix-react-sdk into t3chguy/room_avatar 2019-09-19 09:44:56 +01:00
Michael Telatynski f356b8a3c9
Merge pull request #3457 from matrix-org/t3chguy/sso_device_name
Use same initial device name rules for SSO login as password login
2019-09-19 09:27:13 +01:00
Michael Telatynski 1a330374fe
Merge pull request #3459 from matrix-org/t3chguy/editing_enable_onPaste
Fix disabled save button on message editor when pasting
2019-09-19 09:26:50 +01:00
Michael Telatynski 2a3c8d350d i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 18:02:45 +01:00
Michael Telatynski 2632e648b4 Add roomavatar slash command to set avatar of the current room
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 16:33:56 +01:00
Michael Telatynski 02dfdffc4f Fix failing test due to newly added assumption
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 14:35:13 +01:00
Michael Telatynski c286f2214f Fix disabled save button on message editor when pasting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 14:09:38 +01:00
Michael Telatynski 6209d62f49 Don't show spinner if registration is disabled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 13:19:33 +01:00
J. Ryan Stinnett 99b804d567 Change to separate add and bind to guard 3PID account section
This changes to checking for HS support of separate add and bind when guarding
the 3PID account section.

For older HSes, we in fact always require an IS for add with bind param, so the
previous version of this was incorrect.

Part of https://github.com/vector-im/riot-web/issues/10839
2019-09-18 13:02:52 +01:00
Michael Telatynski 020f15ca6f
Merge pull request #3456 from matrix-org/t3chguy/delint
Some delinting
2019-09-18 13:00:49 +01:00
Michael Telatynski c633df3c15 Use same initial device name rules for SSO login as password login
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 12:16:41 +01:00
David Baker 58c333f9c1
Merge pull request #3455 from matrix-org/t3chguy/nvl/fix_phone_numbers
Fix failure to render newly verified phone number and nested forms
2019-09-18 09:57:19 +01:00
Michael Telatynski e502558f7d Delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 09:27:43 +01:00
Michael Telatynski 54ea85f235 regenerate .eslintignore.errorfiles
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 09:12:23 +01:00
Michael Telatynski 648527e650 Fix failure to render newly verified phone number and nested forms
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 08:41:05 +01:00
Travis Ralston d7a1116880
Merge pull request #3454 from matrix-org/travis/focus
Focus context menus so screen readers can find them
2019-09-17 16:00:47 -06:00
Travis Ralston 9f3f88ba00 Focus context menus so screen readers can find them
Fixes https://github.com/vector-im/riot-web/issues/10899

The `tabIndex` is required to make the thing actually focusable. This is the same trick employed in https://github.com/matrix-org/matrix-react-sdk/pull/2994
2019-09-17 15:41:39 -06:00
Travis Ralston df2632d164
Merge pull request #3453 from matrix-org/travis/fix-tests1
Fix unit tests: Use correct ShallowRenderer and updated lolex
2019-09-17 14:47:45 -06:00
Travis Ralston 10b2501785 Upgrade lolex to pull in a clock fix
See https://github.com/sinonjs/lolex/issues/136

We don't use fake timers, but we do use lolex's clock, which probably causes the same thing. Jumping from 2.x to 4.x looks largely compatible - tests pass.
2019-09-17 14:37:59 -06:00
Travis Ralston 99b8193ce7 Use the new ShallowRenderer over ReactTestUtils
Mostly because the ReactTestUtils renderer doesn't exist anymore.
2019-09-17 14:33:32 -06:00
Matthew Hodgson acf474c402
Merge pull request #3450 from matrix-org/matthew/read-marker-timings
make the lifetimes of the RM configurable
2019-09-17 18:17:39 +01:00
Travis Ralston 3facb9be82
Merge pull request #3451 from matrix-org/travis/bump2
Point to develop dependencies and fixed react-gemini-scrollbar
2019-09-17 11:01:47 -06:00
Travis Ralston 9c474da831 Bump to master commit of react-gemini-scrollbar 2019-09-17 10:55:49 -06:00
Matthew Hodgson 90691ada3c normalise translations 2019-09-17 17:51:03 +01:00
Travis Ralston 11c7d02a2d Point to develop dependencies and fixed react-gemini-scrollbar
Fixes https://github.com/vector-im/riot-web/issues/10894

See https://github.com/matrix-org/react-gemini-scrollbar/pull/3
2019-09-17 10:44:29 -06:00
Matthew Hodgson b2f44237b8 dangling comma 2019-09-17 17:36:29 +01:00
Matthew Hodgson 832123524d make the lifetimes of the RM configurable 2019-09-17 17:34:30 +01:00
J. Ryan Stinnett b1618056c0
Merge pull request #3449 from matrix-org/jryans/picker-types-regression
Fix address type props to state conversion
2019-09-17 15:44:41 +01:00
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