Commit graph

12261 commits

Author SHA1 Message Date
Travis Ralston
6707186edc Change how the default server name and HS URL interact
They are now independent of each other. If both are specified in the config, the user will see an error and be prevented from logging in. The expected behaviour is that when a default server name is given, we do a .well-known lookup to find the default homeserver (and block the UI while we do this to prevent it from using matrix.org while we go out and find more information). If the config specifies just a default homeserver URL however, we don't do anything special.
2018-12-07 15:36:49 -07:00
Travis Ralston
0a32570026 Merge branch 'develop' into travis/well-known-improvements 2018-12-07 15:08:19 -07:00
J. Ryan Stinnett
a92d2902c4 Add an in-room reminder to set up key recovery
This adds an in-room reminder above the message timeline to set up Secure
Message Recovery so that your keys will be backed up. If you try to ignore it,
an additional dialog is shown to confirm.

Fixes vector-im/riot-web#7783.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-07 14:13:02 -06:00
David Baker
d40225bf55
Merge pull request #2337 from jryans/rm-outdated-skin-info
Remove outdated info about custom skins
2018-12-07 18:08:38 +00:00
David Baker
8f217dc3a4
Merge pull request #2333 from matrix-org/travis/callbox-hidden
Show the IncomingCallBox if the call is for the RoomSubList
2018-12-07 18:00:53 +00:00
Travis Ralston
482e6b57da
Merge pull request #2331 from matrix-org/travis/mto-via
Don't consider ACL'd servers as permalink candidates
2018-12-07 10:59:50 -07:00
David Baker
d7319d7e4f
Merge pull request #2330 from matrix-org/travis/fix-pinned-rooms
Fix pinning of rooms without badges
2018-12-07 17:44:36 +00:00
David Baker
6d58296fa6
Merge pull request #2329 from matrix-org/travis/sort-i18n-2
Sort translations by file name
2018-12-07 17:43:57 +00:00
J. Ryan Stinnett
0b65a1ee1a Remove outdated info about custom skins
It has been marked outdated for several years. Since it appears on the repo home
page, it makes the project feel unmaintained.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-06 19:25:07 -06:00
Matthew Hodgson
245c839962
Merge pull request #2335 from jryans/react-style-guide
Update React guide in code style
2018-12-06 23:12:30 +00:00
J. Ryan Stinnett
757181c322 Update React guide in code style
This updates React guidance to prefer JS classes and adds additional info about
how to handle specific situations when using them.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-06 16:34:54 -06:00
Travis Ralston
ca1313099f Show the IncomingCallBox if the call is for the RoomSubList
Fixes https://github.com/vector-im/riot-web/issues/4369

Previously the RoomSubList would filter its list of rooms to verify that the incoming call belongs to it. This causes problems when the sub list is being told some rooms don't exist (ie: the list is filtered). It is trivial for the RoomList to instead track which RoomSubList (tag) it should be handing the call off to so we do that instead now. The RoomSubList trusts that the caller has already filtered it and will render the IncomingCallBox if it has an incoming call.
2018-12-06 11:45:58 -07:00
Travis Ralston
31b7a0ddcb
Merge pull request #2259 from matrix-org/t3chguy/account_deactivation_preferences
Remove temporary account_deactivation_preferences
2018-12-06 10:45:04 -07:00
Travis Ralston
45bc1f7dbd Appease the linter 2018-12-05 18:14:22 -07:00
Travis Ralston
f08a54ed1e Don't consider ACL'd servers as permalink candidates
and fix the bug where it was picking 4 servers instead of 3. This was due to `<=` instead of `<` in the `MAX_SERVER_CANDIDATES` loop. Added tests for all the things.

Fixes https://github.com/vector-im/riot-web/issues/7752
Fixes https://github.com/vector-im/riot-web/issues/7682
2018-12-05 18:00:09 -07:00
Travis Ralston
93c90896b5 Regenerate en_EN.json 2018-12-05 14:00:09 -07:00
Travis Ralston
79ad95c853 Merge remote-tracking branch 'origin/develop' into travis/sort-i18n-2 2018-12-05 13:58:18 -07:00
Travis Ralston
daa0ddd21d
Merge pull request #2306 from matrix-org/travis/cors-on-join
Suppress CORS errors in the 'failed to join room' dialog
2018-12-05 13:53:24 -07:00
Travis Ralston
216fc6412a Fix pinning of rooms without badges
Fixes https://github.com/vector-im/riot-web/issues/7723

