mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 01:31:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
4954 commits 219 branches 562 tags 474 MiB
Commit graph

4954 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Hodgson
b1475cb309 bump js-sdk 2017-06-01 02:04:46 +01:00
Matthew Hodgson
d021598380 fix typo 2017-06-01 02:04:43 +01:00
Matthew Hodgson
3d91b31637 i18n invited, and delete stale warning 2017-06-01 01:29:07 +01:00
Matthew Hodgson
5e3af22c5d fix broken i18n variable 2017-06-01 01:18:46 +01:00
Matthew Hodgson
b4284cf000 fix up Can't connect to HS i18n with _tJsx 2017-06-01 01:17:39 +01:00
RiotTranslate
ad0cbdd4ff Update from Weblate. (#981) 
* Translated using Weblate (French)

Currently translated at 99.3% (763 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/

* Translated using Weblate (German)

Currently translated at 100.0% (768 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (French)

Currently translated at 100.0% (770 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 26.8% (207 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hans/

* Translated using Weblate (French)

Currently translated at 100.0% (770 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/

* Translated using Weblate (German)

Currently translated at 99.7% (768 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-06-01 00:39:21 +01:00
Matthew Hodgson
cad2f643ea Merge pull request #982 from turt2live/travis/presence-undefined 
Fix rare case where presence duration is undefined
 2017-06-01 00:38:50 +01:00
Matthew Hodgson
a33b60d3a1 Merge pull request #985 from matrix-org/t3chguy/electron_flash 
add concept of platform handling loudNotifications (bings/pings/whatHaveYou)
 2017-06-01 00:08:46 +01:00
Michael Telatynski
8cfa3bc235 add concept of platform handling loudNotifications (bings/pings/whatHaveYou) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-31 23:49:55 +01:00
RiotTranslate
8ec4092074 Merge remote-tracking branch 'origin/develop' into develop 2017-05-31 18:58:42 +00:00
Bamstam
7af2f615bd Translated using Weblate (German) 
Currently translated at 99.7% (768 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-05-31 18:58:42 +00:00
Amandine
30dc5f8117 Translated using Weblate (French) 
Currently translated at 100.0% (770 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
 2017-05-31 18:58:41 +00:00
Iru Cai (vimacs)
f2db6dd168 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 26.8% (207 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hans/
 2017-05-31 18:58:41 +00:00
turt2live
165dfeccb9 Fix rare case where presence duration is undefined & i18n 2017-05-31 11:56:04 -06:00
Matthew Hodgson
92143f2dc2 Merge pull request #984 from matrix-org/rav/i18n_fixes 
Fixes to i18n code
 2017-05-31 18:35:46 +01:00
Richard van der Hoff
cbbed3f544 Fixes to i18n code 2017-05-31 18:31:10 +01:00
Richard van der Hoff
c3d37c1ff9 Call MatrixClient.clearStores on logout 
... to make sure that we don't have any sensitive data sitting around in the
stores.
 2017-05-31 18:28:21 +01:00
Richard van der Hoff
4bc252a16b delint src/Lifecycle 2017-05-31 17:28:08 +01:00
Amandine
e9cb13035b Translated using Weblate (French) 
Currently translated at 100.0% (770 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
 2017-05-31 16:05:37 +00:00
RiotTranslate
ccbfdcc661 Merge remote-tracking branch 'origin/develop' into develop 2017-05-31 15:15:41 +00:00
Bamstam
53502c9640 Translated using Weblate (German) 
Currently translated at 100.0% (768 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-05-31 15:15:41 +00:00
Jean GB
396545b783 Translated using Weblate (French) 
Currently translated at 99.3% (763 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
 2017-05-31 15:15:39 +00:00
Luke Barnard
8192374481 Add missing _t import 2017-05-31 16:02:42 +01:00
Luke Barnard
7abaadddde Merge pull request #977 from matrix-org/luke/session-store-null-on-logout 
Remove cachedPassword from localStorage on_logged_out
 2017-05-31 16:00:24 +01:00
Luke Barnard
b3a862c2c2 Remove redundant reset 2017-05-31 15:32:55 +01:00
Luke Barnard
d0e270bd1c Only re-render LoggedInView if MatrixClientPeg.get() is truthy 2017-05-31 15:15:27 +01:00
Richard van der Hoff
2d73f094ff Delint MatrixChat, again (#979) 
grrr.
 2017-05-31 15:09:09 +01:00
Kegsay
861cae8779 Merge pull request #978 from RiotTranslate/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-05-31 14:12:38 +01:00
Kegsay
ecd58a00c6 Merge pull request #955 from Bitim/feature/rtl-languages-support 
Add partial support for RTL languages
 2017-05-31 14:11:24 +01:00
Kegsay
0f32923427 Merge pull request #975 from coletivoEITA/develop 
Added two strings to translate
 2017-05-31 14:08:49 +01:00
daniel tygel
75d2b2319d translate directly in pt_BR.json 2017-05-31 09:10:19 -03:00
daniel tygel
d4a89cc2df Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-05-31 09:09:27 -03:00
dtygel
3b7b1d6206 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (768 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
 2017-05-31 12:02:33 +00:00
RiotTranslate
b5194cfc80 Merge remote-tracking branch 'origin/develop' into develop 2017-05-31 09:55:58 +00:00
Bamstam
dbf5ec632e Translated using Weblate (German) 
Currently translated at 100.0% (768 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-05-31 09:55:53 +00:00
Jean GB
117e6b8fc3 Translated using Weblate (French) 
Currently translated at 99.2% (762 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
 2017-05-31 09:55:52 +00:00
Luke Barnard
d83f18ab46 Remove cachedPassword from localStorage on_logged_out 
Fixes https://github.com/vector-im/riot-web/issues/4101
 2017-05-31 10:03:16 +01:00
Luke Barnard
532198dd10 Merge pull request #976 from RiotTranslate/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-05-31 09:55:23 +01:00
Kegan Dougal
1ab52652f7 Strip out sanitizeHtml stuff as it's not required 
As per https://github.com/matrix-org/matrix-react-sdk/pull/968#issuecomment-304946341
 2017-05-31 09:29:43 +01:00
RiotTranslate
7ef4257bc1 Merge remote-tracking branch 'origin/develop' into develop 2017-05-31 04:16:25 +00:00
Krombel
a72fe7b2f5 Translated using Weblate (German) 
Currently translated at 100.0% (768 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-05-31 04:16:24 +00:00
Amandine
0c918f242f Translated using Weblate (French) 
Currently translated at 97.7% (751 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
 2017-05-31 04:16:24 +00:00
Matthew Hodgson
7f4bdd4b38 Merge pull request #974 from RiotTranslate/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-05-31 00:39:11 +01:00
Krombel
a5fa479ac5 Translated using Weblate (German) 
Currently translated at 100.0% (768 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-05-30 23:37:59 +00:00
RiotTranslate
549875ba0a Merge remote-tracking branch 'origin/develop' into develop 2017-05-30 23:22:31 +00:00
Amandine
c1cdf79036 Translated using Weblate (French) 
Currently translated at 98.0% (751 of 766 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
 2017-05-30 23:22:30 +00:00
Krombel
12ca5d7288 Translated using Weblate (German) 
Currently translated at 100.0% (766 of 766 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-05-30 23:22:29 +00:00
Matthew Hodgson
3942dbcaff Merge pull request #920 from matrix-org/t3chguy/electron_settings 
Initial Electron Settings - for Auto Launch
 2017-05-30 23:59:24 +01:00
Michael Telatynski
dcd99ac3de Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings 
# Conflicts:
#	src/components/structures/UserSettings.js
#	src/i18n/strings/en_EN.json

First time using JetBrains Merge Tool, MAY HAVE GONE HORRIBLY WRONG

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 23:54:57 +01:00
Michael Telatynski
0d930c0553 change wording and i18n it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 23:46:51 +01:00