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

9709 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Lewis
b2d6dd8f6e Optionally hide widget popout button. 2018-04-25 16:28:27 +01:00
Luke Barnard
53016fa16e Report pathname 2018-04-25 16:21:30 +01:00
David Baker
81488b27e2
Merge pull request #1851 from matrix-org/rxl881/popoutWidget 
Add a button to 'pop out' widgets in to their own tab.
 2018-04-25 15:36:07 +01:00
David Baker
dda0df6928
Merge pull request #1852 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-04-25 15:08:19 +01:00
Luke Barnard
3957222da3 Alter hashRegex to expect all handled URLs 2018-04-25 15:06:45 +01:00
Luke Barnard
0f480571e8 Track true origin, do not track unexpected hashes 2018-04-25 15:06:04 +01:00
Richard Lewis
0f0e89d394 Add a button to 'pop out' widgets in to their own tab. 2018-04-25 12:49:30 +01:00
Weblate
18d7be5080 Merge remote-tracking branch 'origin/develop' into develop 2018-04-25 10:35:34 +00:00
Andrey
181b109b8a 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:35:34 +00:00
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
Luke Barnard
88624c8548 Upgrade to mocha 5.05 
primarily for use of `describe.only`
 2018-04-25 09:45:14 +01: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
David Baker
f41d897b9b
Merge pull request #1848 from matrix-org/luke/fix-autocomplete-user-provider-at-query 
Don't autocomplete users for single "@"
 2018-04-24 15:08:37 +01: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
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