PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
9689 commits 1 branch 0 tags 338 MiB
Commit graph

8146 commits

Author SHA1 Message Date
David Baker
54040659ec Fix cross-origin renderer code in comment 2018-04-25 11:35:08 +01:00
Weblate
6cb4248d84 Merge remote-tracking branch 'origin/develop' into develop 2018-04-25 10:22:53 +00:00
Andrey
6ca0fc2846 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-25 10:22:53 +00:00
Scott Rothrock
84f3faaea0 Translated using Weblate (Japanese) 
Currently translated at 21.1% (246 of 1161 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2018-04-25 10:22:53 +00:00
David Baker
7720585cea
Merge pull request #1849 from matrix-org/dbkr/cross_origin_renderer_origin_lock 
Support origin lock in cross-origin renderer
 2018-04-25 11:22:48 +01:00
Ivan Shapovalov
2421617d3f 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-25 10:12:25 +00:00
Weblate
eb07a0db79 Merge remote-tracking branch 'origin/develop' into develop 2018-04-24 16:59:35 +00:00
Ivan Shapovalov
81d4265ab6 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 16:59:35 +00:00
David Baker
4ced12d407
Merge pull request #1850 from matrix-org/dbkr/contian 
s/contian/contain/g
 2018-04-24 17:59:30 +01:00
David Baker
80837a9199 s/contian/contain/g 
Fixes https://github.com/vector-im/riot-web/issues/6565
 2018-04-24 17:53:23 +01:00
David Baker
79c3335765 Support origin lock in cross-origin renderer 
This adds a URL parameter to the cross-origin renderer that makes
it only accept messages from a given domain. This adds an extra
layer of security to the cross-origin iframe and is backwards
compatible in both directions.
 2018-04-24 16:05:14 +01:00
Weblate
efbbd5ec0e Merge remote-tracking branch 'origin/develop' into develop 2018-04-24 14:08:43 +00:00
Ivan Shapovalov
8c008c244b 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 14:08:43 +00:00
RainSlide
c4a1fa531a 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-24 14:08:42 +00:00
Ivan Shapovalov
d67125d40f 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 13:56:04 +00:00
Ivan Shapovalov
f53b1e9a3d 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 13:43:15 +00:00
Ivan Shapovalov
04d06d42ce 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 13:06:26 +00:00
Ivan Shapovalov
9123ad0659 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 13:05:43 +00:00
Ivan Shapovalov
ae15db8208 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 13:00:21 +00:00
Luke Barnard
a3c407992b Don't autocomplete users for single "@" 2018-04-24 13:59:18 +01:00
Ivan Shapovalov
e3ad75cca6 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 12:52:07 +00:00
Ivan Shapovalov
c097a8239d 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 12:36:01 +00:00
Ivan Shapovalov
4ec1973888 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 12:35:35 +00:00
Ivan Shapovalov
20454b92ab 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:11:18 +00:00
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
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
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
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
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
Walter
7934c50407 Translated using Weblate (Russian) 
Currently translated at 99.9% (1010 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-04-18 15:31:04 +00:00
toriko
7700df4c2d Translated using Weblate (Japanese) 
Currently translated at 7.4% (75 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2018-04-18 15:31:04 +00:00
random
8fc7cc4075 Translated using Weblate (Italian) 
Currently translated at 99.5% (1006 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-04-18 15:31:04 +00:00
Xose M
249edb7b76 Translated using Weblate (Galician) 
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/gl/
 2018-04-18 15:31:04 +00:00
RainSlide
895521f0e8 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 90.8% (918 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-18 15:31:03 +00:00
Matthew Hodgson
92c98aa3e5 displayName should be tracked as static 2018-04-18 16:19:37 +01:00
Matthew Hodgson
f84573ec9f convert HomePage to ES6 and split out the vectory bit 2018-04-18 10:23:32 +01:00
Matthew Hodgson
d91c7f5e54 Add comment about enum hijinks 2018-04-17 16:53:11 +01:00
Matthew Hodgson
ce809e16d9 fix i18n thinko on createTrackedDialog 2018-04-17 16:51:17 +01:00
Matthew Hodgson
eca5a965c5 add i18n which weren't correctly copied over from vector-web by copy-i18n 2018-04-17 16:50:24 +01:00
Peter Vágner
e746fc99d3 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-17 14:04:49 +00:00
Osoitz
1e61091423 Translated using Weblate (Basque) 
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/eu/
 2018-04-17 08:56:11 +00:00
Nathan van Beelen
22f5d5ba6a Translated using Weblate (Dutch) 
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/nl/
 2018-04-16 08:27:51 +00:00
Matthew Hodgson
32dd7f976f merge vector-im/riot-web#5881 into matrix-react-sdk 2018-04-16 00:04:04 +01:00
Matthew Hodgson
4da804fd64 Merge branch 'develop' into matthew/fix_layering 2018-04-15 23:59:09 +01:00
Matthew Hodgson
df564af8bd run prune-i18n to bring the translations back in line with normalised en_EN 2018-04-15 23:18:47 +01:00
Matthew Hodgson
faa1924902 run gen-i18n to normalise en_EN and remove stuff still in vector-web 2018-04-15 23:18:18 +01:00
Matthew Hodgson
cb5ff404e1 fix missing i18n 2018-04-15 23:16:31 +01:00
Matthew Hodgson
a30fdaf293 copy all the i18n over from vector-web via copy-i18n.py 2018-04-15 23:00:38 +01:00
Xose M
33632aaae6 Translated using Weblate (Galician) 
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/gl/
 2018-04-15 19:13:14 +00:00
Matthew Hodgson
610747e76a fix paths and updateCheckStatusEnum 2018-04-13 16:49:59 +01:00
Michael Telatynski
a90bd6cd4f
Allow collapsing ReplyThread from MessageContextMenu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-13 12:28:58 +01:00
Weblate
841bf4f894 Merge remote-tracking branch 'origin/develop' into develop 2018-04-13 09:58:49 +00:00
RainSlide
acf8ea1a65 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 81.0% (819 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-13 09:58:48 +00:00
Michael Telatynski
8b1e411d6b
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-04-13 10:54:09 +01:00
David Baker
ce74099698 Null check node before we pass it to velocity 
As presumably sometimes the node wasn't actually in the DOM for
whatever reason, so don't propagate exceptions out into the app.

Should fix https://github.com/vector-im/riot-web/issues/6515
 2018-04-13 10:44:37 +01:00
Matthew Hodgson
13765632e9 use new rageshake location 2018-04-13 01:36:41 +01:00
Matthew Hodgson
efe466ef75 move rageshake to sdk 2018-04-13 01:34:16 +01:00
Matthew Hodgson
0336d99b9e move VectorConferenceHandler over and use getUpdateCheckStatusEnum via field rather than export 2018-04-13 01:29:38 +01:00
Matthew Hodgson
40a67ca8fe point imports at the new locations 2018-04-13 00:43:44 +01:00
Weblate
8a8a37cef0 Merge remote-tracking branch 'origin/develop' into develop 2018-04-12 10:47:27 +00:00
RainSlide
1c7ff85a4c Translated using Weblate (Chinese (Simplified)) 
Currently translated at 79.8% (807 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-12 10:47:26 +00:00
Michael Telatynski
c77807bd22
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/i18n/strings/en_EN.json
#	src/i18n/strings/eu.json
#	src/i18n/strings/fr.json
#	src/i18n/strings/lv.json
#	src/i18n/strings/ru.json
#	src/i18n/strings/zh_Hant.json
 2018-04-12 09:48:06 +01:00
Matthew Hodgson
70f3804227 move room directory logic over from riot-web 2018-04-11 23:58:46 +01:00
Matthew Hodgson
178fb647ad move notifications logic over from riot-web 2018-04-11 23:58:37 +01:00
Matthew Hodgson
8ab8f76254 move non-Riot-specific components over from riot-web 2018-04-11 23:58:04 +01:00
Travis Ralston
fe2cbc584d Merge branch 'develop' into travis/remove-presence 2018-04-11 15:17:28 -06:00
Weblate
a2a7668840 Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 17:40:48 +00:00
David Baker
979452628f
Merge pull request #1835 from matrix-org/dbkr/fix_firefox_extension_death 
Null check stylesheet href
 2018-04-11 18:40:43 +01:00
David Baker
dbed29a7cc Put Tinter loop body in a try/catch 
So whatever other random ways this process fails in don't cause it
to take out the whole app.
 2018-04-11 18:31:54 +01:00
David Baker
91024007aa Null check stylesheet href 
As commented

Fixes https://github.com/vector-im/riot-web/issues/6489
 2018-04-11 18:20:40 +01:00
Weblate
e8e1fd933f Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 14:47:48 +00:00
Luke Barnard
ab578a5c0c
Merge pull request #1819 from pvagner/jump_to_first_unread_a11y 
TopUnreadMessagesBar a11y
 2018-04-11 15:47:43 +01:00
Weblate
6b9159f3fa Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 10:21:24 +00:00
Luke Barnard
d877384d64
Merge pull request #593 from matrix-org/luke/fix-render-1-1-avatars-when-others-leave 
Use correct 1-1 room avatar after users leave
 2018-04-11 11:21:18 +01:00
Weblate
d01751312a Merge remote-tracking branch 'origin/develop' into develop 2018-04-11 08:45:23 +00:00
Tirifto
1eb732b22e Translated using Weblate (Esperanto) 
Currently translated at 95.0% (961 of 1011 strings)

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

Superflua akuzativo!
 2018-04-11 08:45:22 +00:00
Tirifto
787e0f4558 Translated using Weblate (Esperanto) 
Currently translated at 95.0% (961 of 1011 strings)

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

»De via servilo« jam diras, ke temas pri certa URL. »La« ne  malĝustas, sed ankaŭ ne necesas (laŭ mi).
 2018-04-11 07:35:55 +00:00
Tirifto
522db0c0fd Translated using Weblate (Esperanto) 
Currently translated at 95.0% (961 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2018-04-11 07:35:19 +00:00
Luke Barnard
edb754b76b Use GeminiScrollbarWrapper in Flair settings of UserSettings 2018-04-10 18:08:19 +01:00
Weblate
ab6ac22a5d Merge remote-tracking branch 'origin/develop' into develop 2018-04-10 15:05:59 +00:00
Luke Barnard
fca7325b20 Change comments 2018-04-10 15:56:57 +01:00
Luke Barnard
31e9979285 Add 500ms delay to show membershipBusy for longer 
to avoid a UI that flashes quickly
 2018-04-10 15:31:04 +01:00
Weblate
c012cc1e4c Merge remote-tracking branch 'origin/develop' into develop 2018-04-10 12:40:55 +00:00
Morten Juhl-Johansen Zölde-Fej
018cf0b54d Translated using Weblate (Danish) 
Currently translated at 24.2% (245 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/da/
 2018-04-10 12:40:54 +00:00
David Baker
74c84addea
Merge pull request #1831 from matrix-org/luke/fix-group-join-or-leave-update 
Improve group join/leave feedback
 2018-04-10 13:40:50 +01:00
Luke Barnard
de1073aacb Factor out _closeSettings for cleanliness 2018-04-10 13:28:42 +01:00
Luke Barnard
24d4df87d1 Show membership spinner next to Leave/Join button when leaving/joining 2018-04-10 11:49:59 +01:00
Luke Barnard
0681df71b0 Hide settings after leaving a group 2018-04-10 11:49:35 +01:00
Luke Barnard
42141f7da7 Fetch group data when leaving or joining to update the view 2018-04-10 10:03:54 +01:00
Weblate
674f369d72 Merge remote-tracking branch 'origin/develop' into develop 2018-04-09 22:03:09 +00:00
Matthew Hodgson
0ff2837d7f rename createGroupButton to not be a total misnomer... 2018-04-09 23:02:59 +01:00
Matthew Hodgson
2d8880ec5f patch NPE on Pill when lazyloading members 2018-04-09 23:02:15 +01:00
Weblate
e7929fb281 Merge remote-tracking branch 'origin/develop' into develop 2018-04-09 21:59:56 +00:00
Matthew Hodgson
8537c1d625 rename createGroupButton to not be a total misnomer... 2018-04-09 22:59:46 +01:00
Weblate
09e94e07ae Merge remote-tracking branch 'origin/develop' into develop 2018-04-09 15:57:39 +00:00
Luke Barnard
2da45277cd Update group join button to match new API 2018-04-09 16:57:27 +01:00
Ralitsa Bozhkova
029b2335f4 Translated using Weblate (Bulgarian) 
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/bg/
 2018-04-09 15:04:18 +00:00
Daniel D
91efcd5453 Translated using Weblate (Spanish) 
Currently translated at 57.9% (586 of 1011 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2018-04-09 13:12:19 +00:00
John Huang
92703d008f Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2018-04-09 13:12:19 +00:00
Michael Telatynski
f765db7d16
only clear reply_to_event if there was one to begin with 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-07 12:18:53 +01:00
Weblate
f13fd9ca7b Merge remote-tracking branch 'origin/develop' into develop 2018-04-06 16:58:31 +00:00
David Baker
03016b9fc8
Merge pull request #1828 from matrix-org/luke/fix-redact-avatar 
Make stickers/messages continuations of each other
 2018-04-06 17:58:26 +01:00
Luke Barnard
01dd494f50 Make stickers/messages continuations of each other 2018-04-06 17:47:44 +01:00
Luke Barnard
008572afe1 Revert "Handle non-m.room.message event types." 
This reverts commit f8d7ab10fa.
 2018-04-06 16:42:59 +01:00
Weblate
9b11f2deaa Merge remote-tracking branch 'origin/develop' into develop 2018-04-06 14:55:36 +00:00
Luke Barnard
1e586428ac Update to match is_openly_joinable API 2018-04-06 14:58:10 +01:00
Weblate
d1c7187db0 Merge remote-tracking branch 'origin/develop' into develop 2018-04-06 10:24:36 +00:00
Luke Barnard
fb9b376cb8
Merge pull request #1826 from matrix-org/luke/fix-leaking-features-to-guests 
Fix to prevent guests from seeing features
 2018-04-06 11:24:32 +01:00
Weblate
40b71a681f Merge remote-tracking branch 'origin/develop' into develop 2018-04-06 10:15:10 +00:00