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

10123 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ivan Shapovalov
5732b3ac0e Translated using Weblate (Russian) 
Currently translated at 100.0% (1161 of 1161 strings)

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

по аналогии с "the platform you're on" — там нет местоимения
 2018-04-24 10:09:28 +00:00
Ivan Shapovalov
166474d869 Translated using Weblate (Russian) 
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-04-24 10:01:21 +00:00
Weblate
95b3f74790 Merge remote-tracking branch 'origin/develop' into develop 2018-04-24 08:44:11 +00:00
Matthew Hodgson
44bc60105a
Merge pull request #1844 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-04-24 09:44:04 +01:00
Weblate
97a0af2870 Merge remote-tracking branch 'origin/develop' into develop 2018-04-23 18:18:07 +00:00
Szimszon
b6157499a8 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-04-23 18:18:07 +00:00
Luke Barnard
459454f559
Merge pull request #1846 from matrix-org/dbkr/bind_onimageerror 
Bind onImageError in constructor
 2018-04-23 19:17:59 +01:00
David Baker
f5956c87f6 Bind onImageError in constructor 
Tt uses `this` but wasn't bound anywhere so the error handler was
just throwing an exception.
 2018-04-23 18:14:59 +01:00
Weblate
ef3e471766 Merge remote-tracking branch 'origin/develop' into develop 2018-04-23 12:20:13 +00:00
Luke Barnard
0d223bd5e4
Merge pull request #1841 from matrix-org/dbkr/set_display_name_text 
Use mxid as sender name on set display name
 2018-04-23 13:20:06 +01:00
Michael Telatynski
0f11bc62cc
undo code style change 2018-04-23 10:58:39 +01:00
Michael Telatynski
5f920f729b
Reset accidental merge changes 2.0 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-23 10:35:02 +01:00
Michael Telatynski
057815ac9f
Reset accidental merge changes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-23 10:30:14 +01:00
Weblate
414b9e39cb Merge remote-tracking branch 'origin/develop' into develop 2018-04-23 09:15:45 +00:00
Luke Barnard
fa318ef381
Merge pull request #1840 from matrix-org/dbkr/fix_rageshake 
Fix rageshake
 2018-04-23 10:15:39 +01:00
Michael Telatynski
d680d805ce
Merge branch 'develop' into t3chguy/m.relates_to 2018-04-23 10:14:48 +01:00
Osoitz
c32fc677b2 Translated using Weblate (Basque) 
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-04-23 04:18:33 +00:00
Eric Newport
d42fa9d17a Hide inline encryption icons except when hovering over a message 
Closes https://github.com/vector-im/riot-web/issues/2882

This is a redo of https://github.com/matrix-org/matrix-react-sdk/pull/1707 (see associated discussion there and here: https://github.com/vector-im/riot-web/pull/5988)

I tried several times to resolve the conflicts correctly, but could not. Thus, fresh PR.
 2018-04-22 22:30:37 -04:00
Weblate
3ef5b8eb0e Merge remote-tracking branch 'origin/develop' into develop 2018-04-21 19:35:18 +00:00
Matthew Hodgson
44d92bb32e
Merge pull request #1843 from aidalgol/room-avatar-lightbox 
Add UI for displaying room avatars full size
 2018-04-21 20:35:13 +01:00
Szimszon
3d58474295 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-04-21 19:28:43 +00:00
RainSlide
301798a7f5 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 97.5% (1132 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2018-04-21 19:28:42 +00:00
Val
03b46e766b Translated using Weblate (French) 
Currently translated at 99.9% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-04-21 13:09:39 +00:00
Kévin C
9d27cb0751 Translated using Weblate (French) 
Currently translated at 99.9% (1160 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-04-21 13:09:38 +00:00
Slavi Pantaleev
269190266a Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-04-21 11:39:55 +00:00
Szimszon
8ed2dadc3b Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-04-21 06:32:06 +00:00
Aidan Gauland
6a918861bb Add UI for displaying room avatars full size 
Change the onClick action on the RoomAvatar inside RoomHeader so that it brings
up a lightbox with the full-size avatar.
 2018-04-21 15:47:31 +12:00
Jeff Huang
99c4951074 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-04-21 02:44:28 +00:00
Andrey
144ba30e6b Translated using Weblate (Russian) 
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-04-20 18:59:12 +00:00
Krombel
ffba7e0d32 Translated using Weblate (German) 
Currently translated at 100.0% (1161 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-04-20 14:57:44 +00:00
David Baker
196b855cd5 Merge translations from riot-web 
Translations that were added to the riot-web repo after the
containing files had been moved here.
 2018-04-20 15:50:23 +01:00
David Baker
ce3d813c12 Prune i18n 2018-04-20 15:37:19 +01:00
David Baker
6154c13c95 Re-run npm run i18n 2018-04-20 15:35:31 +01:00
David Baker
a3c03de75e
Merge pull request #1842 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-04-20 15:03:32 +01:00
Weblate
54561b655a Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 
Conflicts:
	src/i18n/strings/bg.json
	src/i18n/strings/da.json
	src/i18n/strings/de_DE.json
	src/i18n/strings/eo.json
	src/i18n/strings/eu.json
	src/i18n/strings/gl.json
	src/i18n/strings/it.json
	src/i18n/strings/ja.json
	src/i18n/strings/nl.json
	src/i18n/strings/pl.json
	src/i18n/strings/ru.json
	src/i18n/strings/sk.json
	src/i18n/strings/zh_Hans.json
 2018-04-20 13:57:45 +00:00
adrian-007
105a0d6891 Translated using Weblate (Polish) 
Currently translated at 76.9% (778 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-04-20 13:43:36 +00:00
toriko
53889706d7 Translated using Weblate (Japanese) 
Currently translated at 8.8% (89 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2018-04-20 13:43:36 +00:00
Gergely Bakos
e04c762a50 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-04-20 13:43:36 +00:00
Kévin C
a5f4782964 Translated using Weblate (French) 
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-04-20 13:43:36 +00:00
RainSlide
9685118f16 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 97.0% (981 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2018-04-20 13:43:35 +00:00
David Baker
3b85920424 Use mxid as sender name on set display name 
As it was, "<New name> set their display name to <New name>" which
is unhelpful because you never knew them as "<New name>" before.
They would previously have been displayed with their matrix ID, so
that's what should be here.
 2018-04-20 14:28:20 +01:00
David Baker
3ea5fc9185 Fix rageshake 
aka. Module Variables Are Not Global Variables pt. 319
 2018-04-20 14:06:09 +01:00
Krombel
6177a42dbf Translated using Weblate (German) 
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-04-20 12:07:18 +00:00
Michael Telatynski
941bb94234
fix reply fallback blunder 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-20 10:15:15 +01:00
Michael Telatynski
7e8288f7ae
i18n-gen, i18n-prune 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-20 09:39:14 +01:00
Michael Telatynski
563fc9adc7
fix bad copy-paste from other diff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-20 09:37:25 +01:00
Michael Telatynski
06408f843b
post BigMerge fixup - merge in stuff from riot-web PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-20 09:23:27 +01:00
Michael Telatynski
58cd585e86
start of BigMerge fixup 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-20 09:12:02 +01:00
Val
ccd295bc00 Translated using Weblate (French) 
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-04-20 06:21:09 +00:00
Peter Vágner
b0eb350c41 Translated using Weblate (Slovak) 
Currently translated at 100.0% (1011 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-04-18 15:31:05 +00:00