Commit graph

4811 commits

Author SHA1 Message Date
David Baker
8f3eb89f8b Fix potential race in setting client listeners 2017-06-23 10:48:21 +01:00
David Baker
75ef80ecd4 Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-06-23 09:51:24 +01:00
Matthew Hodgson
ae053e88c7 fix broken vars 2017-06-22 21:59:33 +01:00
Weblate
4b5deaf17f Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
Conflicts:
	src/i18n/strings/fr.json
2017-06-22 20:39:48 +00:00
Walter
cc89d8318e Translated using Weblate (Ukrainian)
Currently translated at 18.3% (168 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-06-22 20:22:03 +00:00
Elia
7bf10760e7 Translated using Weblate (Turkish)
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2017-06-22 20:22:03 +00:00
Pitchaya Boonsarngsuk
e5ecd168d7 Translated using Weblate (Thai)
Currently translated at 64.6% (592 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/th/
2017-06-22 20:22:03 +00:00
Walter
eb76b1ae24 Translated using Weblate (Russian)
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-22 20:22:03 +00:00
IMIN
50a5bc6b4f Translated using Weblate (Korean)
Currently translated at 91.9% (841 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-06-22 20:22:02 +00:00
Szimszon
f079e238fc Translated using Weblate (Hungarian)
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-22 20:22:02 +00:00
zottel
81dadc9e05 Translated using Weblate (German)
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-22 20:22:02 +00:00
Elia
cc53c6776d Translated using Weblate (Turkish)
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2017-06-22 19:53:09 +00:00
David Baker
73471138f8 Merge pull request #1140 from turt2live/travis/more-12h
Use 12h timestamps when enabled in RR
2017-06-22 17:44:52 +01:00
David Baker
ac3e039e2a Merge pull request #1019 from matrix-org/t3chguy/updating_stuff
manual check for updates
2017-06-22 17:36:55 +01:00
turt2live
a22f14e910 Use 12h timestamps when enabled in RR
Fixes vector-im/riot-web#4393 
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-06-22 08:54:34 -06:00
David Baker
042152aa66 Merge pull request #1138 from matrix-org/rav/fix_braindead_firefox
Fix load failure in firefox when indexedDB is disabled
2017-06-22 15:22:31 +01:00
David Baker
c101459e63 Merge pull request #1139 from matrix-org/rav/fix_incorrect_log
Fix an incorrect console error
2017-06-22 15:21:09 +01:00
Richard van der Hoff
fcd945afc2 Fix an incorrect console error
... this error is thrown when registering as guest or loading from
localstorage, not when using tokenparams.
2017-06-22 15:08:30 +01:00
Richard van der Hoff
b124ac21fd Fix load failure in firefox when indexedDB is disabled 2017-06-22 15:07:54 +01:00
David Baker
3da9aaff9a Merge pull request #1134 from matrix-org/rav/remove_dead_olm_error
Remove dead special-casing for OLM.BAD_LEGACY_ACCOUNT_PICKLE
2017-06-22 14:24:27 +01:00
David Baker
5d159c995d Merge branch 'master' into develop 2017-06-22 11:58:05 +01:00
daniel tygel
fcc42c7b60 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-22 09:57:14 +00:00
Richard van der Hoff
efc5cf2889 Remove dead special-casing for OLM.BAD_LEGACY_ACCOUNT_PICKLE
We used to show a special error message when we got this error; however
https://github.com/matrix-org/matrix-react-sdk/pull/783 made that not work.

You'll only hit it if you're upgrading from some ancient version of Olm, and
I'm quite happy for us to fall back to the generic 'couldn't restore: vape your
storage?' flow in that case. (In any case that's preferable to dumping you at
the login prompt with no warning that we've just vaped your storage).
2017-06-21 21:49:41 +01:00
Richard van der Hoff
e9ab667d29 Use the web worker when clearing js-sdk stores
It turns out that Firefox doesn't let you use indexeddb from private tabs,
*unless* you are *also* in a webworker. We need to either consistently use it
or not use it - so let's use it.
2017-06-21 17:43:34 +01:00
Luke Barnard
dcd0103acb Fix ability to invite users with caps in their user IDs
By lowercasing only when testing against local user IDs/display names. The user_directory shouldn't care. And when we make the placeholder "We didn't get any results, but here's the user with the exact mxid you typed in", use the original query.
2017-06-21 15:08:03 +01:00
David Baker
2db24f373c Fix another race with first-sync
Set the first sync variables in onWillStartClient, as they race if
set on logged in (similar fix to https://github.com/matrix-org/matrix-react-sdk/pull/1124)
2017-06-21 15:07:43 +01:00
David Baker
a62f6d1094 Make the indexeddb worker script work again
Removed in 939f6d0798
2017-06-21 15:07:25 +01:00
David Baker
72e73c05ac Merge pull request #1127 from matrix-org/t3chguy/reset_favicon_on_logout
reset page subtitle and favicon on_logged_out
2017-06-21 14:58:26 +01:00
David Baker
a7ca8ae4fb Merge pull request #1132 from matrix-org/dbkr/put_indexeddb_worker_back
Make the indexeddb worker script work again
2017-06-21 14:42:01 +01:00
David Baker
e193fa5be5 Make the indexeddb worker script work again
Removed in 939f6d0798
2017-06-21 14:04:43 +01:00
David Baker
0fffd367c0 Added translation using Weblate (Italian) 2017-06-21 12:55:00 +00:00
David Baker
a0de81a008 Added translation using Weblate (Belarusian) 2017-06-21 12:54:31 +00:00
David Baker
71b65078fc Added translation using Weblate (Norwegian Bokmål) 2017-06-21 12:50:18 +00:00
David Baker
7aabc7e352 Added translation using Weblate (Polish) 2017-06-21 12:48:48 +00:00
David Baker
57f97a58af Added translation using Weblate (Esperanto) 2017-06-21 12:48:18 +00:00
David Baker
e43eacb1e5 Added translation using Weblate (Turkish) 2017-06-21 12:43:37 +00:00
David Baker
9ef9d09d44 Fix another race with first-sync
Set the first sync variables in onWillStartClient, as they race if
set on logged in (similar fix to https://github.com/matrix-org/matrix-react-sdk/pull/1124)
2017-06-21 11:27:18 +01:00
Tom Tryfonidis
7c3742682e Translated using Weblate (Greek)
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-20 20:21:37 +00:00
Michael Telatynski
a5fffe4afa fix ambiguity 2017-06-20 20:15:25 +01:00
Michael Telatynski
36d10e7bb6 move favicon reset stuff here where its more general
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-20 18:47:35 +01:00
Michael Telatynski
a2a26a9ac9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout 2017-06-20 18:43:50 +01:00
Matthew Hodgson
d441ba1fd0 Merge pull request #1129 from matrix-org/luke/fix-logout
Don't allow UserSettings to render if !MatrixClientPeg.get()
2017-06-20 18:43:33 +01:00
Michael Telatynski
7f6a252bcb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout 2017-06-20 18:39:59 +01:00
Szimszon
0c43a46198 Translated using Weblate (Hungarian)
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-20 17:08:42 +00:00
Richard Lewis
2cb2c44bd8 Remove unused logging 2017-06-20 17:57:48 +01:00
Richard Lewis
68473e118f Ensure that Scalar Messaging is started and stopped on component mount / unmount 2017-06-20 17:56:45 +01:00
Richard van der Hoff
1cd152e5f7 Merge pull request #1130 from matrix-org/rav/log_fixes
Various logging cleanups
2017-06-20 17:55:07 +01:00
Walter
4aea5908c5 Translated using Weblate (Russian)
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-20 16:43:49 +00:00
Richard van der Hoff
cd73139af5 Various logging cleanups
* don't just log errors without any context as to where they came from or what
   they mean
 * avoid the use of '%s' and multi-argument console.log because it looks awful
   under karma.
2017-06-20 17:38:02 +01:00
Krombel
4fbe688f53 Translated using Weblate (German)
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-20 16:22:05 +00:00
Luke Barnard
3320df4cdd Don't allow UserSettings to render if !MatrixClientPeg.get()
Now that it has state that updates following the nulling of the MCP (userHasGeneratedPassword) we need to stop it from rendering if the MCP is null.

Fixes https://github.com/vector-im/riot-web/issues/4319
2017-06-20 17:13:06 +01:00
Michael Telatynski
b712a15a14 move in case it is racey ---- somehow?
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-20 16:15:42 +01:00
Luke Barnard
2c2091438e Fix ability to invite users with caps in their user IDs
By lowercasing only when testing against local user IDs/display names. The user_directory shouldn't care. And when we make the placeholder "We didn't get any results, but here's the user with the exact mxid you typed in", use the original query.
2017-06-20 15:46:54 +01:00
Michael Telatynski
04aed416d2 Merge branches 'develop' and 't3chguy/reset_favicon_on_logout' of github.com:matrix-org/matrix-react-sdk into t3chguy/reset_favicon_on_logout
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/MatrixChat.js
2017-06-20 15:37:05 +01:00
Michael Telatynski
5460b0f5b2 reset page subtitle on_logged_out
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-20 15:31:12 +01:00
Weblate
029a882928 Merge remote-tracking branch 'origin/develop' into develop 2017-06-20 14:25:31 +00:00
Szimszon
1b8e5f8a05 Translated using Weblate (Hungarian)
Currently translated at 77.7% (705 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-20 14:25:31 +00:00
Brendan Abolivier
5efee2d1bf Translated using Weblate (French)
Currently translated at 100.0% (907 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-20 14:25:31 +00:00
Nathan van Beelen
8a0000675a Translated using Weblate (Dutch)
Currently translated at 60.5% (549 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-06-20 14:25:30 +00:00
Luke Barnard
c337485d90 Redesign the warning to be red text, move below "Sign out" 2017-06-20 15:01:53 +01:00
David Baker
a2dc17256a Merge remote-tracking branch 'origin/develop' into t3chguy/updating_stuff 2017-06-20 13:44:27 +01:00
Luke Barnard
4f9c1fe199 Merge branch 'develop' into luke/feature-user-settings-password-warning 2017-06-20 13:40:34 +01:00
Luke Barnard
5b6daba182 Add en_EN translations 2017-06-20 13:33:18 +01:00
Luke Barnard
f15292becf Merge branch 'develop' into luke/fix-email-cancel-button-text 2017-06-20 13:30:34 +01:00
Richard van der Hoff
0c431887b0 Merge pull request #996 from matrix-org/rav/handle_received_room_key_requests
Pop up a dialog when we get a room key request
2017-06-20 13:20:58 +01:00
David Baker
61c5384855 Fix another infinite spin on register
Don't set ready on logging_in, set it before we start the client,
as commented
2017-06-20 12:53:44 +01:00
David Baker
e15aedfeb2 Fix another infinite spin on register
Don't set ready on logging_in, set it before we start the client,
as commented
2017-06-20 12:03:37 +01:00
Luke Barnard
e16d1b3cfb Implement password nag warning in user settings account section
"To return to your account in future you need to set a password" in the account section when a user has not yet set a password (is a PWLU).
2017-06-20 11:22:07 +01:00
Richard Lewis
a449588c1c Replace add app dialog with scalar interface 2017-06-20 10:54:41 +01:00
David Baker
0e71918ba1 Merge pull request #1119 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-20 10:26:14 +01:00
IMIN
dcc9443918 Translated using Weblate (Korean)
Currently translated at 73.9% (671 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-06-20 09:00:03 +00:00
Nathan van Beelen
97e28a12c2 Translated using Weblate (Dutch)
Currently translated at 57.4% (521 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-06-20 09:00:03 +00:00
IMIN
42b26bd4e4 Translated using Weblate (Korean)
Currently translated at 73.6% (668 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-06-20 08:54:29 +00:00
Szimszon
59f6ab8c66 Translated using Weblate (Hungarian)
Currently translated at 74.8% (679 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-20 08:54:29 +00:00
Bamstam
499d3b9438 Translated using Weblate (German)
Currently translated at 100.0% (907 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-20 08:54:29 +00:00
Nathan van Beelen
fdae1b4fef Translated using Weblate (Dutch)
Currently translated at 56.3% (511 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-06-20 08:54:29 +00:00
David Baker
692b03f2e7 Internationalise the drop targets
Unsure how these had got missed (and yet still had the translation
strings in the json)
2017-06-20 09:53:51 +01:00
daniel tygel
17899dd3bf typo 2017-06-20 09:52:16 +01:00
daniel tygel
7b82385084 add two strings to translation 2017-06-20 09:52:09 +01:00
daniel tygel
09b91f4af9 add two strings to translation 2017-06-20 09:52:04 +01:00
Richard van der Hoff
a0534e7477 Merge branch 'develop' into rav/handle_received_room_key_requests 2017-06-20 00:25:14 +01:00
Tom Tryfonidis
65474bfd4c Translated using Weblate (Greek)
Currently translated at 100.0% (907 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-19 21:43:14 +00:00
GrigRUSS
c5bc4d4542 Translated using Weblate (Russian)
Currently translated at 100.0% (907 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-19 17:37:14 +00:00
Krombel
d29bc8546d Translated using Weblate (German)
Currently translated at 100.0% (907 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-19 17:20:33 +00:00
David Baker
ec4d1de42f Translated using Weblate (Russian)
Currently translated at 99.7% (905 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-19 17:17:01 +00:00
Weblate
640b65eb6c Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 17:14:45 +00:00
David Baker
d5a7ef525f Translated using Weblate (Russian)
Currently translated at 99.7% (905 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-19 17:14:41 +00:00
Szimszon
f437784807 Translated using Weblate (Hungarian)
Currently translated at 62.0% (563 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-19 17:14:41 +00:00
Szimszon
5e44c72952 Translated using Weblate (Hungarian)
Currently translated at 61.5% (558 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-19 17:04:10 +00:00
Brendan Abolivier
6bb22b618b Translated using Weblate (French)
Currently translated at 100.0% (907 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-19 17:04:10 +00:00
Brendan Abolivier
09de50a80a Translated using Weblate (French)
Currently translated at 100.0% (907 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-19 16:59:53 +00:00
Weblate
1ba8acc095 Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 16:53:10 +00:00
GrigRUSS
321236568b Translated using Weblate (Russian)
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-19 16:53:10 +00:00
IMIN
b4e19d533c Translated using Weblate (Korean)
Currently translated at 73.0% (662 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-06-19 16:53:10 +00:00
Szimszon
fedbe00f45 Translated using Weblate (Hungarian)
Currently translated at 60.2% (546 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-19 16:53:10 +00:00
Bamstam
5151d24731 Translated using Weblate (German)
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-19 16:53:10 +00:00
David Baker
b1ca83bb9d Internationalise the drop targets
Unsure how these had got missed (and yet still had the translation
strings in the json)
2017-06-19 17:49:22 +01:00
David Baker
fb0767eb5d Merge pull request #1121 from coletivoEITA/develop
add two strings to translation
2017-06-19 17:25:21 +01:00
daniel tygel
13c12811e7 typo 2017-06-19 13:22:23 -03:00
daniel tygel
aebe4fb88f add two strings to translation 2017-06-19 13:21:23 -03:00
daniel tygel
c418076c32 add two strings to translation 2017-06-19 13:20:16 -03:00
David Baker
26cb1404c2 Remove unnecessary if 2017-06-19 16:56:27 +01:00
David Baker
a8165d1707 Fix infinite spinner on email registration
Remove setTimeout on dialog display as it's no longer necessary
and causes races.
2017-06-19 16:56:20 +01:00
David Baker
92cb394bac Merge pull request #1120 from matrix-org/dbkr/infinite_spinner_email_reg
Fix infinite spinner on email registration
2017-06-19 16:53:01 +01:00
David Baker
640b7a74a2 Remove unnecessary if 2017-06-19 16:45:40 +01:00
David Baker
02da6fdbd5 Fix infinite spinner on email registration
Remove setTimeout on dialog display as it's no longer necessary
and causes races.
2017-06-19 16:40:33 +01:00
Richard Lewis
59f6448b3e Merge branch 'kegan/postmessage-widgets' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps 2017-06-19 16:00:12 +01:00
Weblate
49d6575c91 Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 14:41:19 +00:00
Nathan van Beelen
27652e7e6e Translated using Weblate (Dutch)
Currently translated at 55.8% (506 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-06-19 14:41:19 +00:00
Richard van der Hoff
3a6dabdc08 Merge pull request #1116 from matrix-org/rav/no_more_guestcreds
Get rid of guestCreds
2017-06-19 14:34:12 +01:00
russian
b7fb2dee83 Translated using Weblate (Russian)
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-19 13:24:01 +00:00
daniel tygel
05810fa83b Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-19 13:22:07 +00:00
Luke Barnard
57f01b83be Revert "Save scroll state immediately before updating"
This reverts commit 4124a8dcff from PR https://github.com/matrix-org/matrix-react-sdk/pull/1076
2017-06-19 13:19:17 +01:00
Luke Barnard
83d5822c85 Show a "Skip" button instead of "Cancel" in SetEmailDialog
Fixes https://github.com/vector-im/riot-web/issues/4309
2017-06-19 13:17:12 +01:00
Richard Lewis
80c5a58fc3 Fix custom widget form styling 2017-06-19 12:06:16 +01:00
Richard Lewis
f676b58c00 Add google ardboard logo 2017-06-19 11:47:03 +01:00
Richard Lewis
9d89bfe264 Fix jitsi logo references 2017-06-19 11:36:15 +01:00
David Baker
11e0364505 Merge pull request #1117 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-19 11:28:23 +01:00
Weblate
a2764a0c1f Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 10:25:04 +00:00
Sebastián Magrí
bfd5f1b09a Translated using Weblate (Spanish)
Currently translated at 68.9% (625 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2017-06-19 10:24:54 +00:00
Bamstam
1d958dd120 Translated using Weblate (German)
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-19 10:24:54 +00:00
Nathan van Beelen
c1ce12ef96 Translated using Weblate (Dutch)
Currently translated at 55.0% (499 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-06-19 10:24:54 +00:00
Matthew Hodgson
869329e78a fix broken i18n 2017-06-19 11:23:52 +01:00
Matthew Hodgson
217f44900c fix broken vars 2017-06-19 11:23:43 +01:00
Matthew Hodgson
8f19400cc0 Merge pull request #1114 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-19 11:23:33 +01:00
Luke Barnard
513a585a3e Merge pull request #1076 from ollieh/issues/reduce-save-restore-window
Reduce save-restore window in ScrollPanel to reduce scrolling jumps
2017-06-19 11:23:10 +01:00
Luke Barnard
467c195d4f Don't peek when creating a room
This causes a race between receiving the room when starting to peek and receiving the room from joining it - https://github.com/vector-im/riot-web/issues/4330, https://github.com/matrix-org/riot-web-rageshakes/issues/196
2017-06-19 11:22:55 +01:00
Michael Telatynski
27f38aeba7 make forward_message be friendly with the RVS stuffs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-19 11:15:17 +01:00
Richard van der Hoff
a5d65ee391 Get rid of guestCreds
-- we just keep the MatrixClient running in the background, so it is easy to
resume.
2017-06-19 10:36:25 +01:00
Richard van der Hoff
3b518f2c59 Fix race in registration for pusher config
we no longer immediately create the MatrixClient, so don't assume we do.
2017-06-19 10:22:18 +01:00
Richard van der Hoff
115a3deed9 Merge pull request #1102 from matrix-org/rav/refactor_matrixclient_states
Refactor the state machine in MatrixChat
2017-06-19 08:53:50 +01:00
Richard van der Hoff
cb29d92912 Merge pull request #1110 from matrix-org/rav/fix_token_redirect
Avoid transitioning to loggedIn state during token login
2017-06-19 08:52:22 +01:00
Matthew Hodgson
032650e095 Merge branch 'develop' into t3chguy/fix_forwarding 2017-06-19 01:53:35 +01:00
Matthew Hodgson
fac98d16dd fix broken i18n 2017-06-19 00:11:34 +01:00
Matthew Hodgson
022161b78f fix broken vars 2017-06-19 00:08:29 +01:00
Weblate
5d370e47d3 Merge remote-tracking branch 'origin/develop' into develop 2017-06-18 22:43:50 +00:00
strixaluco
194ea28956 Translated using Weblate (Ukrainian)
Currently translated at 17.3% (157 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-06-18 22:43:49 +00:00
Sebastián Magrí
e957e77d7e Translated using Weblate (Spanish)
Currently translated at 67.9% (616 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2017-06-18 22:43:49 +00:00
Walter
4edca7a029 Translated using Weblate (Russian)
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-18 22:43:49 +00:00
IMIN
48c336a8bd Translated using Weblate (Korean)
Currently translated at 72.0% (653 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-06-18 22:43:48 +00:00
Szimszon
8a76f09250 Translated using Weblate (Hungarian)
Currently translated at 56.1% (509 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-18 22:43:48 +00:00
PurgingPanda
123d742a60 Translated using Weblate (Dutch)
Currently translated at 39.7% (360 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-06-18 22:43:48 +00:00
zwindl
d05d9ab38f Translated using Weblate (Chinese (Simplified))
Currently translated at 39.1% (355 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2017-06-18 22:43:48 +00:00
Carlos A. Carnero Delgado
40fa5ddb17 Translated using Weblate (Spanish)
Currently translated at 67.6% (613 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2017-06-18 22:15:25 +00:00
Gary
75b330c208 Translated using Weblate (Dutch)
Currently translated at 36.3% (329 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-06-18 15:02:00 +00:00
Eric Newport
1bc9858200 Translated using Weblate (English (United States))
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2017-06-18 06:29:38 +00:00
David Pérez-Suárez
e0e18d25ea Translated using Weblate (Spanish)
Currently translated at 67.6% (613 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2017-06-18 00:58:28 +00:00
Enrique
18971458df Translated using Weblate (Spanish)
Currently translated at 67.5% (612 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2017-06-17 23:37:54 +00:00
Luke Barnard
ba95d7a16c Merge pull request #1113 from matrix-org/luke/fix-no-peek-on-create
Don't peek when creating a room
2017-06-16 18:35:20 +01:00
Luke Barnard
be58e1095e Don't peek when creating a room
This causes a race between receiving the room when starting to peek and receiving the room from joining it - https://github.com/vector-im/riot-web/issues/4330, https://github.com/matrix-org/riot-web-rageshakes/issues/196
2017-06-16 18:24:07 +01:00
Michael Telatynski
7b4cd31124 make forward_message be friendly with the RVS stuffs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-16 16:12:52 +01:00
David Baker
8e8af5eb5c Merge branch 'dbkr/remove_collapse_rhs' into erikj/group_server 2017-06-16 15:59:18 +01:00
David Baker
aa7ddfe86e Remove unused collapse_rhs
Remove all the places we pass collapse_rhs through to places it's
never used. Remove the commented RHS collapse button from
SimpleRoomHeader.
2017-06-16 15:47:40 +01:00
Richard van der Hoff
db3d9c0573 Make Lifecycle.loadSession return an explicit result
- rather than inferring it from the fact it didn't call logging_in.
2017-06-16 15:23:09 +01:00
Richard van der Hoff
5f689b7929 Merge branch 'rav/fix_token_redirect' into rav/refactor_matrixclient_states_tmp 2017-06-16 15:20:47 +01:00
Richard van der Hoff
eb1fc9ae2d Avoid transitioning to loggedIn state during token login
Fixes riot-web#4334

When we do a token login, don't carry on with the normal app startup
(transitioning to the loggedIn state etc) - instead tell the app about the
successful login and wait for it to redirect.

Replace onLoadCompleted with onTokenLoginCompleted so that the app can see what
it's supposed to be doing.
2017-06-16 15:05:53 +01:00
David Baker
236cf1efb2 Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-06-16 14:19:54 +01:00
David Baker
6a2c2d64fa Merge pull request #1109 from matrix-org/rav/fix_cas_login
Avoid getting stuck in a loop in CAS login
2017-06-16 13:21:52 +01:00
Richard van der Hoff
1f719b3f7d Avoid getting stuck in a loop in CAS login
498ea53 made it so that the #/login URL fragment was prioritised over the token
params in the query string; unfortunately that also means that CAS login gets
stuck in a loop where you always get redirected back to the login view.

Prioritising the URL fragment over the token params may or may not be the
correct thing to, but I also think it's incorrect that we ask the CAS server to
redirect us back to #/login. Accordingly, the easiest fix here is just to clear
the URL fragment before redirecting to CAS.
2017-06-16 13:06:28 +01:00
Weblate
d2d47bd8a2 Merge remote-tracking branch 'origin/develop' into develop 2017-06-16 11:51:35 +00:00
IMIN
af7a82cdae Translated using Weblate (Korean)
Currently translated at 64.2% (582 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-06-16 11:51:31 +00:00
Richard van der Hoff
3884c5ccf0 Log an error on unknown state instead of throwing 2017-06-16 11:51:12 +01:00
Richard van der Hoff
5e5639b730 Fix half-written comment 2017-06-16 11:50:53 +01:00
Luke Barnard
82b2da7833 Correctly inspect state when rejecting invite
So that we view_next_room if we're looking at the room we're rejecting
2017-06-16 11:27:47 +01:00
David Baker
64b555dfe3 Merge pull request #1107 from matrix-org/luke/fix-use-room-alias-in-preview
Make sure to pass the roomAlias to the preview header if we have it
2017-06-16 11:21:03 +01:00
Luke Barnard
807f01b57e Make sure to pass the roomAlias to the preview header if we have it 2017-06-16 11:10:55 +01:00
Weblate
34e40c36bd Merge remote-tracking branch 'origin/develop' into develop 2017-06-16 09:42:20 +00:00
strixaluco
cb14b28eb1 Translated using Weblate (Ukrainian)
Currently translated at 16.8% (153 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-06-16 09:42:16 +00:00
Max Sandholm
6be3aefe05 Translated using Weblate (Swedish)
Currently translated at 43.8% (397 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2017-06-16 09:42:16 +00:00
Enrique
512c059f4e Translated using Weblate (Spanish)
Currently translated at 52.6% (477 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2017-06-16 09:42:15 +00:00
IMIN
c57ff5933d Translated using Weblate (Korean)
Currently translated at 55.5% (503 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-06-16 09:42:15 +00:00
Bamstam
a0be1706a9 Translated using Weblate (German)
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-16 09:42:15 +00:00
David Baker
2a01e638b7 Make sure captcha disappears when container does
Should fix https://github.com/vector-im/riot-web/issues/4095
2017-06-16 10:25:51 +01:00
David Baker
af6392d7ca Fix URL previews
and also things like the unsent message error and encryption
warning.

Stuff that we need to do at room view mount time had got moved into
a clause of the if statement in onHaveRoom and so wasn't being
executed.

Fixes https://github.com/vector-im/riot-web/issues/4327
2017-06-15 22:57:41 +01:00
Richard van der Hoff
7b526308fd Rearrange MatrixChat.render for sanity
no-op to make it into a nice simple switch-like arrangement
2017-06-15 17:57:24 +01:00
Richard van der Hoff
90213ce72e MatrixChat: Replace state.{loading,loggedIn,loggingIn} with views
MatrixChat is essentially a glorified state machine, with its states partially
determined by the loading, loggedIn and loggingIn state flags. If we actually
make each of the states implied by those flags an explicit 'view', then
everything gets much clearer.
2017-06-15 17:57:24 +01:00
Weblate
81d0388021 Merge remote-tracking branch 'origin/develop' into develop 2017-06-15 16:35:46 +00:00
strixaluco
96e76ce42e Translated using Weblate (Ukrainian)
Currently translated at 10.5% (96 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-06-15 16:35:41 +00:00
Max Sandholm
accb4dc591 Translated using Weblate (Swedish)
Currently translated at 35.6% (323 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2017-06-15 16:35:41 +00:00
Walter
12c2272fcd Translated using Weblate (Russian)
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-15 16:35:41 +00:00
IMIN
dac9e511c9 Translated using Weblate (Korean)
Currently translated at 26.6% (241 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-06-15 16:35:41 +00:00
Richard van der Hoff
ce42a9a06f Replace MatrixChat.state.screen with 'view'
'screen' is overloaded, as it us used for the parameter of `showScreen` (and,
by implication, `state.screenAfterLogin`). Attempt to clear up the confusion by
replacing 'screen' with 'view' and using some constants for the potential
values.

This should be a no-op!
2017-06-15 16:41:17 +01:00
Richard van der Hoff
1f48b4caa6 Merge pull request #1098 from matrix-org/rav/test_rts_login
Groundwork for tests including a teamserver login
2017-06-15 16:12:28 +01:00
Luke Barnard
9d74001f4f Show a spinner when accepting an invite and waitingForRoom 2017-06-15 15:32:01 +01:00
Luke Barnard
cc46fd34d7 Only stop peeking if at some point we were joined 2017-06-15 14:21:23 +01:00
David Baker
8f9bf5f093 Merge branch 'develop' into erikj/group_server 2017-06-15 14:19:46 +01:00
Luke Barnard
5c37d591b0 Unbreak auto joining 2017-06-15 13:35:19 +01:00
Luke Barnard
fc7da536d6 Add forceUpdate for memberships !== join 2017-06-15 13:32:56 +01:00
Luke Barnard
30566beb43 Fix if-statement thinko 2017-06-15 13:28:52 +01:00
Luke Barnard
d55d61e456 Remove redundant isUserJoined 2017-06-15 12:37:01 +01:00
Luke Barnard
b90ceaa111 Display a spinner until new room object after join success
If we successfully join, display a spinner until the js-sdk indicates (via room membership event or room event) that we can start using the room normally. A room event indicates we have never seen that room which means we need to use the new room object to clobber state.room. This is to make sure we replace the room that is set up for peeking with the room that can be used normally. For historical rooms, this isn't a problem.

This is a workaround for the fact that when peeking, the js-sdk calls onRoom, which is difficult to handle from the clients perspective because onRoom should only be called for rooms that you've never seen before. But if you peek a room that you've joined and left and get an onRoom, you run into trouble. You also can't just always use onRoomMembership because this won't be triggered for the first time you see the room. So we end up using a combination of both.

See https://github.com/matrix-org/matrix-js-sdk/issues/464 for discussion on improving this
2017-06-15 12:01:16 +01:00
IMIN
559f29d6be Added translation using Weblate (Korean) 2017-06-15 10:44:22 +00:00
Tom Tryfonidis
2172dd5325 Translated using Weblate (Greek)
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-15 09:39:59 +00:00
Tom Tryfonidis
ca46314613 Translated using Weblate (Greek)
Currently translated at 99.5% (902 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-15 09:32:23 +00:00
GrigRUSS
c5ae1dabe1 Translated using Weblate (Russian)
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-15 06:37:40 +00:00
Richard van der Hoff
65f351ff22 Clear Lifecycle.RtsClient on MatrixChat.mount
- otherwise it ends up sitting around and failing later tests.
2017-06-15 02:15:13 +01:00
Richard van der Hoff
9ff52b182f Allow fetch() to be stubbed for the RtsClient
- so that we can write some tests for it.
2017-06-15 01:52:24 +01:00
Richard van der Hoff
a05bafed6a Remove sarcastic comments
... apparently I wrote them, and I don't understand them. There is *supposed*
to be a global flux dispatcher.

This reverts commit c0de0870ed.
2017-06-14 23:03:40 +01:00
strixaluco
5e4e12316b Added translation using Weblate (Ukrainian) 2017-06-14 20:20:51 +00:00
David Baker
8840625045 Merge pull request #1097 from matrix-org/luke/attempt-fix-peeking-regression
Luke/attempt fix peeking regression
2017-06-14 17:33:45 +01:00
Luke Barnard
58554cce53 Remove racey condition
joining might become false before we get the room down the sync
2017-06-14 17:13:13 +01:00
Luke Barnard
9e3efb54d3 Merge pull request #1096 from matrix-org/dbkr/fix_warm_fuzzy_text_mk_2
Show correct text in set email password dialog (2)
2017-06-14 16:59:12 +01:00
Richard van der Hoff
e9aac09105 Merge pull request #1092 from matrix-org/rav/no_resume_client_on_login
Don't create a guest login if user went to /login
2017-06-14 16:58:12 +01:00
Luke Barnard
ed5f01d46f Add logging for diagnosis 2017-06-14 16:53:21 +01:00
Luke Barnard
b5fd78a97f Only attempt to peek once in the lifetime of RoomView 2017-06-14 16:50:46 +01:00
Luke Barnard
2d6ba056d1 Attempt to follow closely what RoomView did pre-ILAG
In terms of peeking and what happens to the state when joining. This is another attempt to mitigate https://github.com/vector-im/riot-web/issues/4307
2017-06-14 16:48:34 +01:00
David Baker
9ecf82a1f2 Show correct text in set email password dialog (2)
Fixes https://github.com/vector-im/riot-web/issues/4311

The cancel button onClick was hooked directly up to onFinished, so
the mouse event ended up as the boolean for whether an email had
been set.
2017-06-14 16:06:28 +01:00
David Baker
449c65b784 Merge pull request #1095 from matrix-org/luke/fix-guest-password-success-and-email-set
Give password confirmation correct title, description
2017-06-14 15:16:36 +01:00
David Baker
602255f92c Merge pull request #1094 from matrix-org/dbkr/enter_submits_changepassword
Make enter submit change password form
2017-06-14 15:16:11 +01:00
Luke Barnard
1d4a3ae5a3 Give password confirmation correct title, description
Fixes https://github.com/vector-im/riot-web/issues/4311

This was due to `BaseDialog` calling `onFinished` with a mouse event instead of `false` (and it was assumed to call with `true/false`, but doesn't)
2017-06-14 14:58:39 +01:00
David Baker
57ef6f3cf8 Make enter submit change password form
Fixes https://github.com/vector-im/riot-web/issues/4302
2017-06-14 14:50:48 +01:00
Robert Swain
edb11d805e AppsDrawer: Open add app widget if opening empty drawer
This felt much better than having to also click the add app widget
button.
2017-06-14 15:05:29 +02:00
Robert Swain
5f020423bc AddAppDialog: Put the submit button inside the form 2017-06-14 15:05:11 +02:00
Robert Swain
2d3c886646 AppsDrawer: Generate room alias for vrdemo 2017-06-14 13:27:15 +02:00
Robert Swain
9c8ab2691b AppsDrawer: Only append queryParams once 2017-06-14 13:26:43 +02:00
Robert Swain
880e7149f3 ModularWidgets: Add a quick VR demo widget 2017-06-14 13:05:43 +02:00
Luke Barnard
f25c081007 When not specified, remove roomAlias state in RoomViewStore 2017-06-14 12:05:25 +01:00
GrigRUSS
a2322853a1 Translated using Weblate (Russian)
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-14 10:47:18 +00:00
Tom Tryfonidis
7983f9af87 Translated using Weblate (Greek)
Currently translated at 96.7% (877 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-14 10:19:45 +00:00
Krombel
b916bc97b1 Translated using Weblate (German)
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-14 10:17:13 +00:00
Richard van der Hoff
5d649626b0 Merge remote-tracking branch 'origin/develop' into rav/no_resume_client_on_login 2017-06-14 11:08:16 +01:00
Richard van der Hoff
498ea53995 Don't create a guest login if user went to /login
This fixes an unintuitive behaviour where, if you follow a link to
riot.im/app/#/login, we take you to the login page, but not before we've
registered a guest account (or restarted the MatrixClient with the stored
creds).

This actually ends up simplifying some of the startup dance, as we special-case
the registration flows earlier on.
2017-06-14 11:02:38 +01:00
David Baker
2a51aec193 Merge pull request #1091 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-14 10:55:24 +01:00
Luke Barnard
57dfbc4701 Remove unused imports 2017-06-14 10:53:02 +01:00
Luke Barnard
040f28463d Merge pull request #1045 from ollieh/issues/4009
Fixed pagination infinite loop caused by long messages
2017-06-14 10:40:02 +01:00
Richard van der Hoff
9e70884415 Merge pull request #1085 from matrix-org/rav/clear_storage_on_login
Clear persistent storage on login and logout
2017-06-14 10:34:26 +01:00
David Baker
b4e216ba23 Merge pull request #1087 from matrix-org/dbkr/dm_guess_oldest_joined
DM guessing: prefer oldest joined member
2017-06-14 10:30:46 +01:00
Weblate
755005b1c6 Merge remote-tracking branch 'origin/develop' into develop 2017-06-14 09:30:04 +00:00
Brendan Abolivier
9495d5b631 Translated using Weblate (French)
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-14 09:15:22 +00:00
David Baker
0566e5d992 Merge pull request #1090 from matrix-org/luke/set-email-after-password-2
Ask for email address after setting password for the first time
2017-06-14 09:57:07 +01:00
Weblate
7ba2d19249 Merge remote-tracking branch 'origin/develop' into develop 2017-06-14 08:32:39 +00:00
Walter
84d89ba519 Translated using Weblate (Russian)
Currently translated at 99.7% (902 of 904 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-14 08:32:39 +00:00
Bamstam
10a4d128c6 Translated using Weblate (German)
Currently translated at 100.0% (904 of 904 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-14 08:32:39 +00:00
Justin
7756f83c66 Translated using Weblate (Dutch)
Currently translated at 35.8% (324 of 904 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-06-14 08:32:39 +00:00
Luke Barnard
4344af58ee Ask for email address after setting password for the first time
So that the user can reset their password.
2017-06-14 09:31:16 +01:00
AmandineLP
6eab420257 Translated using Weblate (French)
Currently translated at 100.0% (904 of 904 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-13 22:19:29 +00:00
Justin
71941f4f92 Translated using Weblate (Dutch)
Currently translated at 35.8% (324 of 904 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-06-13 21:53:36 +00:00
David Baker
acd7cf4439 Merge pull request #1089 from matrix-org/luke/set-email-after-password
i18n for setting password flow
2017-06-13 18:38:39 +01:00
Luke Barnard
31b3b4687a Trailing comma 2017-06-13 18:34:33 +01:00
Luke Barnard
aa0ef51932 i18n for setting password flow 2017-06-13 18:28:43 +01:00
Matthew Hodgson
9dad5d0132 Merge pull request #1088 from matrix-org/t3chguy/fix_purple_e2e_room_settings
remove mx_filterFlipColor from verified e2e icon so its not purple :/
2017-06-13 17:45:56 +01:00
Michael Telatynski
f4aadafed9 remove mx_filterFlipColor from verified e2e icon so its not purple :/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-13 17:42:30 +01:00
David Baker
5fd45233fb DM guessing: prefer oldest joined member
In the DM guessing code, prefer the oldest joined member if there's
anyone in the rom other than us. Otherwise, fall back to the old
behaviour.

Fixes https://github.com/vector-im/riot-web/issues/4288
2017-06-13 17:35:09 +01:00
Robert Swain
d67e7289e8 Merge branch 'develop' into rob/apps 2017-06-13 15:50:43 +02:00
Robert Swain
03ba3bd431 Merge branch 'rxl881/apps' into rob/apps 2017-06-13 15:41:52 +02:00
Robert Swain
91eabbba60 MessageComposer: Trigger Jitsi app from call buttons 2017-06-13 15:35:13 +02:00
Robert Swain
5d898dd098 AuxPanel: Add type checking for userId and showApps properties 2017-06-13 15:34:05 +02:00
Robert Swain
b63edcb390 AppTile: Support deletion of apps from room state 2017-06-13 15:33:17 +02:00
Robert Swain
bcb2f8408b AppTile: Fix typo in property name 2017-06-13 15:32:40 +02:00
Robert Swain
2aa0aa61e3 AddAppDialog: Support adding apps to room state 2017-06-13 15:31:37 +02:00
Robert Swain
a72cb794f2 AppsDrawer: Populate apps from room state 2017-06-13 15:28:37 +02:00
Robert Swain
e2759774fc RoomView: Correctly pass userId from matrix client
It isn't set in the state anywhere.
2017-06-13 15:19:38 +02:00
Robert Swain
99b1de7f0e RoomView: Display AppsDrawer if apps in room state 2017-06-13 15:19:06 +02:00
David Baker
bd00c1d4b1 Merge pull request #1083 from matrix-org/t3chguy/width_height_int
width and height must be int otherwise synapse cries
2017-06-13 13:23:12 +01:00
Richard van der Hoff
392cd7861d Merge pull request #1084 from matrix-org/rav/remove_roomstore_listener
remove RoomViewStore listener from MatrixChat on unmount
2017-06-13 13:10:49 +01:00
Richard van der Hoff
68e1a7be74 Clear persistent storage on login and logout
Make sure that we don't end up with sensitive data sitting around in the stores
from a previous session.
2017-06-13 12:51:47 +01:00
David Baker
2e07a0fa12 Merge pull request #1082 from matrix-org/dbkr/copy_translations
Add script to copy translations between files
2017-06-13 12:49:47 +01:00
Richard van der Hoff
939f6d0798 Factor createMatrixClient out from MatrixClientPeg
... so that it can be used elsewhere.
2017-06-13 12:46:49 +01:00
Richard van der Hoff
1ea9ed5d8c remove RoomViewStore listener from MatrixChat on unmount
... to avoid spurious warnings from the tests.
2017-06-13 12:39:26 +01:00
Michael Telatynski
ad7c835471 width and height must be int otherwise synapse cries
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-13 12:19:20 +01:00
Krombel
70fd9b0283 Translated using Weblate (German)
Currently translated at 100.0% (904 of 904 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-13 11:02:25 +00:00
David Baker
4eb7419335 Don't put in spurious newline 2017-06-13 11:54:28 +01:00
Tom Tryfonidis
a6cdab8107 Translated using Weblate (Greek)
Currently translated at 96.0% (868 of 904 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-13 10:44:25 +00:00
Richard Lewis
876899948f Merge in upstream changes 2017-06-13 11:44:23 +01:00
David Baker
89c7477bd6 Add script to copy translations between files
So we can fill in missing translations from different dialects

Use it to fill in missing strings in pt from pt_BR
2017-06-13 11:39:37 +01:00
Luke Barnard
10ba5f8c3c Only process user_directory response if it's for the current query 2017-06-13 11:03:22 +01:00
David Baker
701242a36b Merge pull request #1080 from matrix-org/luke/fix-start-1-1-regression
Fix regressions with starting a 1-1.
2017-06-13 10:42:55 +01:00
David Baker
27bc6dd16b Merge new translations
Merge remote-tracking branch 'weblate/develop' into develop
2017-06-13 10:37:45 +01:00
Richard Lewis
2da30137ec Fix import path and add LG widget 2017-06-13 10:31:16 +01:00
Luke Barnard
1ce1984858 Fix regressions with starting a 1-1. 2017-06-13 10:15:29 +01:00
Robert Swain
e2cd8a7233 Translated using Weblate (Swedish)
Currently translated at 32.7% (295 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2017-06-13 09:11:46 +00:00
Tom Tryfonidis
6f2f3f3fb1 Translated using Weblate (Greek)
Currently translated at 96.8% (873 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-13 09:11:46 +00:00
Justin
387b3a1229 Translated using Weblate (Dutch)
Currently translated at 27.6% (249 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-06-13 09:11:46 +00:00
Jean
0ea3b78163 Translated using Weblate (French)
Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-13 08:12:20 +00:00
Hubert Chathi
bf76c76e53 Translated using Weblate (French)
Currently translated at 99.6% (898 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-13 08:11:58 +00:00
Jean
2447b3fbbb Translated using Weblate (French)
Currently translated at 99.5% (897 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-13 08:09:37 +00:00
Hubert Chathi
435c8885f0 Translated using Weblate (French)
Currently translated at 99.5% (897 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-13 07:46:52 +00:00
Jean
301080ab7e Translated using Weblate (French)
Currently translated at 99.4% (896 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-13 07:46:32 +00:00
Hubert Chathi
4b07bd8584 Translated using Weblate (French)
Currently translated at 99.3% (895 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-13 07:46:23 +00:00
Jean
a185f75bd3 Translated using Weblate (French)
Currently translated at 99.1% (893 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-13 07:46:05 +00:00
Travis Ralston
2902b97ca8 Translated using Weblate (English (United States))
Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2017-06-12 22:30:23 +00:00
Matthew Hodgson
bc55d44bcf Merge pull request #1079 from matrix-org/t3chguy/voip/force_turn
allow forcing of TURN
2017-06-12 21:44:00 +01:00
Michael Telatynski
c1d1a1377c allow forcing of TURN, pass account val per-call until UX is designed.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-12 20:20:27 +01:00
Richard van der Hoff
f37608a4ea Avoid React warning from _tJsx (#1078) 2017-06-12 16:45:36 +01:00
David Baker
7b0565e9d1 Merge branch 'master' into develop 2017-06-12 15:53:04 +01:00
Riot Translate Bot
f98c491fdd Update from Weblate. (#1073)
* Translated using Weblate (German)

Currently translated at 93.4% (842 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Russian)

Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/

* Added translation using Weblate (Arabic)

* Translated using Weblate (Greek)

Currently translated at 42.2% (381 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/

* Translated using Weblate (English (United States))

Currently translated at 91.8% (828 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/

* Translated using Weblate (Russian)

Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/

* Translated using Weblate (German)

Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Hungarian)

Currently translated at 20.0% (181 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 38.9% (351 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/

* Translated using Weblate (Arabic)

Currently translated at 0.5% (5 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ar/

* remote entirely spurious translation progress stats :/
2017-06-12 15:38:03 +01:00
Matthew Hodgson
6afd895291 broken var 2017-06-12 15:36:41 +01:00
Matthew Hodgson
6133186583 fullstop fails 2017-06-12 15:36:24 +01:00
Hubert Chathi
b1bc83ab15 Translated using Weblate (French)
Currently translated at 98.3% (886 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 14:29:28 +00:00
Jean
fea1259127 Translated using Weblate (French)
Currently translated at 98.2% (885 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 14:29:21 +00:00
Hubert Chathi
1cde4abfd8 Translated using Weblate (French)
Currently translated at 98.2% (885 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 14:28:47 +00:00
Jean
ebac408c66 Translated using Weblate (French)
Currently translated at 98.1% (884 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 14:28:43 +00:00
Tom Tryfonidis
69c16fa3f8 Translated using Weblate (Greek)
Currently translated at 96.5% (870 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-12 13:54:08 +00:00
Richard Lewis
b893887707 Fix merge conflict 2017-06-12 14:52:41 +01:00
Richard Lewis
f9f924bbd6 Merge branch 'master' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps 2017-06-12 14:50:25 +01:00
Hubert Chathi
85d70f1381 Translated using Weblate (French)
Currently translated at 98.1% (884 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:48:01 +00:00
Jean
0bb58aec05 Translated using Weblate (French)
Currently translated at 98.0% (883 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:47:45 +00:00
Hubert Chathi
0bcdf2981b Translated using Weblate (French)
Currently translated at 97.4% (878 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:43:06 +00:00
Jean
3b03f268f8 Translated using Weblate (French)
Currently translated at 97.3% (877 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:40:31 +00:00
Hubert Chathi
cef1f112da Translated using Weblate (French)
Currently translated at 97.2% (876 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:40:27 +00:00
Jean
52e024f408 Translated using Weblate (French)
Currently translated at 97.1% (875 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:37:25 +00:00
Hubert Chathi
0c70e56795 Translated using Weblate (French)
Currently translated at 97.1% (875 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:33:23 +00:00
Jean
7f5cb0e4a1 Translated using Weblate (French)
Currently translated at 96.8% (873 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:32:36 +00:00
Hubert Chathi
2e7077cc9d Translated using Weblate (French)
Currently translated at 96.7% (872 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:32:19 +00:00
Jean
c58221e79e Translated using Weblate (French)
Currently translated at 96.6% (871 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:27:07 +00:00
Hubert Chathi
0f3da93ff4 Translated using Weblate (French)
Currently translated at 96.4% (869 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:20:58 +00:00
Jean
e972cb3a9b Translated using Weblate (French)
Currently translated at 96.3% (868 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:16:33 +00:00
Hubert Chathi
39a75694b6 Translated using Weblate (French)
Currently translated at 95.6% (862 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:05:33 +00:00
Jean
c70eacd049 Translated using Weblate (French)
Currently translated at 95.5% (861 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:05:28 +00:00
Hubert Chathi
75da704388 Translated using Weblate (French)
Currently translated at 95.4% (860 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:05:21 +00:00
Jean
90df2545eb Translated using Weblate (French)
Currently translated at 95.2% (858 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:04:22 +00:00
Hubert Chathi
9a056270c4 Translated using Weblate (French)
Currently translated at 95.1% (857 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:03:30 +00:00
Jean
d6c306f010 Translated using Weblate (French)
Currently translated at 95.0% (856 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 13:03:21 +00:00
Hubert Chathi
40d25f0a6d Translated using Weblate (French)
Currently translated at 93.8% (846 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 12:12:42 +00:00
Jean
ef4fddfb69 Translated using Weblate (French)
Currently translated at 93.7% (845 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 12:09:56 +00:00
Tom Tryfonidis
534f4116b5 Translated using Weblate (Greek)
Currently translated at 93.7% (845 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-12 12:05:16 +00:00
Tom Tryfonidis
aba4c76f4a Translated using Weblate (Greek)
Currently translated at 87.0% (784 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-12 09:19:31 +00:00
Richard van der Hoff
cb38ebed39 Merge pull request #1077 from matrix-org/rav/remove_dead_code
Remove a bunch of dead code from react-sdk
2017-06-12 10:10:12 +01:00
Richard van der Hoff
57b4c422b1 Merge pull request #1061 from matrix-org/rav/megolm_key_encryption_errors
Improve error logging/reporting in megolm import/export
2017-06-12 10:09:52 +01:00
Hubert Chathi
08adc49f15 Translated using Weblate (French)
Currently translated at 93.2% (840 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-06-12 08:26:58 +00:00
Richard van der Hoff
cc74a09abd Remove start_upgrade_registration dispatch handler
This dispatch is no longer raised anywhere, so we may as well get rid of the
code that it executes, as well as the state which is only set there.
2017-06-12 08:38:29 +01:00
Richard van der Hoff
e6d7eedbe6 Remove NeedToRegisterDialog
- since it's no longer used anywhere
2017-06-12 08:36:41 +01:00
Richard van der Hoff
9e96e8e87f Remove guest-only bits of UserSettings
There is now no way to open UserSettings as a guest, so we might as well lose
the dead code.
2017-06-12 08:36:41 +01:00
Richard van der Hoff
56efe7d2f2 Merge pull request #1064 from matrix-org/rav/delinting
Delinting
2017-06-12 08:34:58 +01:00
Oliver Hunt
4124a8dcff Save scroll state immediately before updating
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
2017-06-12 06:19:12 +01:00
Michael Telatynski
ccad1013a7 don't return null in case it breaks things
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 23:42:22 +01:00
Michael Telatynski
1069bd33f0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/updating_stuff
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 23:21:50 +01:00
Tom Tryfonidis
4acb650f59 Translated using Weblate (Greek)
Currently translated at 71.1% (641 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-11 20:09:55 +00:00
Matthew Hodgson
af8757a077 Merge pull request #1071 from Half-Shot/hs/call-hangup-reason
Show reason for a call hanging up unexpectedly.
2017-06-11 20:47:23 +01:00
Matthew Hodgson
203cdef8a5 Merge pull request #1072 from Half-Shot/hs/roomsettingsbanreason
Add reason for ban in room settings
2017-06-11 20:45:00 +01:00
Riot Translate Bot
031b45fb87 Update from Weblate. (#1073)
* Translated using Weblate (German)

Currently translated at 93.4% (842 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Russian)

Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/

* Added translation using Weblate (Arabic)

* Translated using Weblate (Greek)

Currently translated at 42.2% (381 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/

* Translated using Weblate (English (United States))

Currently translated at 91.8% (828 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/

* Translated using Weblate (Russian)

Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/

* Translated using Weblate (German)

Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Hungarian)

Currently translated at 20.0% (181 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 38.9% (351 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/

* Translated using Weblate (Arabic)

Currently translated at 0.5% (5 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ar/

* remote entirely spurious translation progress stats :/
2017-06-11 20:40:20 +01:00
Michael Telatynski
6ead97c7a6 change interface to UpdateCheckBar and change launching mechanism
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 19:12:40 +01:00
Weblate
0666af26bb Merge remote-tracking branch 'origin/develop' into develop 2017-06-11 17:50:33 +00:00
GrigRUSS
3bc330425a Translated using Weblate (Russian)
Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-11 17:50:26 +00:00
maxigaz
487ce1d6e1 Translated using Weblate (Hungarian)
Currently translated at 20.0% (181 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-06-11 17:50:26 +00:00
Bamstam
625159c9d8 Translated using Weblate (German)
Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-11 17:50:26 +00:00
Krombel
6f509104e1 Translated using Weblate (English (United States))
Currently translated at 91.8% (828 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2017-06-11 17:50:26 +00:00
Radium
a056fb05f4 Translated using Weblate (Chinese (Simplified))
Currently translated at 38.9% (351 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2017-06-11 17:50:26 +00:00
abugandar
edf975f1c3 Translated using Weblate (Arabic)
Currently translated at 0.5% (5 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ar/
2017-06-11 17:50:26 +00:00
Tom Tryfonidis
7b6e2c4767 Translated using Weblate (Greek)
Currently translated at 42.2% (381 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/
2017-06-11 16:30:26 +00:00
abugandar
cab23266cf Added translation using Weblate (Arabic) 2017-06-11 10:24:10 +00:00
Will Hunt
cbcca78c40 Add text for invite_timeout and fix message for ice_failed. 2017-06-11 07:19:19 +01:00
Will Hunt
3ddbf83c62 Add userid back 2017-06-11 07:13:50 +01:00
Will Hunt
f940d2c100 Add reason for ban in room settings 2017-06-10 16:57:09 +01:00
Will Hunt
2bfad52b40 Make unknown failures more helpful. 2017-06-10 14:35:11 +01:00
Will Hunt
18490377f8 Show reason for a call hanging up unexpectedly. 2017-06-10 14:27:18 +01:00
Matthew Hodgson
3b7ce49eab Merge pull request #1070 from matrix-org/t3chguy/dark_theme/e2e_icons
adds mx_filterFlipColor so that the dark theme will invert this image
2017-06-10 01:06:31 +01:00
Michael Telatynski
34caf5586f adds mx_filterFlipColor so that the dark theme will invert this image
making it more suitable for the said theme

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-10 00:08:40 +01:00
Matthew Hodgson
7de60892cb broken var 2017-06-09 22:20:09 +01:00
Matthew Hodgson
a4a0acc28d fullstop fails 2017-06-09 22:19:14 +01:00
David Baker
d6b85c9d4d Fix translations on conf call banner
* You can't substitute react elements into a text string
 * Substituting in undefined gives the string 'undefined', so
   initialise it to the empty string.
2017-06-09 22:06:43 +01:00
GrigRUSS
36db6ad36e Translated using Weblate (Russian)
Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-06-09 18:12:01 +00:00
David Baker
2df32dfabd Merge pull request #1069 from matrix-org/luke/fix-get-started-with-rb
When ChatCreateOrReuseDialog is cancelled by a guest, go home
2017-06-09 16:05:40 +01:00
Weblate
662822ea1f Merge remote-tracking branch 'origin/develop' into develop 2017-06-09 14:36:39 +00:00
Bamstam
b6968c4287 Translated using Weblate (German)
Currently translated at 93.4% (842 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-06-09 14:36:39 +00:00
Vladi
0b76b94063 Translated using Weblate (Russian)
Currently translated at 99.4% (896 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-06-09 14:14:39 +00:00
Szimszon
6126cce967 Translated using Weblate (Hungarian)
Currently translated at 19.4% (175 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/
2017-06-09 14:14:39 +00:00
Kegan Dougal
34d7d793b7 Handle M_NOT_FOUND 2017-06-09 15:06:09 +01:00
dtygel
d6da5c6494 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-09 13:33:11 +00:00
Luke Barnard
ecc8abbfc9 When ChatCreateOrReuseDialog is cancelled by a guest, go home 2017-06-09 13:46:45 +01:00
Krombel
0dc8e3adbd Translated using Weblate (German)
Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-09 11:43:52 +00:00
Kegan Dougal
b70881f078 Rejig to support deletions better 2017-06-09 12:34:19 +01:00
Bamstam
0df1e9b9d8 Translated using Weblate (German)
Currently translated at 93.8% (846 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-09 11:16:40 +00:00
Bamstam
7f4368e2d1 Translated using Weblate (German)
Currently translated at 93.7% (845 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-09 11:16:30 +00:00
Bamstam
b88c46a509 Translated using Weblate (German)
Currently translated at 93.5% (843 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-09 11:16:20 +00:00
Bamstam
65e4b70efe Translated using Weblate (German)
Currently translated at 93.5% (843 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-09 11:16:10 +00:00
Kegan Dougal
6d1d435247 Scalar: add in set_widget and get_widgets 2017-06-09 11:21:37 +01:00
RiotTranslate
ce2d595195 Merge remote-tracking branch 'origin/develop' into develop 2017-06-09 10:07:21 +00:00
Jean GB
81a8c56636 Translated using Weblate (French)
Currently translated at 93.0% (838 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-09 10:07:20 +00:00
Robert Swain
9e0b476b72 Merge branch 'develop' into rob/apps 2017-06-09 12:06:44 +02:00
David Baker
924c08b143 Merge pull request #1067 from matrix-org/luke/fix-forgetting-last-room
Goto /home when forgetting the last room
2017-06-09 11:03:14 +01:00
Luke Barnard
19bb879fbf Handle only 1 room in the list 2017-06-09 10:54:42 +01:00
Luke Barnard
c7229967a6 Goto /home when forgetting the last room 2017-06-09 10:28:45 +01:00
Luke Barnard
a21b6e61a6 Default to home page when settings is closed
If the current room isn't set.
2017-06-09 10:08:26 +01:00
Jean GB
2a293ac571 Translated using Weblate (French)
Currently translated at 93.0% (838 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-09 08:14:05 +00:00
RiotTranslate
3f9c6a0f0f Merge remote-tracking branch 'origin/develop' into develop 2017-06-09 07:51:53 +00:00
Pitchaya Boonsarngsuk
5c21216e95 Translated using Weblate (Thai)
Currently translated at 66.0% (595 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
2017-06-09 07:51:53 +00:00
Vladi
c478631db4 Translated using Weblate (Russian)
Currently translated at 97.0% (874 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-06-09 07:51:52 +00:00
Dor Ben Dov
3b0906fc85 Translated using Weblate (Hebrew)
Currently translated at 2.1% (19 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/he/
2017-06-09 07:51:52 +00:00
Richard van der Hoff
105c6b2b87 delint MatrixChat
once more. with feeling.
2017-06-09 03:09:03 +01:00
Richard van der Hoff
20bdae6079 delint UserSettings.js 2017-06-09 03:08:57 +01:00
Matthew Hodgson
f680bb5d3c broken vars 2017-06-08 23:00:55 +01:00
Dor Ben Dov
1d02cde502 Added translation using Weblate (Hebrew) 2017-06-08 20:03:33 +00:00
RiotTranslate
c764b96378 [WEBLATE] merge develop 2017-06-08 17:49:06 +00:00
Richard van der Hoff
091d8d3d36 Merge pull request #1062 from matrix-org/luke/fix-rvs-join-by-alias
When joining, use a roomAlias if we have it
2017-06-08 18:41:59 +01:00
Pitchaya Boonsarngsuk
449b4e87d4 Translated using Weblate (Thai)
Currently translated at 56.1% (479 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
2017-06-08 17:30:51 +00:00
Stanislav N
0f062a7fe9 Translated using Weblate (Russian)
Currently translated at 100.0% (853 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-06-08 17:30:51 +00:00
dtygel
80dba43b41 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (853 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-08 17:30:50 +00:00
Bamstam
7dbb1c3b85 Translated using Weblate (German)
Currently translated at 100.0% (853 of 853 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-08 17:30:50 +00:00
Luke Barnard
ce0977373e Merge pull request #1058 from matrix-org/luke/fix-event-id-state
Control currently viewed event via RoomViewStore
2017-06-08 18:10:29 +01:00
Luke Barnard
5588e115eb Clarify doc for highlighted 2017-06-08 17:57:37 +01:00
Luke Barnard
9892566007 Highlighted means highlighted 2017-06-08 17:54:41 +01:00
Luke Barnard
cd6786114b When joining, use a roomAlias if we have it
And default to the current roomId otherwise
2017-06-08 17:40:53 +01:00
Luke Barnard
c72edab726 Update doc for getInitialEventId 2017-06-08 17:28:56 +01:00
Luke Barnard
cd8093d953 Explicit undefined initialEventPixelOffset 2017-06-08 17:28:21 +01:00
Luke Barnard
8cfdb4ce09 Clarify initial event 2017-06-08 17:27:04 +01:00
Matthew Hodgson
df625b0d31 hit MemberInfo with Gemini to fix vector-im/riot-web#4223 2017-06-08 17:26:40 +01:00
Luke Barnard
c02dbd1cdc Rename initial state variables 2017-06-08 17:26:08 +01:00
David Baker
3d59fe58dc Merge pull request #1060 from matrix-org/dbkr/fix_login_error_message
Better error messages for login
2017-06-08 16:57:40 +01:00
Richard van der Hoff
175599beda Improve error logging/reporting in megolm import/export
I saw a rageshake where somebody had apparently failed to import a key file.
I have no idea why it happened.

Also try to make the errors the users see useful.
2017-06-08 16:55:50 +01:00