Commit Graph

1307 Commits (2e4fca1414759cb23971341ba60e1d4b79c0dc12)

Author SHA1 Message Date
Michael Telatynski d8c4ab53e0
Merge pull request #6347 from robintown/emojibase-updates 2021-07-20 12:57:00 +01:00
Michael Telatynski ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00
RiotRobot 676d2aa187 Resetting package fields for development 2021-07-19 16:16:18 +01:00
RiotRobot 13731177a3 Merge branch 'master' into develop 2021-07-19 16:14:58 +01:00
RiotRobot e7ad33db0f v3.26.0 2021-07-19 16:00:26 +01:00
RiotRobot 3335ffa069 Upgrade matrix-js-sdk to 12.1.0 2021-07-19 15:54:25 +01:00
Robin Townsend 8efb30eb07 Merge branch 'develop' into emojibase-updates 2021-07-16 14:38:10 -04:00
Michael Telatynski 296d5d1d5e stub out workers for jest tests as it doesn't like the worker-loader 2021-07-14 18:50:01 +01:00
RiotRobot 0fe91c07b8 v3.26.0-rc.1 2021-07-14 16:27:35 +01:00
RiotRobot d3823305cc Upgrade matrix-js-sdk to 12.1.0-rc.1 2021-07-14 16:21:02 +01:00
Michael Telatynski d3652996d6 Convert FontManager to TS 2021-07-12 20:45:19 +01:00
Germain Souquet 36ba65b534 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-12 13:00:34 +02:00
Robin Townsend 718887dd27 Update Emojibase and switch to IamCal (Slack-style) shortcodes
for consistency with shortcodes commonly used by other platforms, as
was decided in https://github.com/vector-im/element-web/issues/13857.

One thing to be aware of is that the currently used version of Twemoji
does not support a few of the newer emoji present in Emojibase, so these
look a little out of place in the emoji picker. Optimally Twemoji would
be updated at the same time, though I don't know how to do that.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-10 23:13:48 -04:00
Michael Telatynski d8bf618d73 unrelated: move @types/commonmark to devDeps 2021-07-07 20:08:52 +01:00
Michael Telatynski 4ce3723e84 Switch to blurhash-react instead of homegrown component
this has the advantage of resolution scaling logic to do more gpu accelerated scaling
2021-07-07 20:00:31 +01:00
Germain Souquet edae9a4844 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 10:19:25 +02:00
RiotRobot 7b4fd161e5 Reset fields for development 2021-07-05 16:27:07 +01:00
RiotRobot f1b4d72cec Merge branch 'master' into develop 2021-07-05 16:25:02 +01:00
RiotRobot 8baa92f2b1 v3.25.0 2021-07-05 15:07:00 +01:00
RiotRobot 2fa2877aed Upgrade matrix-js-sdk to 12.0.1 2021-07-05 15:00:00 +01:00
David Baker 6aa0a4428e Merge remote-tracking branch 'origin/develop' into dbkr/tests_lint 2021-07-01 23:11:43 +01:00
David Baker f96553615e
Merge pull request #6303 from matrix-org/dbkr/tsify_markdown
Convert Markdown to TypeScript
2021-07-01 23:09:27 +01:00
David Baker 536e3aadd7 Merge remote-tracking branch 'origin/develop' into dbkr/tests_lint 2021-07-01 21:39:17 +01:00
David Baker c1310bcd9f Better types 2021-07-01 21:31:17 +01:00
Michael Telatynski 1f337b28ac Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
 Conflicts:
	src/ContentMessages.tsx
	src/components/structures/UploadBar.tsx
	src/components/views/messages/MImageBody.js
	src/components/views/messages/MStickerBody.js
	src/components/views/messages/MVideoBody.tsx
2021-07-01 20:48:34 +01:00
David Baker ee9be5438e eslint --fix 2021-07-01 20:43:05 +01:00
RiotRobot a48d453be1 v3.25.0-rc.1 2021-06-29 14:43:01 +01:00
RiotRobot 18407fbce9 Upgrade matrix-js-sdk to 12.0.1-rc.1 2021-06-29 14:36:24 +01:00
J. Ryan Stinnett 71116bfa27 Migrate to `eslint-plugin-matrix-org`
This migrates to the new plugin form of our custom ESLint configs. As part of
this, some packages are de-duplicated, configs streamlined, etc.
2021-06-29 12:51:13 +01:00
J. Ryan Stinnett 2d3163fef5 Remove Flow support
We no longer use Flow, so this removes linting and compiling support. New code
should use TypeScript for static typing.
2021-06-29 12:31:44 +01:00
Germain Souquet 31a363d03b mock canvas filter polyfill in tests 2021-06-25 10:49:28 +01:00
Germain Souquet 6d293d1092 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-06-25 09:43:54 +01:00
Germain Souquet 652ad3617d Backdrop filter compatibility for Firefox and Safari 2021-06-25 09:20:03 +01:00
Michael Telatynski f965d449b8
Merge pull request #6249 from SimonBrandner/ts/member-list 2021-06-24 13:25:59 +01:00
Travis Ralston e290fdaabc Update widget-api for https://github.com/matrix-org/matrix-react-sdk/pull/6178 2021-06-23 11:21:56 -06:00
Šimon Brandner b7a821a9e4
.tsx can also be tests
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 16:00:13 +02:00
Germain Souquet 057f46ad9d fix dependency and lockfile mismatch 2021-06-23 08:44:48 +01:00
Michael Telatynski bbdc28f56d
Merge pull request #6241 from matrix-org/t3chguy/ts/7 2021-06-22 22:34:15 +01:00
Michael Telatynski 6e3c647109 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
 Conflicts:
	package.json
	src/components/views/spaces/SpacePanel.tsx
	src/i18n/strings/en_EN.json
	src/stores/SpaceStore.tsx
	yarn.lock
