Commit graph

12469 commits

Author SHA1 Message Date
Christopher Medlin
384320e29f Consistently order flairs based on room configuration. 2018-12-24 14:46:36 -08:00
Weblate
9d175f9a05 Merge remote-tracking branch 'origin/develop' into develop 2018-12-24 09:43:08 +00:00
Karol Kosek
09dc0f2a3a Translated using Weblate (Polish)
Currently translated at 92.0% (1304 of 1417 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-12-24 09:43:08 +00:00
Besnik Bleta
095f43c896 Translated using Weblate (Albanian)
Currently translated at 99.2% (1407 of 1417 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2018-12-24 09:43:06 +00:00
Richard van der Hoff
3dab1b817c
Merge pull request #2384 from matrix-org/rav/well_known_in_login_response
Handle well-known data in the login response
2018-12-24 10:43:01 +01:00
Travis Ralston
310f634a0d Ensure we install the master branch of the e2e tests as a default 2018-12-21 19:24:07 -07:00
Travis Ralston
df89d973a0 Fetch matching e2e-test branch 2018-12-21 18:48:27 -07:00
Travis Ralston
f5ff580e35 Add some logging for riot-web#7838
See https://github.com/vector-im/riot-web/issues/7838
2018-12-21 14:51:05 -07:00
Richard van der Hoff
9c781417ff Merge remote-tracking branch 'origin/develop' into rav/well_known_in_login_response 2018-12-21 16:52:02 +00:00
random
cb7ba63494 Translated using Weblate (Italian)
Currently translated at 100.0% (1417 of 1417 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-12-21 14:14:03 +00:00
Slavi Pantaleev
0ea8eec304 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1417 of 1417 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-12-21 11:43:03 +00:00
Richard van der Hoff
991104d156 Handle well-known data in the login response
... as per [MSC1730](https://github.com/matrix-org/matrix-doc/pull/1730).
2018-12-21 09:51:03 +00:00
Kévin C
5c1072e569 Translated using Weblate (French)
Currently translated at 100.0% (1417 of 1417 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-12-20 08:55:20 +00:00
Jeff Huang
8a45dea261 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1417 of 1417 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-12-20 03:41:57 +00:00
Szimszon
ce7485854e Translated using Weblate (Hungarian)
Currently translated at 100.0% (1417 of 1417 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-12-19 18:31:08 +00:00
Weblate
fab257798c Merge remote-tracking branch 'origin/develop' into develop 2018-12-19 18:11:21 +00:00
Travis Ralston
2e1e536d5c
Merge pull request #2347 from matrix-org/travis/custom-status
Custom status messages
2018-12-19 11:11:15 -07:00
Weblate
6db4e32f19 Merge remote-tracking branch 'origin/develop' into develop 2018-12-19 18:10:26 +00:00
J. Ryan Stinnett
fd94dc686f Handle errors when fetching commits for changelog
It's possible to get errors when fetching commits (for example, if the rate
limit is exceeded), so this will handle the error case and display it instead of
an infinite spinner.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 18:10:21 +00:00
Weblate
694093c775 Merge remote-tracking branch 'origin/develop' into develop 2018-12-19 17:46:44 +00:00
J. Ryan Stinnett
37256d2976 Use primary styling on download / clipboard key actions
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
J. Ryan Stinnett
24f0123ded Convert pass phrase entry to flexbox
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
J. Ryan Stinnett
a597ad10b0 Add a few more zxcvbn strings
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
J. Ryan Stinnett
9c4ff4048a Convert show recovery key to flexbox
This allows the buttons to fit on a single line and flows a bit better at low
widths.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
J. Ryan Stinnett
a22a9492a0 Remove duplicate CSS file for CreateKeyBackupDialog
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-19 17:46:37 +00:00
Travis Ralston
a1347add95 Merge branch 'develop' into travis/custom-status 2018-12-19 10:33:34 -07:00
Travis Ralston
45f05092ed Add a comment to describe why we're not using the property we should be 2018-12-19 10:21:43 -07:00
Jeff Huang
b9793af90c Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1411 of 1411 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-12-19 13:40:52 +00:00
Weblate
7c0cfa6f5f Merge remote-tracking branch 'origin/develop' into develop 2018-12-19 09:48:11 +00:00
Akarshan Biswas
73e20ebf9f Translated using Weblate (Hindi)
Currently translated at 36.8% (520 of 1411 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hi/
2018-12-19 09:48:10 +00:00
David Baker
1ca91370f3
Merge pull request #2372 from matrix-org/dbkr/electron_sandbox
React-sdk changes to support sandboxed electron
2018-12-19 09:48:05 +00:00
Kévin C
8c36e725c4 Translated using Weblate (French)
Currently translated at 100.0% (1411 of 1411 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-12-19 09:16:55 +00:00
Travis Ralston
04c9fff6ce Add a feature flag for custom status messages 2018-12-18 15:11:08 -07:00
Travis Ralston
d20a934642 Appease the linter 2018-12-18 11:04:16 -07:00
David Baker
3a8b9ab850 unused import 2018-12-18 17:57:23 +00:00
Travis Ralston
ef60a34180 Clean up and follow code style 2018-12-18 10:53:37 -07:00
David Baker
37b3644fd9 React-sdk changes to support sandboxed electron 2018-12-18 17:40:30 +00:00
Weblate
8c93a6f4a3 Merge remote-tracking branch 'origin/develop' into develop 2018-12-18 17:01:42 +00:00
Besnik Bleta
618ed725c8 Translated using Weblate (Albanian)
Currently translated at 99.2% (1401 of 1411 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2018-12-18 17:01:41 +00:00
J. Ryan Stinnett
b036e59021 Enable ESLint rule to require defined components in JSX
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-18 17:01:37 +00:00
Weblate
cc980014b7 Merge remote-tracking branch 'origin/develop' into develop 2018-12-18 14:57:52 +00:00
Travis Ralston
66f5d0612c
Merge pull request #2363 from matrix-org/travis/fix-group-view
Make sure to grab the InlineSpinner object
2018-12-18 07:57:46 -07:00
Szimszon
98afb9399f Translated using Weblate (Hungarian)
Currently translated at 100.0% (1411 of 1411 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-12-18 10:34:46 +00:00
Weblate
f00af760ec Merge remote-tracking branch 'origin/develop' into develop 2018-12-18 10:20:19 +00:00
J. Ryan Stinnett
acc2e98355 Add New Recovery Method dialog
Adds a New Recovery Method dialog which is shown when key backup fails because
of a version mismatch / version not found error.

The set up button in the dialog currently only marks a device as verified (via a
verification prompt) instead of the eventual restore and cross-sign flow, since
those pieces don't exist yet.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-18 10:20:12 +00:00
J. Ryan Stinnett
2b14f2af5c Clean up when new key backup version fails to backup
If creating a new key backup version succeeds but backing up to it fails, delete
the version to avoid surprises. In addition, this converts the creation of a new
key backup to async / await style.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-18 10:20:12 +00:00
Travis Ralston
c6da61f1de
Make sure to grab the InlineSpinner object 2018-12-17 18:47:33 -07:00
Weblate
650af8a30a Merge remote-tracking branch 'origin/develop' into develop 2018-12-18 01:24:38 +00:00
J. Ryan Stinnett
1c4621c98e Link to CONTRIBUTING from JS SDK
The JS SDK's CONTRIBUTING file is a bit simpler to read. The Synapse version previously used includes mentions of Python lint tools that don't apply here.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-12-18 01:24:33 +00:00
Weblate
96d218dcb3 Merge remote-tracking branch 'origin/develop' into develop 2018-12-18 00:43:44 +00:00