David Baker
fab50bc1f1
Merge pull request #4176 from vector-im/t3chguy/updating_stuff
...
improve update polling electron and provide a manual check for updates button
2017-06-22 17:36:58 +01:00
David Baker
a1132ca7aa
Merge pull request #4395 from vector-im/rav/fix_braindead_firefox
...
Fix load failure in firefox when indexedDB is disabled
2017-06-22 15:30:01 +01:00
Richard van der Hoff
6e52ab6182
Fix load failure in firefox when indexedDB is disabled
2017-06-22 15:11:11 +01:00
Michael Telatynski
e33e0effa3
use _t
on string literals and i18n 'warning'
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-22 15:05:13 +01:00
Michael Telatynski
0788826a71
Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# electron_app/src/tray.js
2017-06-22 15:04:33 +01:00
Richard van der Hoff
a9c8429d2e
Merge pull request #4362 from turt2live/travis/missed-redact
...
Change missed 'Redact' to 'Remove' in ImageView.
2017-06-22 14:37:31 +01:00
Luke Barnard
c4a3211cfc
Use _tJsx for PasswordNagBar (because it has <u>)
2017-06-20 16:28:40 +01:00
David Baker
8f8b28425d
Fix json fail
2017-06-20 15:55:35 +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
Michael Telatynski
fe1b0b5cd8
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff
2017-06-20 14:32:19 +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
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
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
turt2live
4ae6e9fdfd
Remove 'Redact' from en_US and en_EN as it is no longer needed
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-06-19 16:31:59 -06:00
turt2live
b9fc46fa41
Change missed 'Redact' to 'Remove' in ImageView.
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-06-19 16:24:03 -06: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
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
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
Weblate
bd1b06c9b4
Merge remote-tracking branch 'origin/develop' into develop
2017-06-19 07:57:09 +00:00
Richard van der Hoff
98f8be45b7
Merge pull request #4325 from vector-im/rav/refactor_matrixclient_states
...
Tweak tests to match updates to matrixchat
2017-06-19 08:57:06 +01:00
Richard van der Hoff
641f20a4f6
Tweak tests to match updates to matrixchat
...
Mostly this is just making it look at the `view` state rather than the
individual boolean flags.
One other tweak merits explanation: we now implement the initial
couldn't-register-as-guest login with an explicit switch to the LOGIN view,
which means that the URL gets updated to #/login.
We also now need to give the login panel a bit longer to appear.
2017-06-19 08:55:54 +01:00
Weblate
7cbfa228ee
Merge remote-tracking branch 'origin/develop' into develop
2017-06-18 23:54:13 +00:00
Matthew Hodgson
1c82b7b0c3
add register button
2017-06-19 00:54:07 +01:00
Raul
b7368fa933
Translated using Weblate (Esperanto)
...
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/eo/
2017-06-18 23:30:50 +00:00
Weblate
ecf163d4e7
Merge remote-tracking branch 'origin/develop' into develop
2017-06-18 23:01:19 +00:00
Raul
1a72d3134c
Translated using Weblate (Esperanto)
...
Currently translated at 90.0% (180 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2017-06-18 23:01:18 +00:00
Matthew Hodgson
612cad5d9e
fix broken vars
2017-06-19 00:01:11 +01:00
Weblate
9b1b5b3a4b
Merge remote-tracking branch 'origin/develop' into develop
2017-06-18 22:54:37 +00:00
Matthew Hodgson
6b1ffaff7a
fix broken http status i18n
2017-06-18 23:54:29 +01:00
Raul
82eb69324d
Translated using Weblate (Esperanto)
...
Currently translated at 88.0% (176 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2017-06-18 22:50:33 +00:00
Raul
2fa05f8d61
Translated using Weblate (Esperanto)
...
Currently translated at 87.0% (174 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2017-06-18 22:49:23 +00:00
Matthew Hodgson
6bee3f22da
Merge pull request #4346 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2017-06-18 23:49:20 +01:00
Weblate
396ecf6570
Merge remote-tracking branch 'origin/develop' into develop
2017-06-18 22:45:15 +00:00
Raul
f9ef5e8498
Translated using Weblate (Esperanto)
...
Currently translated at 84.0% (168 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2017-06-18 22:45:15 +00:00
Matthew Hodgson
cf9cd503e5
Merge pull request #4337 from vector-im/t3chguy/fix_forwarding
...
change dispatcher forward_event signature
2017-06-18 23:45:12 +01:00
Szymon Łopaciuk
0e00f708f1
Translated using Weblate (Polish)
...
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/pl/
2017-06-18 22:43:15 +00:00
Raul
a4abccdcef
Translated using Weblate (Esperanto)
...
Currently translated at 83.0% (166 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
2017-06-18 22:43:15 +00:00
Sebastián Magrí
6ace710a65
Translated using Weblate (Spanish)
...
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/es/
2017-06-18 22:42:19 +00:00
Weblate
23b99f83ce
Merge remote-tracking branch 'origin/develop' into develop
2017-06-18 20:37:21 +00:00
Carlos A. Carnero Delgado
8bc2b4a122
Translated using Weblate (Spanish)
...
Currently translated at 74.5% (149 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
2017-06-18 20:37:21 +00:00
GrigRUSS
2b3ec55850
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-18 20:37:21 +00:00
Szymon Łopaciuk
9a203aab67
Translated using Weblate (Polish)
...
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/pl/
2017-06-18 20:37:21 +00:00
IMIN
5cc1f62839
Translated using Weblate (Korean)
...
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/ko/
2017-06-18 20:37:21 +00:00
alxlg
ad57dd3169
Translated using Weblate (Italian)
...
Currently translated at 31.5% (63 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/it/
2017-06-18 20:37:20 +00:00
Aviral Dasgupta
0635a344ae
Translated using Weblate (Hindi)
...
Currently translated at 3.0% (6 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hi/
2017-06-18 20:37:20 +00:00