Travis Ralston
3541ef2889
Merge branch 'travis/user-lists-suggestions' into travis/user-lists-labs
2020-01-22 22:38:25 -07:00
Travis Ralston
e41f94bdb7
Try to populate user IDs even when the server's directory fails us
...
Fixes https://github.com/vector-im/riot-web/issues/11943
2020-01-22 22:33:50 -07:00
Travis Ralston
a196ecc891
Fix i18n
2020-01-22 21:17:40 -07:00
Travis Ralston
139b5663fe
Remove user lists feature flag, making it the default
...
Fixes https://github.com/vector-im/riot-web/issues/11201
2020-01-22 21:14:53 -07:00
Travis Ralston
054ebb9458
Fix scrollable area and padding in user lists dialog
2020-01-22 21:07:29 -07:00
Weblate
c86f0795bd
Merge branch 'origin/develop' into Weblate.
2020-01-23 01:06:48 +00:00
J. Ryan Stinnett
1fdd155dd2
Merge pull request #3904 from matrix-org/jryans/report-admin-external-links
...
Treat links as external in report content admin message
2020-01-23 01:06:42 +00:00
J. Ryan Stinnett
a504faa2f6
Treat links as external in report content admin message
...
This marks all the links in the report content admin message (in Markdown
format) as external so they open in a new tab.
2020-01-22 22:08:37 +00:00
Weblate
d2d5c446e7
Merge branch 'origin/develop' into Weblate.
2020-01-22 21:14:31 +00:00
Michael Telatynski
7a028af359
Merge pull request #3902 from matrix-org/t3chguy/free_the_svg
...
Be consistent about our settings svg, free the other one
2020-01-22 21:14:25 +00:00
Weblate
523e6c7509
Merge branch 'origin/develop' into Weblate.
2020-01-22 20:57:27 +00:00
catborise
78ed8019d4
Translated using Weblate (Turkish)
...
Currently translated at 72.6% (1482 of 2042 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-22 20:57:27 +00:00
Szimszon
cf5673be17
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2042 of 2042 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-22 20:57:24 +00:00
David Baker
a95cde106f
Merge pull request #3899 from matrix-org/dbkr/npm_prepare
...
Change prepublish script to prepare
2020-01-22 20:57:18 +00:00
David Baker
30b0663eb0
lint
2020-01-22 18:15:35 +00:00
David Baker
78654cc693
Updated visuals for cross-signing bootstrap
...
* Use Fields rather than plain inputs
* Update padding & alignment to match designs
* Add Skip buttons
* Update copy as per designs
Part of https://github.com/vector-im/riot-web/issues/11902
Based on https://github.com/matrix-org/matrix-react-sdk/pull/3897
2020-01-22 18:08:39 +00:00
Michael Telatynski
b7d1c17ad1
simple optimization to bail out of check on first failure
2020-01-22 16:56:27 +00:00
Michael Telatynski
9706114bb5
move E2E_STATE to E2EIcon to simplify imports
2020-01-22 16:54:31 +00:00
Michael Telatynski
33b5d42c06
Be consistent about our settings svg, free the other one
2020-01-22 15:34:17 +00:00
Damir Jelić
c3418df919
FilePanel: Remove whitespace before two function definitions.
2020-01-22 16:31:49 +01:00
Damir Jelić
c5e8753b05
FilePanel: Don't import the whole of the js-sdk.
2020-01-22 16:26:40 +01:00
Weblate
186def976f
Merge branch 'origin/develop' into Weblate.
2020-01-22 15:26:26 +00:00
David Baker
2e0977fb0c
Merge pull request #3901 from matrix-org/dbkr/kill_react_sdk_version
...
Remove the react-sdk version
2020-01-22 15:26:22 +00:00
Weblate
b4116d8abd
Merge branch 'origin/develop' into Weblate.
2020-01-22 15:26:06 +00:00
Michael Telatynski
cd412b1df4
Merge pull request #3900 from matrix-org/t3chguy/buildkite
...
BuildKite: Retry end-to-end tests automatically once if they fail
2020-01-22 15:26:01 +00:00
Damir Jelić
f917c2faea
FilePanel: Listen for live events and add them to an open FilePanel.
2020-01-22 16:21:11 +01:00
David Baker
7e52eb9f65
Unused import
2020-01-22 15:16:41 +00:00
David Baker
c04872dd9b
i18n
2020-01-22 15:12:38 +00:00
Damir Jelić
735ba4fd33
EventIndex: Correctly populate events on initial fill requests.
2020-01-22 16:11:54 +01:00
Michael Telatynski
d04ba40efe
fix syntax
2020-01-22 15:05:40 +00:00
David Baker
e3a28e3e44
Remove the react-sdk version
...
I'm not sure if there was ever a point where this did work and
we had 'dist' and 'gitHead' properties in our package.json but
I can't find any trace of them now and I'm sick of this just being
there syaing '<local>' all the time.
2020-01-22 15:05:25 +00:00
Michael Telatynski
088b1ea628
Retry end-to-end tests automatically once if they fail, flakey flake
2020-01-22 15:03:48 +00:00
Weblate
ebe0cc486c
Merge branch 'origin/develop' into Weblate.
2020-01-22 14:32:15 +00:00
Michael Telatynski
97edb824bc
Merge pull request #3893 from matrix-org/t3chguy/double_slash
...
Slash Command improvements around sending messages with leading slash
2020-01-22 14:32:09 +00:00
Weblate
b5d20cc0a2
Merge branch 'origin/develop' into Weblate.
2020-01-22 14:25:44 +00:00
J. Ryan Stinnett
33533646d3
Merge pull request #3898 from matrix-org/jryans/extra-report-content
...
Support admin configurable message when reporting content
2020-01-22 14:25:39 +00:00
Michael Telatynski
516dd25797
fix typo in fallback codepath
2020-01-22 14:24:10 +00:00
David Baker
2842e8dee8
Change prepublish script to prepare
...
prepublish is deprecated (prepare also runs for git checkouts, and
lib will need to be built in this case).
2020-01-22 14:15:17 +00:00
J. Ryan Stinnett
fbb65f068a
Support admin configurable message when reporting content
...
This adds support for an admin-configured message in config.json to be shown in
the report content dialog to allow linking to community rules, etc.
Fixes https://github.com/vector-im/riot-web/issues/11992
2020-01-22 14:07:18 +00:00
Michael Telatynski
832da062cc
Improve trailing spurious breaks + tests
2020-01-22 13:37:27 +00:00
Michael Telatynski
e1e53f567f
add more tests
2020-01-22 11:56:27 +00:00
David Baker
e98269822c
Add icon to bootstrap dialogs
2020-01-22 11:44:47 +00:00
Weblate
433d13277b
Merge branch 'origin/develop' into Weblate.
2020-01-22 11:44:22 +00:00
random
5571164fe0
Translated using Weblate (Italian)
...
Currently translated at 100.0% (2039 of 2039 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-01-22 11:44:21 +00:00
Zoe
684974372d
Merge pull request #3896 from matrix-org/zip/11986-only-warn-unverified
...
Don't warn on unverified users; ensured behavior stays the same with flags off
2020-01-22 11:44:14 +00:00
Weblate
e7a54ac3ea
Merge branch 'origin/develop' into Weblate.
2020-01-22 11:24:31 +00:00
Szimszon
e923fdb149
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2039 of 2039 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-22 11:24:31 +00:00
Kévin C
d92ddebe5a
Translated using Weblate (French)
...
Currently translated at 100.0% (2039 of 2039 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-22 11:24:31 +00:00
Jeff Huang
78f7622fc5
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2039 of 2039 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-01-22 11:24:31 +00:00
Michael Telatynski
2a331c0a2b
Merge pull request #3895 from matrix-org/t3chguy/roving
...
Fix roving room list for resizer and ff tabstop a11y
2020-01-22 11:24:23 +00:00