Commit Graph

544 Commits (0941b38b5d8feb1da55671b776629eaf4a257a9f)

Author SHA1 Message Date
James Salter c5ea253181
Revert "Add support for Posthog Analytics under a labs flag" 2021-08-03 07:30:02 +01:00
Jaiwanth 46e2f67f54 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-08-03 10:03:16 +05:30
James Salter a65b41be63
Merge pull request #6495 from matrix-org/posthog-analytics
Add support for Posthog Analytics under a labs flag
2021-08-02 14:46:17 +01:00
RiotRobot d1e7c48125 Upgrade matrix-js-sdk to 12.2.0 2021-08-02 13:05:48 +01:00
Jaiwanth 17e9cf4d2a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-30 12:17:31 +05:30
James Salter e4722ee457 Override posthog type definitions to point to a locally fixed type definition file
Posthog's type definitions refer to types in transitive dependencies we don't want to include.

Clone posthog.d.ts locally, remove the offending types from it, and provide an overriding mapping in tsconfig.

If this proves annoying to maintain, posthog.d.ts could just be an empty file.
2021-07-28 17:14:36 +01:00
James Salter d96e7e3375 Add transitive dev dependencies of posthog
This is needed during tsc lint as posthog imports types from these
libraries into its type definitions
2021-07-28 12:08:55 +01:00
James Salter bd7e2dee3d Merge remote-tracking branch 'origin' into posthog-analytics 2021-07-28 11:13:22 +01:00
RiotRobot 78eb8ffc26 Upgrade matrix-js-sdk to 12.2.0-rc.1 2021-07-27 15:51:16 +01:00
Dariusz Niemczyk 7c9ff40863
Update ESLint Config 2021-07-27 09:52:37 +02:00
Jaiwanth 371d1026fa Add jest-raw-loader 2021-07-27 12:11:08 +05:30
Jaiwanth 57590b9a8a Use raw-loaders to import svgs and exportJS 2021-07-27 11:37:47 +05:30
Jaiwanth 41bc2b6481 Move away from streamsaver(for now) 2021-07-26 22:15:05 +05:30
Jaiwanth b04bfeda33 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-07-26 00:18:56 +05:30
Michael Telatynski 3c1902c26a Update matrix-org-eslint-plugin 2021-07-23 16:09:41 +01:00
David Baker 35e74db25e yarn upgrade 2021-07-21 15:41:16 +01:00
James Salter 2a48d3c9bc First pass at a PosthogAnalytics class 2021-07-21 07:40:39 +01:00
Jaiwanth 1ed316851a Merge upstream and resolve conflicts 2021-07-21 11:35:27 +05:30
Michael Telatynski d8c4ab53e0
Merge pull request #6347 from robintown/emojibase-updates 2021-07-20 12:57:00 +01:00
Jaiwanth 98aa1fe6b3 Move @types/streamsaver to devDependencies 2021-07-20 13:47:51 +05:30
Michael Telatynski 53b0ef20f4 Update eslint-plugin-matrix-org 2021-07-20 09:15:25 +01:00
RiotRobot 13731177a3 Merge branch 'master' into develop 2021-07-19 16:14:58 +01:00
RiotRobot 3335ffa069 Upgrade matrix-js-sdk to 12.1.0 2021-07-19 15:54:25 +01:00
David Baker 99edfc24e5 Update eslint-plugin-matrix-org 2021-07-19 15:26:40 +01:00
Jaiwanth fe2cac56f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-19 12:57:27 +05:30
Robin Townsend 8efb30eb07 Merge branch 'develop' into emojibase-updates 2021-07-16 14:38:10 -04: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
Jaiwanth 6a4e2672f6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-10 19:18:01 +05:30
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 06337e72fa Update lockfile with correct dependencies 2021-07-07 12:10:35 +02:00
Germain Souquet d6c3a22a25 fix lockfiles 2021-07-06 15:10:33 +02:00
Germain Souquet edae9a4844 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 10:19:25 +02:00
Jaiwanth 190ccb6f00 Merge and add export support for the modified MAudioBody 2021-07-02 10:41:04 +05:30
David Baker 1fe0c2ab88 Bump eslint plugin version 2021-07-01 23:45:08 +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 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
Germain Souquet c9fa347015 Upgrade browserlist target versions 2021-07-01 12:27:06 +01:00
Jaiwanth 551639811b Merge and resolve conflicts 2021-06-30 12:29:13 +05:30
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 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
Jaiwanth 544761329c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-24 18:33:30 +05:30
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
Jaiwanth 5fff64f128 Fix types 2021-06-23 12:14:20 +05:30
Jaiwanth b2162c3be9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-23 12:09:46 +05:30
Jaiwanth 438b9d4730 Get rid of jszip and replace it with a custom library 2021-06-23 11:58:50 +05:30
Michael Telatynski bbdc28f56d
Merge pull request #6241 from matrix-org/t3chguy/ts/7 2021-06-22 22:34:15 +01:00
Michael Telatynski 99e3aea1e5 i18n and regen yarn lock 2021-06-22 21:17:33 +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
Jaiwanth 45be4a6d02 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-22 09:27:37 +05:30
RiotRobot d219c92758 Merge branch 'master' into develop 2021-06-21 16:54:40 +01:00
RiotRobot 174a43f1ef Upgrade matrix-js-sdk to 12.0.0 2021-06-21 16:37:49 +01:00
Jaiwanth cff4521106 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-16 10:52:00 +05:30
dependabot[bot] 6ee55bb03c
Bump postcss from 7.0.35 to 7.0.36
Bumps [postcss](https://github.com/postcss/postcss) from 7.0.35 to 7.0.36.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/7.0.35...7.0.36)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-15 16:08:33 +00: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
Germain Souquet 84679cf8ec remove legacy polyfills and unused dependencies 2021-06-11 12:19:14 +01:00
Jaiwanth 6160b11eb8 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-09 16:46:28 +05:30
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
dependabot[bot] dbb8aa47dc
Bump css-what from 5.0.0 to 5.0.1
Bumps [css-what](https://github.com/fb55/css-what) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/fb55/css-what/releases)
- [Commits](https://github.com/fb55/css-what/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: css-what
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-08 20:08:39 +00:00
dependabot[bot] 7155c033f2
Bump trim-newlines from 3.0.0 to 3.0.1
Bumps [trim-newlines](https://github.com/sindresorhus/trim-newlines) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/sindresorhus/trim-newlines/releases)
- [Commits](https://github.com/sindresorhus/trim-newlines/commits)

---
updated-dependencies:
- dependency-name: trim-newlines
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-08 19:20:10 +00:00
Jaiwanth dbb3614374
Merge branch 'develop' into export-conversations 2021-06-08 18:43:03 +05:30
RiotRobot 8ccdf9a3e8 Reset matrix-js-sdk back to develop branch 2021-06-07 17:43:27 +01:00
RiotRobot dd089bf969 Upgrade matrix-js-sdk to 11.2.0 2021-06-07 17:03:05 +01:00
RiotRobot 0c5e8ef381 Upgrade matrix-js-sdk to 11.2.0-rc.1 2021-06-01 16:13:01 +01:00
Jaiwanth 5f1c9d0f88 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-05-31 22:58:11 +05:30
dependabot[bot] d66bafd1a6
Bump ws from 7.4.2 to 7.4.6
Bumps [ws](https://github.com/websockets/ws) from 7.4.2 to 7.4.6.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/7.4.2...7.4.6)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-29 03:12:59 +00:00
Jaiwanth 0ee290648a Add support for firefox 2021-05-25 17:49:18 +05:30
RiotRobot 7123abc122 Reset matrix-js-sdk back to develop branch 2021-05-24 17:26:24 +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
Jaiwanth 3147acec0c Switch completely to TypeScript, updated userColors 2021-05-24 18:01:09 +05:30
Jaiwanth ebdb340a5c Create a basic HTML export tool with support only for text based events 2021-05-21 10:50:56 +05:30
RiotRobot 7d0f3b0d99 Upgrade matrix-js-sdk to 11.1.0-rc.1 2021-05-19 14:33:21 +01:00
Michael Telatynski 00d093b4ff yarn lock 2021-05-19 08:56:14 +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 6c066ee401 Upgrade matrix-js-sdk to 11.0.0 2021-05-17 13:33:45 +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 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 3e534b5d30 Merge branch 'master' into develop 2021-05-10 15:22:12 +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
dependabot[bot] 70b2f841d9
Bump hosted-git-info from 2.8.8 to 2.8.9
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-09 00:09:15 +00:00
Michael Telatynski 74bcb921ff
Merge pull request #5990 from matrix-org/t3chguy/ts/parse5
Add dev dependency for parse5 typings
2021-05-07 13:49:13 +01:00
Michael Telatynski db5c0012c2 Add dev dependency for parse5 typings 2021-05-07 10:11:56 +01:00
dependabot[bot] b37985a5d2
Bump lodash from 4.17.20 to 4.17.21
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 01:13:44 +00:00