d5c96b86d4
fix test
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-19 10:31:34 +01:00
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
f8b1b36051
Fix copy-paste issue
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-19 09:48:35 +01:00
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
8769cfb88e
Merge branch 'origin/develop' into Weblate.
2019-09-19 08:27:17 +00:00
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
5ecc40d96b
Merge branch 'origin/develop' into Weblate.
2019-09-19 08:26:56 +00:00
7bbe24299d
Translated using Weblate (Japanese)
...
Currently translated at 58.7% (1056 of 1800 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2019-09-19 08:26:56 +00:00
9392cc7dde
Translated using Weblate (Bulgarian)
...
Currently translated at 100.0% (1800 of 1800 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2019-09-19 08:26:55 +00:00
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
2a3c8d350d
i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 18:02:45 +01:00
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
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
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
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
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
fd218cb8ba
Merge branch 'origin/develop' into Weblate.
2019-09-18 12:00:53 +00:00
020f15ca6f
Merge pull request #3456 from matrix-org/t3chguy/delint
...
Some delinting
2019-09-18 13:00:49 +01:00
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
85b85665c3
Merge branch 'origin/develop' into Weblate.
2019-09-18 08:57:25 +00:00
a556fcbb71
Translated using Weblate (Korean)
...
Currently translated at 100.0% (1800 of 1800 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2019-09-18 08:57:24 +00:00
245b8f7ac5
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1800 of 1800 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-09-18 08:57:24 +00:00
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
e502558f7d
Delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 09:27:43 +01:00
54ea85f235
regenerate .eslintignore.errorfiles
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-18 09:12:23 +01:00
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
5d7b51dd24
Merge branch 'origin/develop' into Weblate.
2019-09-17 22:00:52 +00:00
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
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
8d3b22cece
Merge branch 'origin/develop' into Weblate.
2019-09-17 20:47:50 +00:00
8899f612c3
Translated using Weblate (French)
...
Currently translated at 100.0% (1800 of 1800 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-09-17 20:47:50 +00:00
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
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
99b8193ce7
Use the new ShallowRenderer over ReactTestUtils
...
Mostly because the ReactTestUtils renderer doesn't exist anymore.
2019-09-17 14:33:32 -06:00
202ae1b715
Merge branch 'origin/develop' into Weblate.
2019-09-17 17:17:43 +00:00
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
2deeb9f8e7
Merge branch 'origin/develop' into Weblate.
2019-09-17 17:01:51 +00:00
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
9c474da831
Bump to master commit of react-gemini-scrollbar
2019-09-17 10:55:49 -06:00
90691ada3c
normalise translations
2019-09-17 17:51:03 +01:00
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
b2f44237b8
dangling comma
2019-09-17 17:36:29 +01:00
832123524d
make the lifetimes of the RM configurable
2019-09-17 17:34:30 +01:00
c060e58ea2
Merge branch 'origin/develop' into Weblate.
2019-09-17 14:44:47 +00:00
26b646613d
Translated using Weblate (French)
...
Currently translated at 99.9% (1797 of 1798 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-09-17 14:44:46 +00:00
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
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
a2c60312ae
Merge branch 'origin/develop' into Weblate.
2019-09-17 09:56:51 +00:00
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
dd0ffa8e72
Merge branch 'master' into develop
2019-09-16 17:49:46 +01:00
Michael Telatynski