OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
17,873 Commits
211 Branches
549 Tags
658 MiB
Commit Graph

17873 Commits (d1fb31a6dc8ed7ccacf18841bad758b7182404a2)

Author SHA1 Message Date
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 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 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
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
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