Commit Graph

3275 Commits

Author SHA1 Message Date
Dariusz Niemczyk b677edbc58 Make CSS Hot-reload work in a hacky way 2021-08-02 14:38:25 +02:00
RiotRobot 2504c062f1 Reset matrix-react-sdk back to develop branch 2021-08-02 13:20:41 +01:00
RiotRobot 9d356aa931 Reset matrix-js-sdk back to develop branch 2021-08-02 13:20:30 +01:00
RiotRobot e7cb419902 Released js-sdk & react-sdk 2021-08-02 13:10:00 +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 e6e701f5e9 Upgrade matrix-react-sdk to 3.27.0-rc.1 2021-07-27 16:07:21 +01:00
RiotRobot c04daeaa20 Upgrade matrix-js-sdk to 12.2.0-rc.1 2021-07-27 16:06:42 +01:00
RiotRobot 78eb8ffc26 Upgrade matrix-js-sdk to 12.2.0-rc.1 2021-07-27 15:51:16 +01:00
Jaiwanth 0609ebc430 Add raw-loader to moduleNameMapper 2021-07-27 14:45:51 +05:30
Dariusz Niemczyk 9b5db05115 Update ESLint config to 0.3.4 2021-07-27 10:23:36 +02: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 940f44c6d3 manually revert bit of yarn going mad 2021-07-23 18:25:34 +01:00
Michael Telatynski 481f67514b Update matrix-org-eslint-plugin and tighten max warning limit
Whilst it is down, make the most of it!
2021-07-23 16:12:07 +01:00
Michael Telatynski 3c1902c26a Update matrix-org-eslint-plugin 2021-07-23 16:09:41 +01:00
David Baker 25b15d084d yarn upgrade 2021-07-21 15:44:13 +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 7cde32ed2e Update eslint-plugin-matrix-org 2021-07-20 09:15:26 +01:00
Michael Telatynski 53b0ef20f4 Update eslint-plugin-matrix-org 2021-07-20 09:15:25 +01:00
RiotRobot 9d56b56116 Reset matrix-react-sdk back to develop branch 2021-07-19 16:27:02 +01:00
RiotRobot bdb03c4490 Reset matrix-js-sdk back to develop branch 2021-07-19 16:26:51 +01:00
RiotRobot cfa47eec00 Merge branch 'master' into develop 2021-07-19 16:26:38 +01:00
RiotRobot bc07d91810 Upgrade matrix-react-sdk to 3.26.0 2021-07-19 16:19:36 +01:00
RiotRobot 183cf150e8 Upgrade matrix-js-sdk to 12.1.0 2021-07-19 16:19:11 +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
Michael Telatynski 7aca548f65 Add missing stylelint dependencies and run i18n 2021-07-14 18:13:00 +01:00
Michael Telatynski 80bc659b11 Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/ts/c3
 Conflicts:
	src/vector/indexeddb-worker.ts
2021-07-14 17:50:40 +01:00
RiotRobot d4638f8825 Bump to RC versions of js-sdk and react-sdk 2021-07-14 17:20:15 +01:00
RiotRobot d3823305cc Upgrade matrix-js-sdk to 12.1.0-rc.1 2021-07-14 16:21:02 +01:00
Michael Telatynski 609674cc17 Remove node-canvas devDependency 2021-07-12 20:51:22 +01:00
Michael Telatynski d3652996d6 Convert FontManager to TS 2021-07-12 20:45:19 +01:00
Michael Telatynski 66ada58101 Use webpack worker-loader to load the IndexedDB worker instead of homegrown hack 2021-07-12 18:43:21 +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