David Baker
|
8b65b96adf
|
Merge branch 'master' into develop
|
2017-06-22 12:08:14 +01:00 |
|
David Baker
|
cf5cf02529
|
v0.11.4
|
2017-06-22 12:04:49 +01:00 |
|
David Baker
|
26ea8a7494
|
Prepare changelog for v0.11.4
|
2017-06-22 12:04:49 +01:00 |
|
David Baker
|
27d83ba440
|
v0.11.4
|
2017-06-22 12:01:05 +01:00 |
|
David Baker
|
c380e7566a
|
Released js-sdk & react-sdk
|
2017-06-22 11:58:57 +01:00 |
|
David Baker
|
7d3f75ef87
|
Merge pull request #4355 from vector-im/t3chguy/electron/windows_icon_instability
explicit convert to nativeImage to stabilise trayIcon on Windows [Electron]
|
2017-06-21 15:04:36 +01:00 |
|
David Baker
|
79ad89c673
|
Merge pull request #4373 from vector-im/luke/fix-pwd-nagbar-_t
Use _tJsx for PasswordNagBar (because it has <u>)
|
2017-06-21 14:14:15 +01:00 |
|
Richard van der Hoff
|
26a27a6de4
|
Merge pull request #4376 from vector-im/rav/test_log_cleanups
Clean up some log outputs from the integ tests
|
2017-06-20 17:55:42 +01:00 |
|
Richard van der Hoff
|
ca3399df77
|
Clean up some log outputs from the integ tests
|
2017-06-20 17:41:21 +01:00 |
|
Luke Barnard
|
c4a3211cfc
|
Use _tJsx for PasswordNagBar (because it has <u>)
|
2017-06-20 16:28:40 +01:00 |
|
Richard van der Hoff
|
abf21675d5
|
Add some more logging to the tests
... to help diagnose when they fail
|
2017-06-20 16:24:04 +01:00 |
|
David Baker
|
8f8b28425d
|
Fix json fail
|
2017-06-20 15:55:35 +01:00 |
|
Luke Barnard
|
6b5bfe24e6
|
Merge pull request #4367 from vector-im/luke/redesign-user-settings-pwd-warn
CSS for redeisng of password warning
|
2017-06-20 15:24:07 +01:00 |
|
Luke Barnard
|
ae23664a41
|
Merge branch 'develop' into luke/redesign-user-settings-pwd-warn
|
2017-06-20 15:03:10 +01:00 |
|
Luke Barnard
|
bbbb82351f
|
CSS for redeisng of password warning
Now looks like red text
|
2017-06-20 15:01:39 +01:00 |
|
David Baker
|
8dade0d84e
|
Merge pull request #4366 from vector-im/luke/feature-user-settings-password-warning
Give _t to PasswordNagBar, add CSS for UserSettings password warning
|
2017-06-20 14:31:12 +01:00 |
|
Luke Barnard
|
047b255e14
|
Add en_EN translations
|
2017-06-20 13:33:38 +01:00 |
|
David Baker
|
3926e4dd98
|
Merge branch 'master' into develop
|
2017-06-20 13:18:58 +01:00 |
|
David Baker
|
639b17c663
|
v0.11.3
|
2017-06-20 13:15:36 +01:00 |
|
David Baker
|
ea8a49f1b7
|
Prepare changelog for v0.11.3
|
2017-06-20 13:15:35 +01:00 |
|
David Baker
|
eda3f20b26
|
v0.11.3
|
2017-06-20 13:13:28 +01:00 |
|
David Baker
|
6ef32f182a
|
react-sdk 0.9.6
|
2017-06-20 13:13:03 +01:00 |
|
David Baker
|
6bae293bdf
|
Merge pull request #4361 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-20 13:12:14 +01:00 |
|
Luke Barnard
|
d5d29c1c92
|
Give _t to PasswordNagBar, add CSS for UserSettings password warning
Codep https://github.com/matrix-org/matrix-react-sdk/pull/1123
|
2017-06-20 11:23:34 +01:00 |
|
David Baker
|
556ff24c5f
|
Merge pull request #4361 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-20 10:19:34 +01:00 |
|
strixaluco
|
f5d9af9b0b
|
Translated using Weblate (Ukrainian)
Currently translated at 98.0% (196 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
|
2017-06-20 09:00:47 +00:00 |
|
GrigRUSS
|
3ff0ed52b2
|
Translated using Weblate (Russian)
Currently translated at 100.0% (200 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
|
2017-06-20 09:00:47 +00:00 |
|
GrigRUSS
|
133f3d24f5
|
Translated using Weblate (Russian)
Currently translated at 100.0% (200 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
|
2017-06-19 17:18:38 +00:00 |
|
Bamstam
|
241ebe50d2
|
Translated using Weblate (German)
Currently translated at 100.0% (200 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
|
2017-06-19 17:18:38 +00:00 |
|
Matthew Hodgson
|
7fda26f268
|
Merge pull request #4360 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-19 15:43:34 +01:00 |
|
Weblate
|
0729d50e47
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-06-19 13:38:56 +00:00 |
|
Richard van der Hoff
|
f6cbb708b0
|
Merge pull request #4352 from vector-im/rav/test_return_to_app
Test 'return-to-app' functionality
|
2017-06-19 14:38:52 +01:00 |
|
russian
|
8b7692cf3b
|
Translated using Weblate (Russian)
Currently translated at 100.0% (200 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
|
2017-06-19 13:24:27 +00:00 |
|
daniel tygel
|
7523251098
|
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (200 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/
|
2017-06-19 13:23:34 +00:00 |
|
David Baker
|
5b5e6d83d9
|
Merge branch 'master' into develop
|
2017-06-19 13:24:58 +01:00 |
|
David Baker
|
448e33bb65
|
v0.11.2
|
2017-06-19 13:20:45 +01:00 |
|
David Baker
|
88950f29c5
|
Prepare changelog for v0.11.2
|
2017-06-19 13:20:44 +01:00 |
|
David Baker
|
3e279746d5
|
v0.11.2
|
2017-06-19 13:19:09 +01:00 |
|
David Baker
|
f420a18696
|
Released js-sdk & react-sdk
|
2017-06-19 13:12:40 +01:00 |
|
Michael Telatynski
|
78068bfaa0
|
explicit convert to nativeImage to stabilise on Windows
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-06-19 11:58:44 +01:00 |
|
David Baker
|
578fa1c160
|
Merge pull request #4354 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-19 11:40:17 +01:00 |
|
David Baker
|
c9715e02d9
|
Merge remote-tracking branch 'weblate/develop' into develop
|
2017-06-19 11:39:59 +01:00 |
|
David Baker
|
9f7cf463b9
|
Merge pull request #4354 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2017-06-19 11:38:55 +01:00 |
|
Weblate
|
9eca0d2fde
|
Merge remote-tracking branch 'origin/develop' into develop
|
2017-06-19 10:38:05 +00:00 |
|
Nathan van Beelen
|
45bb74d8f6
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (200 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
|
2017-06-19 10:38:04 +00:00 |
|
David Baker
|
07103431a9
|
Merge remote-tracking branch 'weblate/develop' into develop
|
2017-06-19 11:37:55 +01:00 |
|
Matthew Hodgson
|
6e64dd32c8
|
add register button
|
2017-06-19 11:33:44 +01:00 |
|
Matthew Hodgson
|
e3a63c3a6d
|
fix broken vars
|
2017-06-19 11:33:36 +01:00 |
|
Matthew Hodgson
|
79816c5726
|
fix broken http status i18n
|
2017-06-19 11:33:12 +01:00 |
|
Matthew Hodgson
|
c55d292840
|
add new languages
|
2017-06-19 11:32:49 +01:00 |
|