mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-21 19:24:23 +03:00
Code Issues Projects Releases Packages Wiki Activity
5519 commits 219 branches 562 tags 474 MiB
Commit graph

5519 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Richard Lewis
dac154f828 Add full width widgets 2017-05-31 10:08:39 +01: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
daniel tygel
f4e5039e70 add string to translate 2017-05-30 19:01:23 -03:00
daniel tygel
12f923bc81 add new string to translate 2017-05-30 18:56:52 -03:00
RiotTranslate
5cb4dbfd4e Merge remote-tracking branch 'origin/develop' into develop 2017-05-30 20:30:35 +00:00
dtygel
8f88dcbf40 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.7% (763 of 765 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
 2017-05-30 20:30:35 +00:00
Bamstam
13fa3ac1f0 Translated using Weblate (German) 
Currently translated at 100.0% (765 of 765 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-05-30 20:30:34 +00:00
Amandine
aa40653d5f Translated using Weblate (French) 
Currently translated at 91.8% (703 of 765 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
 2017-05-30 20:30:34 +00:00
Szimszon
b6bc641b3a Added translation using Weblate (Hungarian) 2017-05-30 20:30:31 +00:00
Matthew Hodgson
c15568e003 remove spurious string 2017-05-30 21:05:26 +01:00
Matthew Hodgson
e30e45a82c Merge branch 'develop' into new-guest-access 2017-05-30 21:05:07 +01:00
Matthew Hodgson
055386d63e Merge pull request #973 from MTRNord/patch-1 
Fix missing string in the room settings
 2017-05-30 20:54:51 +01:00
Marcel
54b8afec38 Fix use of wrong char 2017-05-30 21:47:38 +02:00
Marcel
4d7ac1b828 Fix missing string in the room settings 2017-05-30 21:46:07 +02:00
Matthew Hodgson
797695dc8a Merge pull request #972 from coletivoEITA/develop 
fix error in i18n string
 2017-05-30 20:40:43 +01:00
Matthew Hodgson
507f62a8d4 Merge branch 'develop' into develop 2017-05-30 20:40:35 +01:00
Matthew Hodgson
48a2ad93da fix {integrationsUrl} thinko 2017-05-30 20:32:12 +01:00
daniel tygel
5a4ec1996d fix error in i18n string 2017-05-30 16:29:50 -03:00
Matthew Hodgson
d74de136d6 Merge pull request #970 from RiotTranslate/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-05-30 20:18:55 +01:00
Matthew Hodgson
a9d2a950a8 Merge pull request #971 from turt2live/travis/12hr-hotfixes 
Support 12hr time in full date
 2017-05-30 20:15:39 +01:00
turt2live
583fdfbb9f Support 12hr time in full date 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-05-30 13:12:27 -06:00
Bamstam
4228b23913 Translated using Weblate (German) 
Currently translated at 100.0% (765 of 765 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-05-30 18:58:37 +00:00
dtygel
e97a48d224 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 90.8% (695 of 765 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
 2017-05-30 18:42:53 +00:00