Commit Graph

62531 Commits

Author SHA1 Message Date
Luke Barnard cc87b73de2 Merge pull request #1909 from matrix-org/dbkr/fix_image_size_jump
Fix image size jumping regression
2018-05-17 16:56:51 +01:00
David Baker a7006307bf Call afterComponentDidMount() after componentDidMount 2018-05-17 16:50:16 +01:00
David Baker e53497421e Fix image size jumping regression
Fixes https://github.com/vector-im/riot-web/issues/6654
2018-05-17 16:47:17 +01:00
Matthew Hodgson e51554c626 actually hook up RTE 2018-05-17 02:13:17 +01:00
Matthew Hodgson ae208da805 nudge towards supporting formatting buttons in MD 2018-05-17 00:01:23 +01:00
Luke Barnard fb79c57ec6 Specify valid address types to "Start a chat" dialog
fixes https://github.com/vector-im/riot-web/issues/5459
2018-05-16 18:57:53 +01:00
David Baker 6bfc90bbe1 Merge pull request #6528 from aidalgol/string-translation-change-doc
Add instructions for changing translated strings
2018-05-16 16:51:56 +01:00
David Baker 4e6c2fdd1c v0.15.1 v0.15.1 2018-05-16 16:16:23 +01:00
David Baker 25439702bb Prepare changelog for v0.15.1 2018-05-16 16:16:23 +01:00
David Baker 145fb69bdd v0.15.1 2018-05-16 16:12:07 +01:00
Luke Barnard 445badf4fc Merge branch 'luke/opt-in-analytics' of github.com:matrix-org/matrix-react-sdk into luke/opt-in-analytics 2018-05-16 15:58:04 +01:00
Luke Barnard 0bda607bb2 Only show cookie bar if analytics configured 2018-05-16 15:53:43 +01:00
Luke Barnard d15051a635 Add policyLink configuration to piwik
Also:
 - Make CookieBar ES6 class
 - Alter phrasing on CookieBar
 - Conditionaly display longer "...(See our ++cookie and privacy
   policies++)." if policy link is configured.
2018-05-16 15:49:23 +01:00
David Baker f759bfb1f6 Bump to Electron 2.0.0(!) 2018-05-16 15:30:42 +01:00
Luke Barnard 4e6594d64b Allow arbitrary hrefs for cookie/privacy links 2018-05-16 15:20:38 +01:00
Luke Barnard d01e738839 Fix UserSettings for new analyticsOptIn 2018-05-16 15:20:38 +01:00
Luke Barnard aa4bbbc3db Remove cookie bar setting from UserSettings 2018-05-16 15:20:38 +01:00
Luke Barnard ac1cd384e7 Implement opt-in analytics with cookie bar 2018-05-16 15:20:38 +01:00
David Baker fb87d97d25 Fix hoek version in package-lock.json 2018-05-16 15:17:12 +01:00
David Baker 0a4614247f v0.15.0 v0.15.0 2018-05-16 11:56:07 +01:00
David Baker 790eeb1a09 Prepare changelog for v0.15.0 2018-05-16 11:56:06 +01:00
David Baker 6640e709f8 v0.15.0 2018-05-16 11:54:58 +01:00
David Baker c4ecf40d1c Released react-sdk 2018-05-16 11:54:29 +01:00
Weblate f63bef109c Merge remote-tracking branch 'origin/develop' into develop 2018-05-16 10:53:59 +00:00
Kenneth Larsson c5c3c51cf0 Translated using Weblate (Swedish)
Currently translated at 69.9% (820 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2018-05-16 10:53:59 +00:00
David Baker bf0ec249b6 v0.12.4 2018-05-16 11:49:06 +01:00
David Baker 7bd9863e6a Prepare changelog for v0.12.4 2018-05-16 11:49:05 +01:00
Slavi Pantaleev 5b26a56b9a Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1172 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-05-16 09:43:26 +00:00
Luke Barnard e98b31958b Allow arbitrary hrefs for cookie/privacy links 2018-05-16 10:41:18 +01:00
Osoitz 05c469399d Translated using Weblate (Basque)
Currently translated at 100.0% (1172 of 1172 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-05-16 08:58:10 +00:00
David Baker 02ab1fded2 v0.15.0-rc.6 v0.15.0-rc.6 2018-05-15 18:08:52 +01:00
David Baker b2eebeee18 Prepare changelog for v0.15.0-rc.6 2018-05-15 18:08:51 +01:00
David Baker f2bd4a4b5c v0.15.0-rc.6 2018-05-15 18:06:44 +01:00
David Baker ecfefd6b21 react-sdk rc.6 2018-05-15 18:06:11 +01:00
David Baker a0b6bd183c v0.12.4-rc.6 2018-05-15 18:03:40 +01:00
David Baker 1a3777ad0c Prepare changelog for v0.12.4-rc.6 2018-05-15 18:03:40 +01:00
Weblate 29cf079561 Merge remote-tracking branch 'origin/develop' into develop 2018-05-15 16:40:32 +00:00
David Baker 9dd90fb63f Merge pull request #1907 from matrix-org/dbkr/wait_for_widget_delete
Wait for deletion of widgets as well addition
2018-05-15 17:39:53 +01:00
David Baker fadf264a1b Rename uses of function too 2018-05-15 17:34:02 +01:00
David Baker e4a221e42d More helpful function name 2018-05-15 17:28:55 +01:00
David Baker bb5ae741bc Wait for deletion of widgets as well addition
We were previously waiting for them to appear which is silly if we
were deleting them.
2018-05-15 17:12:59 +01:00
Weblate e410b7a5ab Merge remote-tracking branch 'origin/develop' into develop 2018-05-15 15:30:47 +00:00
Luke Barnard 50e430d8dc v0.15.0-rc.5 v0.15.0-rc.5 2018-05-15 16:01:39 +01:00
Luke Barnard 96cc5154cd Prepare changelog for v0.15.0-rc.5 2018-05-15 16:01:39 +01:00
Luke Barnard e9f0f84152 v0.15.0-rc.5 2018-05-15 15:59:02 +01:00
Luke Barnard db092c81d3 v0.12.4-rc.5 2018-05-15 15:54:15 +01:00
Luke Barnard b64e10a095 Prepare changelog for v0.12.4-rc.5 2018-05-15 15:54:14 +01:00
Luke Barnard 7eb14ad12c Bump react-sdk version to 0.12.4-rc.5 2018-05-15 15:54:07 +01:00
Luke Barnard c191464e97 Fix UserSettings for new analyticsOptIn 2018-05-15 15:39:12 +01:00
Luke Barnard 0c22343bb8 Remove cookie bar setting from UserSettings 2018-05-15 15:38:47 +01:00