This adds consideration for rooms that are "mentions only" (or "unread-muted" as internally referenced).
2018-12-05 13:52:27 -07:00
Travis Ralston
a2b825ba92 Sort translations by file name
This keeps the strings close together and roughly in the same area as the others, and makes it easier to maintain the translation file.
2018-12-05 11:52:10 -07:00
Travis Ralston
c06d42d560
Merge pull request #2317 from matrix-org/travis/invite-errors
Check if users exist before inviting them and communicate errors
2018-12-05 11:50:03 -07:00
Travis Ralston
c46bae59b2
Merge branch 'develop' into travis/cors-on-join 2018-12-05 11:30:19 -07:00
Travis Ralston
7e817f4aa9
Add a helpful comment 2018-12-05 11:29:53 -07:00
Travis Ralston
28f4752c5b Rename returned completion states to be something sensible 2018-12-05 11:27:48 -07:00
Travis Ralston
0f348a7c78 Merge branch 'develop' into travis/invite-errors 2018-12-05 11:25:45 -07:00
Richard van der Hoff
c553323d5a
Factor out common login code (#2307)
Removes the duplication between the various points where we send off a login
request and parse the response.
2018-12-05 17:39:38 +01:00
David Baker
a3382eb655
Merge pull request #2328 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2018-12-05 16:20:20 +00:00
Besnik Bleta
c8aa53cabd Translated using Weblate (Albanian)
Currently translated at 99.3% (1374 of 1383 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2018-12-05 15:58:22 +00:00
Szimszon
9f25c39a53 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1383 of 1383 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-12-05 12:53:53 +00:00
Kévin C
5764622eba Translated using Weblate (French)
Currently translated at 100.0% (1383 of 1383 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-12-05 10:58:06 +00:00
Weblate
28dc6f6da0 Merge remote-tracking branch 'origin/develop' into develop 2018-12-05 10:56:38 +00:00
Karol Kosek
817f78ecd5 Translated using Weblate (Polish)
Currently translated at 88.2% (1219 of 1382 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-12-05 10:56:38 +00:00
David Baker
dad8e6a261
Merge pull request #2326 from jryans/group-users-error
Allow group summary to load when /users fails
2018-12-05 10:56:32 +00:00
Kévin C
573cb8a380 Translated using Weblate (French)
Currently translated at 100.0% (1382 of 1382 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-12-05 10:40:19 +00:00
Travis Ralston
633be5061c Introduce a default_server_name for aesthetics and rework .well-known
Fixes https://github.com/vector-im/riot-web/issues/7724

The `default_server_name` from the config gets displayed in the "Login with my [server] matrix ID" dropdown when the default server is being used. At this point, we also discourage the use of the `default_hs_url` and `default_is_url` options because we do an implicit .well-known lookup to configure the client based on the `default_server_name`. If the URLs are still present in the config, we'll honour them and won't do a .well-known lookup when the URLs are mixed with the new server_name option. Users will be warned if the `default_server_name` does not match the `default_hs_url` if both are supplied. Users are additionally prevented from logging in, registering, and resetting their password if the implicit .well-known check fails - this is to prevent people from doing actions against the wrong homeserver.

This relies on https://github.com/matrix-org/matrix-js-sdk/pull/799 as we now do auto discovery in two places. Instead of bringing the .well-known out to its own utility class in the react-sdk, we might as well drag it out to the js-sdk.
2018-12-04 23:34:57 -07:00
Jeff Huang
7f4ee2b1ca Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1382 of 1382 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-12-05 03:54:42 +00:00
J. Ryan Stinnett
22ff76e6b7 Add error to UI when group member list fails to load
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-04 18:46:15 -06:00
J. Ryan Stinnett
5fc25fd6ba Only mark group as failed to load for summary
Currently, any error in the `GroupStore`s several requests can cause the whole
`GroupView` component to hide and be mark the group as failed to load.

Since it is known that group members may fail to load in some cases, let's only
show failed to load for the whole group when the summary fails.

This also strengthens the `GroupView` test by ensuring we wait for multiple
updates for checking results.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-04 18:32:16 -06:00
Szimszon
cf9fbe041a Translated using Weblate (Hungarian)
Currently translated at 100.0% (1382 of 1382 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-12-04 18:53:44 +00:00
Weblate
bfe8f3a440 Merge remote-tracking branch 'origin/develop' into develop 2018-12-04 16:49:55 +00:00
David Baker
f1869edfd5
Merge pull request #2324 from matrix-org/dbkr/text_if_skip_passphrase
Show correct text if passphrase is skipped
2018-12-04 16:49:50 +00:00
David Baker
c849a2389c Show correct text if passphrase is skipped
Also set 'downloaded' state in a couple more places
2018-12-04 16:38:32 +00:00
Besnik Bleta
6ab9ae7aa5 Translated using Weblate (Albanian)
Currently translated at 99.3% (1372 of 1381 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2018-12-04 15:32:55 +00:00
Szimszon
3f7a3b8cfb Translated using Weblate (Hungarian)
Currently translated at 100.0% (1381 of 1381 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-12-04 13:42:44 +00:00
Weblate
c5daf14869 Merge remote-tracking branch 'origin/develop' into develop 2018-12-04 11:50:48 +00:00
Besnik Bleta
98b2398923 Translated using Weblate (Albanian)
Currently translated at 99.3% (1346 of 1355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2018-12-04 11:50:46 +00:00
David Baker
5d94da07af
Merge pull request #2294 from matrix-org/dbkr/zxcvbn
Add password strength meter to backup creation UI
2018-12-04 11:50:42 +00:00
David Baker
5b2c2a0adf comment typo 2018-12-04 11:41:04 +00:00
Kévin C
c4ad15f919 Translated using Weblate (French)
Currently translated at 100.0% (1355 of 1355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-12-04 07:45:06 +00:00
Szimszon
8510fe721c Translated using Weblate (Hungarian)
Currently translated at 100.0% (1355 of 1355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-12-04 07:08:14 +00:00