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
e136afe2eb
Conform to new typescript eslint rules
2021-07-19 22:47:32 +01:00
Michael Telatynski
ce78cdf4ad
Conform to new react and typescript eslint rules
2021-07-19 22:43:11 +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
d75b0b4ee8
v1.7.33
2021-07-19 16:22:37 +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
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
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
26fef6f294
actually run the new test and remove unrelated tweak
2021-07-16 13:45:10 +01:00
Michael Telatynski
2194e4cc10
fix path to worker mock
2021-07-14 19:05:57 +01:00
Michael Telatynski
43afa4c1e0
Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/ts/c4
2021-07-14 18:57:50 +01:00
Michael Telatynski
322c957f7f
ignore workers for jest tests because it disagrees with worker-loader
2021-07-14 18:56:35 +01: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
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
d58c4deebb
v1.7.33-rc.1
2021-07-14 17:25:04 +01:00
RiotRobot
d4638f8825
Bump to RC versions of js-sdk and react-sdk
2021-07-14 17:20:15 +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
202f3de54b
Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/ts/c4
2021-07-13 15:46:28 +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
Michael Telatynski
629630a086
Update Modernizr and stop it from polluting classes on the html tag
2021-07-09 11:49:07 +01: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
4c28a7f485
back to develop dependencies
2021-07-05 16:41:50 +01:00
RiotRobot
0b5e7da2d9
Merge branch 'master' into develop
2021-07-05 16:39:17 +01:00
RiotRobot
6d46ed8082
v1.7.32
2021-07-05 16:33:39 +01:00
RiotRobot
538837decf
Upgrade matrix-react-sdk to 3.25.0
2021-07-05 16:30:38 +01:00
RiotRobot
56fbfc1648
Upgrade matrix-js-sdk to 12.0.1
2021-07-05 16:30:20 +01: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
Jaiwanth
190ccb6f00
Merge and add export support for the modified MAudioBody
2021-07-02 10:41:04 +05:30
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
