Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
69,131 Commits 1 Branch 646 Tags
develop
Commit Graph

5614 Commits

Author SHA1 Message Date
RiotRobot 1ef1c4fbae Upgrade matrix-js-sdk to 11.1.0-rc.1 2021-05-19 14:44:08 +01:00
RiotRobot 10bc96dc37 v3.22.0-rc.1 2021-05-19 14:40:37 +01:00
RiotRobot 7d0f3b0d99 Upgrade matrix-js-sdk to 11.1.0-rc.1 2021-05-19 14:33:21 +01:00
Michael Telatynski bf01ebae6d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash 
 Conflicts:
	package.json
	src/components/views/messages/MImageBody.js
	yarn.lock
 2021-05-18 13:48:40 +01:00
Travis Ralston 51b380da65 Update matrix-widget-api/react-sdk dependency reference 
To fix inevitable build errors.
 2021-05-17 16:39:04 -06:00
Travis Ralston 7cdca77f39 Update widget-api 2021-05-17 16:27:48 -06:00
RiotRobot c41ba297e3 Reset matrix-react-sdk back to develop branch 2021-05-17 14:00:39 +01:00
RiotRobot e565044aa3 Reset matrix-js-sdk back to develop branch 2021-05-17 14:00:27 +01:00
RiotRobot 304fccaec4 Merge branch 'master' into develop 2021-05-17 14:00:15 +01:00
RiotRobot 4e0ea04d3c v1.7.28 2021-05-17 13:57:04 +01:00
RiotRobot 0cd7d9a57d Upgrade matrix-react-sdk to 3.21.0 2021-05-17 13:52:21 +01:00
RiotRobot 8ce7de3b1c Upgrade matrix-js-sdk to 11.0.0 2021-05-17 13:51:42 +01:00
RiotRobot 12a9ce1a94 Reset matrix-js-sdk back to develop branch 2021-05-17 13:50:34 +01:00
RiotRobot 9d46fa7b99 Resetting package fields for development 2021-05-17 13:50:24 +01:00
RiotRobot f5a6864ca9 Merge branch 'master' into develop 2021-05-17 13:50:23 +01:00
RiotRobot 3673292c34 v3.21.0 2021-05-17 13:49:00 +01:00
RiotRobot 6c066ee401 Upgrade matrix-js-sdk to 11.0.0 2021-05-17 13:33:45 +01:00
Šimon Brandner 009a56cee7 Merge branch 'develop' into https 2021-05-12 10:05:06 +02:00
Travis Ralston c00abd6add Merge pull request #17193 from vector-im/travis/voicemessages/safari 
Add required webpack+jest config to load Safari support modules
 2021-05-11 10:12:36 -06:00
Travis Ralston d1cfde6f12 Merge pull request #5989 from matrix-org/travis/voicemessages/safari 
Support voice messages on Safari
 2021-05-11 10:12:31 -06:00
RiotRobot 5eaaf34fe2 v1.7.28-rc.1 2021-05-11 16:47:53 +01:00
RiotRobot 4cb245b8d8 Upgrade matrix-react-sdk to 3.21.0-rc.1 2021-05-11 16:42:44 +01:00
RiotRobot 9502a11f6d Upgrade matrix-js-sdk to 11.0.0-rc.1 2021-05-11 16:41:56 +01:00
RiotRobot 392505e7a1 v3.21.0-rc.1 2021-05-11 16:36:53 +01:00
RiotRobot 965b0ab58d Upgrade matrix-js-sdk to 11.0.0-rc.1 2021-05-11 16:28:00 +01:00
J. Ryan Stinnett 4acde37698 Merge remote-tracking branch 'origin/develop' into jryans/sanitize-upgrade 2021-05-11 09:51:35 +01:00
J. Ryan Stinnett 49f1dd37f2 Merge remote-tracking branch 'origin/develop' into jryans/upgrade-sanitize-types 2021-05-11 09:42:58 +01:00
Šimon Brandner 49bcf02db3 Merge remote-tracking branch 'upstream/develop' into https 2021-05-11 07:11:31 +02:00
J. Ryan Stinnett dbd4e209d3 Switch back to release version of sanitize-html 
The limit depth option has been available in a released version for a while now.
 2021-05-10 17:48:06 +01:00
J. Ryan Stinnett 3e68d73597 Upgrade sanitize types 2021-05-10 17:43:10 +01:00
J. Ryan Stinnett 7821e00bc6 Revert to internal option 2021-05-10 17:36:33 +01:00
J. Ryan Stinnett f41fc7e46c Upgrade cheerio and resolve type errors 
This helps resolve some type errors with `domhandler`. In addition, we convert
to the new way of using `htmlparser2` with `cheerio`.
 2021-05-10 16:10:39 +01:00
RiotRobot 10d5855bba Reset matrix-react-sdk back to develop branch 2021-05-10 15:33:40 +01:00
RiotRobot 182ec9cdb4 Reset matrix-js-sdk back to develop branch 2021-05-10 15:33:29 +01:00
RiotRobot c07f2e1c18 Merge branch 'master' into develop 2021-05-10 15:33:16 +01:00
RiotRobot 93e6abefed v1.7.27 2021-05-10 15:29:37 +01:00
RiotRobot 25f2859a95 Upgrade matrix-react-sdk to 3.20.0 2021-05-10 15:26:39 +01:00
RiotRobot 64c44aef8e Upgrade matrix-js-sdk to 10.1.0 2021-05-10 15:23:51 +01:00
RiotRobot 1b372b17e0 Reset matrix-js-sdk back to develop branch 2021-05-10 15:23:03 +01:00
RiotRobot 82642f17fd Resetting package fields for development 2021-05-10 15:22:30 +01:00
RiotRobot 3e534b5d30 Merge branch 'master' into develop 2021-05-10 15:22:12 +01:00
RiotRobot f68013524c v3.20.0 2021-05-10 15:02:08 +01:00
J. Ryan Stinnett 7f4c525d62 Switch back to release version of sanitize-html 
The limit depth option has been available in a released version for a while now.
 2021-05-10 14:57:35 +01:00
RiotRobot a11c3a22c9 Upgrade matrix-js-sdk to 10.1.0 2021-05-10 14:55:31 +01:00
Šimon Brandner 63f370c2db Merge branch 'develop' into https 2021-05-09 08:43:04 +02:00
Michael Telatynski db5c0012c2 Add dev dependency for parse5 typings 2021-05-07 10:11:56 +01:00
Travis Ralston 6c8d52f8df Add jest config too 2021-05-06 22:14:33 -06:00
Travis Ralston 65f591b69b Make the tests happier 
Here we just override the workers because we're not expecting to be able to test them this way. The code paths involved shouldn't be touched.
 2021-05-06 22:08:00 -06:00
Travis Ralston b260621aff Disable host checking on the webpack dev server 
This is useful when you're doing cross-browser testing on a service which demands you use "localhost.com" for reasons.
 2021-05-06 21:51:43 -06:00
dependabot[bot] 90825eac79 Bump ua-parser-js from 0.7.23 to 0.7.24 
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.23 to 0.7.24.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.23...0.7.24)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-06 22:24:19 +00:00