2021-06-22 21:15:53 +01:00
Michael Telatynski 28c61cca27 Remove pinned resolution for @types/react to 16.x 2021-06-22 17:56:52 +01:00
Michael Telatynski a839d0f396 More typescript conversion 2021-06-22 17:23:13 +01:00
Michael Telatynski deb075777d Upgrade @types/react and @types/react-dom 2021-06-22 08:17:22 +01:00
RiotRobot 54c3832b5b Resetting package fields for development 2021-06-21 16:54:41 +01:00
RiotRobot d89710defe v3.24.0 2021-06-21 16:53:20 +01:00
RiotRobot 174a43f1ef Upgrade matrix-js-sdk to 12.0.0 2021-06-21 16:37:49 +01:00
RiotRobot 2eb7d35ea1 v3.24.0-rc.1 2021-06-15 16:22:34 +01:00
RiotRobot b3912dc5b8 Upgrade matrix-js-sdk to 12.0.0-rc.1 2021-06-15 16:16:42 +01:00
Michael Telatynski 660a849cdd Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
 Conflicts:
	package.json
	src/ContentMessages.tsx
	yarn.lock
2021-06-15 12:58:29 +01:00
Germain Souquet 4a23ebae1e upgrade matrix-react-test-utils for react 17 peer deps 2021-06-15 12:00:44 +01:00
Michael Telatynski 66fce64ee0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
 Conflicts:
	package.json
	yarn.lock
2021-06-14 21:39:06 +01:00
Germain Souquet 84679cf8ec remove legacy polyfills and unused dependencies 2021-06-11 12:19:14 +01:00
Germain Souquet 6e0a908c59 Merge branch 'develop' into gsouquet/react-17 2021-06-09 12:01:35 +01:00
Germain Souquet 85d1bb65c6 Upgrade to React@17 2021-06-09 11:40:20 +01:00
RiotRobot 8ccdf9a3e8 Reset matrix-js-sdk back to develop branch 2021-06-07 17:43:27 +01:00
RiotRobot bcd0ba8d45 Resetting package fields for development 2021-06-07 17:42:46 +01:00
RiotRobot a3dac02e4c v3.23.0 2021-06-07 17:41:18 +01:00
RiotRobot dd089bf969 Upgrade matrix-js-sdk to 11.2.0 2021-06-07 17:03:05 +01:00
Michael Telatynski e334ce8192 First cut of space panel drag-and-drop ordering 2021-06-03 08:32:36 +01:00
Michael Telatynski 0b7d3f007a Remove react-beautiful-dnd 2021-06-01 17:35:31 +01:00
RiotRobot 300b0016d6 v3.23.0-rc.1 2021-06-01 16:18:26 +01:00
RiotRobot 0c5e8ef381 Upgrade matrix-js-sdk to 11.2.0-rc.1 2021-06-01 16:13:01 +01:00
RiotRobot 7123abc122 Reset matrix-js-sdk back to develop branch 2021-05-24 17:26:24 +01:00
RiotRobot f8ef2d42f5 Resetting package fields for development 2021-05-24 17:25:58 +01:00
RiotRobot fbc01d4930 v3.22.0 2021-05-24 17:20:31 +01:00
RiotRobot ad30e89967 Upgrade matrix-js-sdk to 11.1.0 2021-05-24 17:15:16 +01:00
Hubert Chathi 140258d3d6 bump to olm 3.2.3 2021-05-24 16:29:54 +01:00
Hubert Chathi 73221e4d08 Bump libolm version. 2021-05-24 16:29:54 +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 7cdca77f39 Update widget-api 2021-05-17 16:27:48 -06: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
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 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 49f1dd37f2 Merge remote-tracking branch 'origin/develop' into jryans/upgrade-sanitize-types 2021-05-11 09:42:58 +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 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
Michael Telatynski db5c0012c2 Add dev dependency for parse5 typings 2021-05-07 10:11:56 +01: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
RiotRobot efc8c8c84e v3.20.0-rc.1 2021-05-04 15:53:40 +01:00
RiotRobot b777c83c90 Upgrade matrix-js-sdk to 10.1.0-rc.1 2021-05-04 15:42:45 +01:00
J. Ryan Stinnett 69f797eda4 Add test coverage collection script
This makes it clear to how collect basic test coverage when desired.
2021-04-28 14:17:57 +01:00
Germain 4d5fd3ec73
Merge pull request #5913 from matrix-org/gsouquet-desktop-i18n 2021-04-27 15:48:49 +01:00
Germain Souquet c08fe6aa22 Upgrade matrix-web-i18n to use matrix prefixed binaries 2021-04-27 15:09:26 +01:00
RiotRobot 3817aaeaca Reset matrix-js-sdk back to develop branch 2021-04-26 17:50:40 +01:00
RiotRobot c3f9bce016 Resetting package fields for development 2021-04-26 17:50:19 +01:00
RiotRobot 87e3ad303f v3.19.0 2021-04-26 17:47:10 +01:00
RiotRobot a79b0e9327 Upgrade matrix-js-sdk to 10.0.0 2021-04-26 17:42:04 +01:00