PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
18280 commits 1 branch 0 tags 338 MiB
Commit graph

18280 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
076df930e3 Merge branch 'origin/develop' into Weblate. 2019-09-19 15:01:39 +00: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
Weblate
6fa6e0abaf Merge branch 'origin/develop' into Weblate. 2019-09-19 14:59:54 +00: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
Weblate
8769cfb88e Merge branch 'origin/develop' into Weblate. 2019-09-19 08:27:17 +00: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
Weblate
5ecc40d96b Merge branch 'origin/develop' into Weblate. 2019-09-19 08:26:56 +00:00
shuji narazaki
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
Slavi Pantaleev
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
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
Weblate
fd218cb8ba Merge branch 'origin/develop' into Weblate. 2019-09-18 12:00:53 +00: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
Weblate
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
Szimszon
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
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
Weblate
5d7b51dd24 Merge branch 'origin/develop' into Weblate. 2019-09-17 22:00:52 +00: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
Weblate
8d3b22cece Merge branch 'origin/develop' into Weblate. 2019-09-17 20:47:50 +00:00
Kévin C
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
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
Weblate
202ae1b715 Merge branch 'origin/develop' into Weblate. 2019-09-17 17:17:43 +00: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
Weblate
2deeb9f8e7 Merge branch 'origin/develop' into Weblate. 2019-09-17 17:01:51 +00: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
Weblate
c060e58ea2 Merge branch 'origin/develop' into Weblate. 2019-09-17 14:44:47 +00:00
Valere
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