David Baker
88e843d992
Merge pull request #4201 from vector-im/luke/fix-tests
...
Fix tests for new-guest-access
2017-06-05 21:25:59 +01:00
Luke Barnard
feaff9d99d
Fix tests for new-guest-access
...
This time the test wasn't being flaky, but it does inspect a lot of the internal of RoomView, which has had some modifications recently. I've updated the test to reflect this and it passes locally.
Also, fix a bug in HomePage with an undeclared "error" which should be "err".
Let's see what Travis thinks of this!
2017-06-05 20:16:44 +01:00
Richard Lewis
0ef800073b
App drawer styling
2017-06-05 18:21:52 +01:00
Pitchaya Boonsarngsuk
e8d5021b48
Translated using Weblate (Thai)
...
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
2017-06-05 17:12:05 +00:00
Luke Barnard
5e67bcdac7
Merge pull request #4198 from vector-im/luke/ilag-i18n
...
i18n for SetPasswordDialog
2017-06-05 17:00:21 +01:00
Luke Barnard
0919b7ce3a
i18n for SetPasswordDialog
2017-06-05 16:13:44 +01:00
RiotTranslate
95d9b85a93
Merge remote-tracking branch 'origin/develop' into develop
2017-06-05 15:09:47 +00:00
BrianMwit
2f990bf410
Translated using Weblate (Thai)
...
Currently translated at 56.7% (92 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
2017-06-05 15:09:47 +00:00
Matthew Hodgson
c610d21e68
enable en_US as a 1st class language
2017-06-05 16:05:07 +01:00
Matthew Hodgson
58433423f4
Merge pull request #4193 from RiotTranslate/weblate-riot-web-riot-web
...
Update from Weblate.
2017-06-05 14:31:18 +01:00
BrianMwit
e60b7c6dba
Translated using Weblate (Thai)
...
Currently translated at 55.5% (90 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
2017-06-05 12:52:22 +00:00
BrianMwit
3b398cba6c
Translated using Weblate (Thai)
...
Currently translated at 4.9% (8 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/th/
2017-06-05 11:31:09 +00:00
BrianMwit
869d41e4b1
Added translation using Weblate (Thai)
2017-06-05 11:13:54 +00:00
Matthew Hodgson
7b9ae0157a
Merge pull request #4183 from vector-im/t3chguy/electron_logo_windows_weirdness
...
to make the windows volume mixer not explode as it can't resize icons.
2017-06-04 22:58:17 +01:00
Matthew Hodgson
1bc30021c8
Merge pull request #4186 from vector-im/t3chguy/electron_devtools
...
provide react devtools in electron dev runs
2017-06-04 22:57:26 +01:00
RiotTranslate
9053e9846d
Update from Weblate. ( #4182 )
...
* Translated using Weblate (Chinese (Traditional))
Currently translated at 61.1% (99 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/
* Translated using Weblate (German)
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 90.7% (147 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/
* Translated using Weblate (Swedish)
Currently translated at 43.8% (71 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
* Translated using Weblate (Swedish)
Currently translated at 46.2% (75 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
* Translated using Weblate (German)
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
* Translated using Weblate (Swedish)
Currently translated at 61.7% (100 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
* Translated using Weblate (Swedish)
Currently translated at 72.2% (117 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
* Translated using Weblate (Swedish)
Currently translated at 98.1% (159 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
* Added translation using Weblate (Greek)
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/
* Translated using Weblate (Dutch)
Currently translated at 75.9% (123 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/nl/
* Translated using Weblate (Greek)
Currently translated at 91.9% (149 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/el/
* Translated using Weblate (Polish)
Currently translated at 20.3% (33 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/
* Translated using Weblate (Russian)
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pt/
* [WEBLATE] fix merge fail
* Translated using Weblate (Greek)
Currently translated at 96.9% (157 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/el/
* Translated using Weblate (German)
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
* Translated using Weblate (Greek)
Currently translated at 96.9% (157 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/el/
* Translated using Weblate (Polish)
Currently translated at 23.4% (38 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/
* Translated using Weblate (Polish)
Currently translated at 24.6% (40 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/
* Translated using Weblate (Polish)
Currently translated at 30.8% (50 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/
* Translated using Weblate (Polish)
Currently translated at 42.5% (69 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/
* Translated using Weblate (Polish)
Currently translated at 43.8% (71 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/
* Translated using Weblate (Polish)
Currently translated at 46.9% (76 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/
* Added translation using Weblate (English (United States))
* Translated using Weblate (English (United States))
Currently translated at 21.6% (35 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/
* Translated using Weblate (English (United States))
Currently translated at 25.3% (41 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/
* Translated using Weblate (English (United States))
Currently translated at 40.1% (65 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/
* Translated using Weblate (English (United States))
Currently translated at 55.5% (90 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/
* Translated using Weblate (English (United States))
Currently translated at 69.1% (112 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/
* Translated using Weblate (English (United States))
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/
* Translated using Weblate (German)
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
2017-06-04 22:55:34 +01:00
Matthew Hodgson
8cd4bf5342
Merge pull request #4184 from MTRNord/patch-1
...
Fix DeprecationWarning
2017-06-04 22:55:12 +01:00
Michael Telatynski
f24c6de245
provide react devtools in electron dev builds
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-04 15:30:44 +01:00
Michael Telatynski
1e5a742602
this actually fixes things, still not happy with it, introduces more delay
...
(not noticeably more than the existing delay)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-04 14:27:19 +01:00
Marcel
4225813523
Fix DeprecationWarning
...
the copy-res.js did throw "(node:8688) DeprecationWarning: Calling an asynchronous function without callback is deprecated." before
2017-06-04 12:36:14 +02:00
Michael Telatynski
25a0af6ddb
to make the windows volume mixer not explode as it can't resize icons.
...
I hate Windows.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-04 11:05:28 +01:00
RiotTranslate
7c13e2d0ab
Update from Weblate. ( #4177 )
...
* Translated using Weblate (Chinese (Traditional))
Currently translated at 61.1% (99 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/
* Translated using Weblate (German)
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 90.7% (147 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/
* Translated using Weblate (Swedish)
Currently translated at 43.8% (71 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
* Translated using Weblate (Swedish)
Currently translated at 46.2% (75 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
* Translated using Weblate (German)
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
* Translated using Weblate (Swedish)
Currently translated at 61.7% (100 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
* Translated using Weblate (Swedish)
Currently translated at 72.2% (117 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
* Translated using Weblate (Swedish)
Currently translated at 98.1% (159 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
* Added translation using Weblate (Greek)
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/
* Translated using Weblate (Dutch)
Currently translated at 75.9% (123 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/nl/
* Translated using Weblate (Greek)
Currently translated at 91.9% (149 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/el/
* Translated using Weblate (Polish)
Currently translated at 20.3% (33 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/
* Translated using Weblate (Russian)
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pt/
* [WEBLATE] fix merge fail
* Translated using Weblate (Greek)
Currently translated at 96.9% (157 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/el/
* Translated using Weblate (German)
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
* Translated using Weblate (Greek)
Currently translated at 96.9% (157 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/el/
* Translated using Weblate (Polish)
Currently translated at 23.4% (38 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/
* Translated using Weblate (Polish)
Currently translated at 24.6% (40 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/
* Translated using Weblate (Polish)
Currently translated at 30.8% (50 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/
* Translated using Weblate (Polish)
Currently translated at 42.5% (69 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/
* Translated using Weblate (Polish)
Currently translated at 43.8% (71 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/
* Translated using Weblate (Polish)
Currently translated at 46.9% (76 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/
* Added translation using Weblate (English (United States))
* Translated using Weblate (English (United States))
Currently translated at 21.6% (35 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/
* Translated using Weblate (English (United States))
Currently translated at 25.3% (41 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/
* Translated using Weblate (English (United States))
Currently translated at 40.1% (65 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/
* Translated using Weblate (English (United States))
Currently translated at 55.5% (90 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/
* Translated using Weblate (English (United States))
Currently translated at 69.1% (112 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/
* Translated using Weblate (English (United States))
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/en_US/
2017-06-04 09:52:02 +01:00
Matthew Hodgson
0d7aefb7c1
Merge pull request #4178 from vector-im/t3chguy/patch-4
...
room link should be a matrix.to one
2017-06-03 22:33:57 +01:00
Michael Telatynski
e7fc602b3d
room link should be a matrix.to one
2017-06-03 21:54:45 +01:00
Matthew Hodgson
ed6709ec6c
rename WMClass as riot rather than confusing riot-web
2017-06-03 18:43:06 +01:00
Michael Telatynski
93f148fca3
fix type electron vs remote
...
don't break when running a non Squirrel Windows build that has an update url
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 16:34:15 +01:00
Michael Telatynski
5981887705
fix UpdateCheckBar image alt
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 16:04:01 +01:00
Michael Telatynski
a4c1aee5ea
correct file header
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 16:00:49 +01:00
Michael Telatynski
f5ba6fa952
i18n things
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit d878c72)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:59:33 +01:00
Michael Telatynski
3ebd90565c
add clearer concept of timeout vs error
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit 104c804)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:59:27 +01:00
Michael Telatynski
b95ad701af
match ENUM style to others in project
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit a871815)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:59:18 +01:00
Michael Telatynski
efc68c078e
basic manual update stuff + update check bar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:59:12 +01:00
Michael Telatynski
0e6012ad45
absorb updater.js into the Platforms, gets rid of pointless setInterval in Electron
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit 24e8a30)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:58:54 +01:00
Matthew Hodgson
31138ca573
fix toAction i18n thinkos
2017-06-03 12:49:37 +01:00
RiotTranslate
2adecce3f2
Update from Weblate. ( #4175 )
...
* Translated using Weblate (Chinese (Traditional))
Currently translated at 61.1% (99 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/
* Translated using Weblate (German)
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 90.7% (147 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/
* Translated using Weblate (Swedish)
Currently translated at 43.8% (71 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
* Translated using Weblate (Swedish)
Currently translated at 46.2% (75 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
* Translated using Weblate (German)
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
* Translated using Weblate (Swedish)
Currently translated at 61.7% (100 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
* Translated using Weblate (Swedish)
Currently translated at 72.2% (117 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
* Translated using Weblate (Swedish)
Currently translated at 98.1% (159 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/sv/
* Added translation using Weblate (Greek)
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/zh_Hant/
* Translated using Weblate (Dutch)
Currently translated at 75.9% (123 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/nl/
* Translated using Weblate (Greek)
Currently translated at 91.9% (149 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/el/
* Translated using Weblate (Polish)
Currently translated at 20.3% (33 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pl/
* Translated using Weblate (Russian)
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/ru/
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (162 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/pt/
* [WEBLATE] fix merge fail
* Translated using Weblate (Greek)
Currently translated at 96.9% (157 of 162 strings)
Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/el/
2017-06-03 12:45:09 +01:00
Matthew Hodgson
85782f736c
Merge branch 'master' into develop
2017-06-02 22:52:28 +01:00
Matthew Hodgson
ec71903b6e
Merge branch 'develop' of git+ssh://github.com/vector-im/riot-web into develop
2017-06-02 22:51:39 +01:00
Michael Telatynski
5fb60406b0
add minimum electron version requirement
2017-06-02 22:49:04 +01:00
Matthew Hodgson
5add4a1b95
v0.10.1
2017-06-02 22:48:18 +01:00
Matthew Hodgson
7b7482f21f
Prepare changelog for v0.10.1
2017-06-02 22:48:17 +01:00
Matthew Hodgson
a4526097ce
v0.10.1
2017-06-02 22:46:25 +01:00
Matthew Hodgson
dea012f460
bump to 0.9.1
2017-06-02 22:45:59 +01:00
Matthew Hodgson
49e9d58418
oops, expand the dropdown a bit if possible
2017-06-02 22:10:29 +01:00
Matthew Hodgson
4b92bbe6f4
enable swedish, as it's got bigger than danish & dutch
2017-06-02 22:05:46 +01:00
Michael Telatynski
cb3fa16cd0
install text-encoding-utf-8 so we're not relying on it from react-sdk
...
implicitly/transitively (not nice)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 22:04:01 +01:00
Michael Telatynski
884322f82c
remove unused imports
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 21:57:42 +01:00
Luke Barnard
13262d9a8b
Merge pull request #4163 from vector-im/directory-link-fix
...
Update home.html
2017-06-02 18:08:40 +01:00
Tom Lant
c9bfd6cc9a
Update home.html
2017-06-02 17:40:11 +01:00
David Baker
8f5f4cb9c8
Merge pull request #4160 from vector-im/dbkr/missing_tr_room_dir
...
Add missing translation for room directory
2017-06-02 17:08:55 +01:00
David Baker
4f0fee2cd1
Add missing translation for room directory
...
Also remove newline in translation string.
2017-06-02 17:02:17 +01:00