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
Michael Telatynski
d3652996d6
Convert FontManager to TS
2021-07-12 20:45:19 +01: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
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
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