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
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
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
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
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
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
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
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
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
Jaiwanth
551639811b
Merge and resolve conflicts
2021-06-30 12:29:13 +05:30
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
Jaiwanth
544761329c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-24 18:33:30 +05:30
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
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
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
Jaiwanth
45be4a6d02
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-22 09:27:37 +05:30
