Commit graph

4958 commits

Author SHA1 Message Date
Michael Telatynski
c1cbdbcc4f Merge branches 'develop' and 'kegan/hide-join-part' of github.com:matrix-org/matrix-react-sdk into kegan/hide-join-part
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/UserSettings.js
2017-06-12 13:22:52 +01: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
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
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
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
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
David Baker
2b38f2a829 Merge pull request #1065 from RiotTranslate/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-09 15:27:58 +01: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
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
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
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
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