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

12250 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
Jeff Huang
e131a76e80 Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2018-12-04 03:16:38 +00:00
Weblate
35ef2cde61 Merge remote-tracking branch 'origin/develop' into develop 2018-12-04 00:31:21 +00:00
Karol Kosek
dbc3e87e53 Translated using Weblate (Polish) 
Currently translated at 88.5% (1198 of 1353 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-12-04 00:31:21 +00:00
Akarshan Biswas
e25df6afd8 Translated using Weblate (Hindi) 
Currently translated at 26.3% (356 of 1353 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hi/
 2018-12-04 00:31:20 +00:00
Krombel
f7a8e144f2 Translated using Weblate (German) 
Currently translated at 98.3% (1330 of 1353 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-12-04 00:31:20 +00:00
Besnik Bleta
c163773248 Translated using Weblate (Albanian) 
Currently translated at 99.2% (1343 of 1353 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-12-04 00:31:19 +00:00
Travis Ralston
c0ef2f7df3
Merge pull request #1876 from Half-Shot/hs/upload-limits 
Check upload limits before trying to upload large files
 2018-12-03 17:31:14 -07:00
Osoitz
0834985ff4 Translated using Weblate (Basque) 
Currently translated at 100.0% (1353 of 1353 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-12-01 16:58:24 +00:00
Will Hunt
2b077b4f5d Merge remote-tracking branch 'upstream/develop' into hs/upload-limits 2018-12-01 16:24:43 +00:00
Travis Ralston
84b568a235 Appease the linter 2018-11-29 15:16:45 -07:00
Travis Ralston
987ad0b0db Check if users exist before inviting them and communicate errors 
Fixes https://github.com/vector-im/riot-web/issues/3283
Fixes https://github.com/vector-im/riot-web/issues/3968
Fixes https://github.com/vector-im/riot-web/issues/4308
Fixes https://github.com/vector-im/riot-web/issues/1597
Fixes https://github.com/vector-im/riot-web/issues/6790

This does 3 things:
* Makes the `MultiInviter` check for a user profile before attempting an invite. This is to prove the user exists.
* Use the `MultiInviter` everywhere to avoid duplicating the logic. Although a couple places only invite one user, it is still worthwhile.
* Communicate errors from the `MultiInviter` to the user in all cases. This is done through dialogs, where some existed previously but were not invoked.

Specifically to the 403 error not working: What was happening was the `MultiInviter` loop was setting the `fatal` flag, but that didn't resolve the promise it stored. This caused a promise to always be open, therefore never hitting a dialog.
 2018-11-29 15:05:53 -07:00