63695 Commits

Author SHA1 Message Date
Weblate 333d65c032 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 13:05:50 +00:00
Luke Barnard fba1a0c4c7 Merge pull request #1856 from matrix-org/luke/fix-piwik-crash
Null check piwik config before using it
2018-04-26 14:05:46 +01:00
Andrey 5c6b8d748a Translated using Weblate (Russian)
Currently translated at 100.0% (1165 of 1165 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-26 12:46:45 +00:00
Luke Barnard d734a9ba6e Null check piwik config before using it
to avoid crashing at login
2018-04-26 13:41:43 +01:00
Weblate 7212831722 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 12:14:54 +00: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
Weblate a17a9521b4 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 12:06:41 +00:00
Luke Barnard 2dc1c5c618 Merge pull request #6614 from vector-im/dbkr/fix_release_wrapper
Fix args in the release wrapper script
2018-04-26 13:06:34 +01:00
Luke Barnard 053ef0bc0a PPI->PII 2018-04-26 13:05:59 +01:00
David Baker d5a07a446d typo 2018-04-26 12:55:12 +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
David Baker 7232c01a80 Fix args in the release wrapper script
It was assuming the version was always $1 which meant there was no
way to pass options (eg. -x to skip changelog generation) through
to the underlying release script without breaking the wrapper
script.
2018-04-26 12:07:02 +01:00
David Baker b8f7025f2a v0.14.2-rc.2 v0.14.2-rc.2 2018-04-26 11:46:38 +01:00
David Baker 73e4fcafdc v0.14.2-rc.2 2018-04-26 11:44:36 +01:00
David Baker 45661dd960 changelog 2018-04-26 11:37:49 +01:00
David Baker 18ba570c74 Bump react-sdk version 2018-04-26 11:33:44 +01:00
David Baker dafa65823c v0.12.3-rc.3 2018-04-26 11:19:48 +01:00
David Baker a290c6f101 Prepare changelog for v0.12.3-rc.3 2018-04-26 11:19:48 +01:00
David Baker 27b7daca5b Replace document.origin with window.location.origin
document.origin is not a thing on firefox
2018-04-26 11:14:21 +01:00
Weblate f51211ac93 Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 10:05:44 +00: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
Weblate fb9dc8db7d Merge remote-tracking branch 'origin/develop' into develop 2018-04-26 09:13:21 +00:00
David Baker e26c3f3dc9 Get variable name right in commented usercontent code 2018-04-26 10:12:50 +01:00
Szimszon c6c58ebc52 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1162 of 1162 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-04-25 19:17:10 +00:00
David Baker 5923417654 v0.14.2-rc.1 v0.14.2-rc.1 2018-04-25 17:39:56 +01:00
David Baker 8b99a72f2c v0.14.2-rc.1 2018-04-25 17:37:35 +01:00
David Baker 981bd94615 Change CSS dependencies to not hardcoded paths
Add add direct dependencies on the packages they come from, because
referring to them by path like this doesn't work in a frash
checkout / npm install because of how npm lays out the packages.
2018-04-25 17:33:18 +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
Andrey 841fa8b122 Translated using Weblate (Russian)
Currently translated at 100.0% (1162 of 1162 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-04-25 15:40:02 +00:00
David Baker 083dd4eeec Temporarily revert electron version bump 2018-04-25 16:36:16 +01:00
David Baker 8d4d16bde1 Bump react-sdk version 2018-04-25 16:35:13 +01:00
David Baker 78d836e607 v0.12.3-rc.2 2018-04-25 16:33:06 +01:00
David Baker 276c262687 Prepare changelog for v0.12.3-rc.2 2018-04-25 16:33:05 +01:00
Weblate 4cad39bb36 Merge remote-tracking branch 'origin/develop' into develop 2018-04-25 15:32:14 +00: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
Val 2a1f9de323 Translated using Weblate (French)
Currently translated at 100.0% (1162 of 1162 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-04-25 15:07:33 +00:00
David Baker 9146438683 Add res dir to package.json 2018-04-25 16:07:16 +01:00
David Baker 8e218f12b4 Prepare changelog for v0.14.2-rc.1 2018-04-25 15:42:38 +01:00
David Baker 3dcf194960 v0.14.2-rc.1 2018-04-25 15:41:33 +01:00
David Baker ee9f781adc js-sdk & react-sdk RCs 2018-04-25 15:37:24 +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 a08b055a84 v0.12.3-rc.1 2018-04-25 15:33:05 +01:00
David Baker 30e930f192 Prepare changelog for v0.12.3-rc.1 2018-04-25 15:28:12 +01:00
David Baker 1feb2434ef js-sdk rc.1 2018-04-25 15:22:00 +01:00