Commit Graph

9670 Commits (22f2d6f292be9a5c4b8b52d973e20ac7b21f688d)

Author SHA1 Message Date
Luke Barnard d734a9ba6e Null check piwik config before using it
to avoid crashing at login
2018-04-26 13:41:43 +01:00
Luke Barnard 452bf0bd09
Merge pull request #1853 from matrix-org/luke/fix-piwik-page-url-reporting
Track actual window location origin and hash
2018-04-26 13:14:49 +01:00
Luke Barnard 053ef0bc0a PPI->PII 2018-04-26 13:05:59 +01:00
Luke Barnard 6b0af81f71 For paths with variables, insert <redacted>
To preserve the analytics for these pages we did previously
2018-04-26 12:22:56 +01:00
Luke Barnard 6c9bf17bfa
Merge pull request #1855 from matrix-org/dbkr/usercontent_replace_document_origin
Replace document.origin with window.location.origin
2018-04-26 11:05:39 +01:00
Luke Barnard ff4909e6ab Merge branch 'develop' into luke/fix-piwik-page-url-reporting 2018-04-26 11:03:55 +01:00
Luke Barnard 0614ef6abe i18n
for new anayltics modal redesign
2018-04-26 11:00:50 +01:00
Luke Barnard e16c50d4be Explain that full URL is sent to Piwik
Also, redesign analytics modal to be one big table, instead of table +
paragraph.
2018-04-26 10:59:43 +01:00
David Baker 53528f338a Replace document.origin with window.location.origin
document.origin is not a thing on firefox
2018-04-26 10:43:52 +01:00
David Baker e26c3f3dc9 Get variable name right in commented usercontent code 2018-04-26 10:12:50 +01:00
Luke Barnard 1ff11ca493 Make analytics opt-in
If a Riot is upgraded to include this commit, it will stop reporting
analytics unless specified in config.json. The sample config already
contains the configuration required to continue reporting.
2018-04-25 17:19:57 +01:00
Richard Lewis 1fa6f63b0d
Merge pull request #1854 from matrix-org/rxl881/stickerPopout
Optionally hide widget popout button.
2018-04-25 16:32:07 +01:00
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