Commit graph

5642 commits

Author SHA1 Message Date
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
David Baker
ce88d5c1cf Merge pull request #1066 from matrix-org/luke/fix-go-home-when-settings-closed
Default to home page when settings is closed
2017-06-09 11:00:50 +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
Matthew Hodgson
e1246a873e Merge pull request #1063 from RiotTranslate/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-08 22:37:05 +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
3218cae6e3 Expect to join by alias if given to RVS 2017-06-08 17:47:48 +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
David Baker
5e55b6a643 PR feedback 2017-06-08 16:23:43 +01:00
David Baker
9def0bb5c2 Oops, fix email check 2017-06-08 16:08:19 +01:00
David Baker
8dc20606c8 Use comma for list of three things 2017-06-08 16:07:29 +01:00
Luke Barnard
1ff2be1896 Update docs for RVS 2017-06-08 16:00:12 +01:00
Luke Barnard
36f72cccb5 Don't alter members of payload (when defaulting an event to scroll to), alter a copy 2017-06-08 15:55:47 +01:00
Luke Barnard
000a045e35 Rename RVS state (event -> initialEvent) and redocument 2017-06-08 15:52:21 +01:00