Commit graph

3339 commits

Author SHA1 Message Date
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
c2dea5a19f Reset matrix-react-sdk back to develop branch 2021-06-21 17:05:37 +01:00
RiotRobot
fe39de5126 Reset matrix-js-sdk back to develop branch 2021-06-21 17:05:26 +01:00
RiotRobot
1b48f4857a Upgrade matrix-react-sdk to 3.24.0 2021-06-21 16:58:14 +01:00
RiotRobot
57090243e1 Upgrade matrix-js-sdk to 12.0.0 2021-06-21 16:57:52 +01:00
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
RiotRobot
e98a183978 Upgrade matrix-react-sdk to 3.24.0-rc.1 2021-06-15 17:26:25 +01:00
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
d23b30023a Upgrade matrix-js-sdk to 12.0.0-rc.1 2021-06-15 16:24:37 +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
4dcfd7c0dd fix lockfile dependencies for matrix-react-sdk 2021-06-15 12:51:10 +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
2ffb1a6015 upgrade matrix-react-test-utils for react 17 peer deps 2021-06-15 11:59:33 +01:00
J. Ryan Stinnett
b96a1551e1 Shake yarn.lock 2021-06-11 16:35:08 +01:00
Germain Souquet
84679cf8ec remove legacy polyfills and unused dependencies 2021-06-11 12:19:14 +01:00
Germain
c57feada47
Merge pull request #17601 from vector-im/gsouquet/react-17
⚛️ Upgrade to React@17
2021-06-10 10:13:30 +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
4b8a05a667 Upgrade to React@17 2021-06-09 11:40:36 +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
2784bc7916 Reset matrix-react-sdk back to develop branch 2021-06-07 17:52:34 +01:00
RiotRobot
8fc12bddd7 Reset matrix-js-sdk back to develop branch 2021-06-07 17:52:24 +01:00
RiotRobot
0a3eb467fc Upgrade matrix-react-sdk to 3.23.0 2021-06-07 17:46:00 +01:00
RiotRobot
5da849099f Upgrade matrix-js-sdk to 11.2.0 2021-06-07 17:45:33 +01:00
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
122e9ac087 Upgrade matrix-react-sdk to 3.23.0-rc.1 2021-06-01 16:21:14 +01:00
RiotRobot
d70c651040 Upgrade matrix-js-sdk to 11.2.0-rc.1 2021-06-01 16:20:57 +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
dependabot[bot]
e9acff975e
Bump dns-packet from 1.3.1 to 1.3.4
Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-27 08:09:48 +00:00
Jaiwanth
0ee290648a Add support for firefox 2021-05-25 17:49:18 +05:30
RiotRobot
f78be2631a Reset matrix-react-sdk back to develop branch 2021-05-24 17:49:06 +01:00
RiotRobot
a380f9c9f2 Reset matrix-js-sdk back to develop branch 2021-05-24 17:48:59 +01:00
RiotRobot
cef446d7fa Upgrade matrix-react-sdk to 3.22.0 2021-05-24 17:28:39 +01:00
RiotRobot
59e00cb41d Upgrade matrix-js-sdk to 11.1.0 2021-05-24 17:27:24 +01:00
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
4960838e58 bump to olm 3.2.3 2021-05-24 16:35:21 +01:00
Hubert Chathi
06ac124bab Bump libolm dependency, and update package name. 2021-05-24 16:34:13 +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