RiotRobot
965b0ab58d
Upgrade matrix-js-sdk to 11.0.0-rc.1
2021-05-11 16:28:00 +01:00
J. Ryan Stinnett
49f1dd37f2
Merge remote-tracking branch 'origin/develop' into jryans/upgrade-sanitize-types
2021-05-11 09:42:58 +01:00
J. Ryan Stinnett
3e68d73597
Upgrade sanitize types
2021-05-10 17:43:10 +01:00
J. Ryan Stinnett
f41fc7e46c
Upgrade cheerio
and resolve type errors
...
This helps resolve some type errors with `domhandler`. In addition, we convert
to the new way of using `htmlparser2` with `cheerio`.
2021-05-10 16:10:39 +01:00
RiotRobot
1b372b17e0
Reset matrix-js-sdk back to develop branch
2021-05-10 15:23:03 +01:00
RiotRobot
3e534b5d30
Merge branch 'master' into develop
2021-05-10 15:22:12 +01:00
J. Ryan Stinnett
7f4c525d62
Switch back to release version of sanitize-html
...
The limit depth option has been available in a released version for a while now.
2021-05-10 14:57:35 +01:00
RiotRobot
a11c3a22c9
Upgrade matrix-js-sdk to 10.1.0
2021-05-10 14:55:31 +01:00
dependabot[bot]
70b2f841d9
Bump hosted-git-info from 2.8.8 to 2.8.9
...
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info ) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases )
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md )
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-09 00:09:15 +00:00
Michael Telatynski
74bcb921ff
Merge pull request #5990 from matrix-org/t3chguy/ts/parse5
...
Add dev dependency for parse5 typings
2021-05-07 13:49:13 +01:00
Michael Telatynski
db5c0012c2
Add dev dependency for parse5 typings
2021-05-07 10:11:56 +01:00
dependabot[bot]
b37985a5d2
Bump lodash from 4.17.20 to 4.17.21
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-07 01:13:44 +00:00
dependabot[bot]
d924c7a186
Bump ua-parser-js from 0.7.23 to 0.7.28
...
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js ) from 0.7.23 to 0.7.28.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases )
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.23...0.7.28 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-05-06 22:22:53 +00:00
RiotRobot
b777c83c90
Upgrade matrix-js-sdk to 10.1.0-rc.1
2021-05-04 15:42:45 +01:00
Germain
4d5fd3ec73
Merge pull request #5913 from matrix-org/gsouquet-desktop-i18n
2021-04-27 15:48:49 +01:00
Germain Souquet
c08fe6aa22
Upgrade matrix-web-i18n to use matrix prefixed binaries
2021-04-27 15:09:26 +01:00
RiotRobot
3817aaeaca
Reset matrix-js-sdk back to develop branch
2021-04-26 17:50:40 +01:00
RiotRobot
a79b0e9327
Upgrade matrix-js-sdk to 10.0.0
2021-04-26 17:42:04 +01:00
Germain Souquet
4123406785
Move i18n utils to its own module
2021-04-26 16:55:12 +01:00
RiotRobot
40ed8fd342
Upgrade matrix-js-sdk to 10.0.0-rc.1
2021-04-21 16:47:29 +01:00
Germain
36e729a626
Merge pull request #5836 from matrix-org/gsouquet-readreceipts-animation
2021-04-15 08:27:28 +01:00
RiotRobot
f743007334
Reset matrix-js-sdk back to develop branch
2021-04-12 14:57:30 +01:00
RiotRobot
f844961dc4
Upgrade matrix-js-sdk to 9.11.0
2021-04-12 14:45:16 +01:00
Germain Souquet
8d60d85570
replace velocity-animate with CSS transitions
2021-04-08 10:36:14 +01:00
RiotRobot
0f056f15f9
Upgrade matrix-js-sdk to 9.11.0-rc.1
2021-04-07 12:59:04 +01:00
RiotRobot
5df4ad2db0
Reset matrix-js-sdk back to develop branch
2021-03-29 13:37:04 +01:00
RiotRobot
df59a6bf45
Merge branch 'master' into develop
2021-03-29 13:36:53 +01:00
RiotRobot
805e980a8a
Upgrade matrix-js-sdk to 9.10.0
2021-03-29 13:29:12 +01:00
RiotRobot
fd29c73533
Upgrade matrix-js-sdk to 9.10.0-rc.1
2021-03-25 12:12:55 +00:00
Travis Ralston
be2e30df0d
Add an early voice recorder utility class
2021-03-16 22:58:44 -06:00
RiotRobot
a696c09e1e
Reset matrix-js-sdk back to develop branch
2021-03-15 14:47:08 +00:00
RiotRobot
a9a50663a3
Merge branch 'master' into develop
2021-03-15 14:46:56 +00:00
RiotRobot
da627dab20
Upgrade matrix-js-sdk to 9.9.0
2021-03-15 14:38:57 +00:00
Travis Ralston
6ab235f10c
Fix tests for new call path
...
We have to mock `fetch` for the caching of the download icon, and then mock out all the function calls used by components to feed a Media object.
2021-03-11 09:42:55 -07:00
RiotRobot
681529aa3c
Upgrade matrix-js-sdk to 9.9.0-rc.1
2021-03-10 17:26:35 +00:00
Travis Ralston
303ea16492
Merge pull request #5697 from matrix-org/travis/fix-tetris
...
Fix tetris effect (holes) in read receipts
2021-03-02 07:35:04 -07:00
RiotRobot
588e94e813
Reset matrix-js-sdk back to develop branch
2021-03-01 13:10:43 +00:00
RiotRobot
ebb782062f
Upgrade matrix-js-sdk to 9.8.0
2021-03-01 12:51:56 +00:00
Travis Ralston
208faf6d46
Update velocity-animate to the latest beta
...
This is the primary change in this PR: the new beta (which has been untouched for a year as of writing) actually does a better job of handling concurrent read receipts, this patching holes.
The beta doesn't have the same leak as v1, so we can remove the metadata hack from our side (it doesn't use jQuery's data anymore).
Note that this change on its own introduces an annoying bug where every second update to a read receipt will throw it 14px to the right - more on that in the next commit.
2021-02-26 22:21:14 -07:00
RiotRobot
e3f08adacb
Upgrade matrix-js-sdk to 9.8.0-rc.1
2021-02-24 17:27:56 +00:00
RiotRobot
b6a4876c8a
Reset matrix-js-sdk back to develop branch
2021-02-16 11:06:55 +00:00
RiotRobot
f4ab4dce40
Merge branch 'master' into develop
2021-02-16 11:06:42 +00:00
RiotRobot
f9d4d679ee
Upgrade matrix-js-sdk to 9.7.0
2021-02-16 10:59:39 +00:00
Travis Ralston
cd82d97c3e
Use randomly generated conference names for Jitsi
...
Fixes https://github.com/vector-im/element-web/issues/15205
Replaces https://github.com/matrix-org/matrix-react-sdk/pull/5322
This change uses a random ID for the Jitsi conference name to avoid any badly-named Jitsi calls, and overrides the "subject" (title) of the call so end users aren't typically exposed to the random ID.
2021-02-15 08:53:37 -07:00
RiotRobot
673717d6c0
Upgrade matrix-js-sdk to 9.7.0-rc.1
2021-02-10 15:57:57 +00:00
RiotRobot
bd538823cf
Reset matrix-js-sdk back to develop branch
2021-02-03 12:11:07 +00:00
RiotRobot
41c18d0d24
Upgrade matrix-js-sdk to 9.6.0
2021-02-03 12:02:50 +00:00
J. Ryan Stinnett
ad2a187566
Upgrade matrix-widget-api
2021-02-02 15:16:43 +00:00
RiotRobot
815a126b56
Upgrade matrix-js-sdk to 9.6.0-rc.1
2021-01-29 17:23:17 +00:00
Travis Ralston
5d4c38188c
Update widget-api to beta.12
2021-01-28 20:42:48 -07:00
J. Ryan Stinnett
84b1f2e6c6
Resolve typing errors after TypeScript upgrade
2021-01-27 12:42:37 +00:00
J. Ryan Stinnett
ea706189a2
Nested upgrades via yarn upgrade
2021-01-27 12:34:10 +00:00
J. Ryan Stinnett
0cb266eda2
lolex renamed to @sinonjs/fake-timers
2021-01-27 12:31:37 +00:00
J. Ryan Stinnett
ca08475498
Apply all simple major version upgrades
2021-01-27 12:31:37 +00:00
J. Ryan Stinnett
f8816e0bda
Pin React types to 16.x for now
...
This avoids type conflicts from other deps that depends on just `*`. Type deps
needs to be de-duplicated down to a single version to avoid errors (unlike code
deps).
2021-01-27 12:31:37 +00:00
J. Ryan Stinnett
12c671045d
Upgrade to latest minor versions of deps
2021-01-27 12:31:37 +00:00
RiotRobot
4dbdeb46ad
Reset matrix-js-sdk back to develop branch
2021-01-26 12:11:47 +00:00
RiotRobot
e21514cea0
Merge branch 'master' into develop
2021-01-26 12:08:24 +00:00
RiotRobot
709fc2e004
Upgrade matrix-js-sdk to 9.5.1
2021-01-26 11:57:46 +00:00
Travis Ralston
83fb698bbc
Merge pull request #5527 from matrix-org/travis/widget-nav
...
Wire up MSC2931 widget navigation
2021-01-18 09:09:32 -07:00
RiotRobot
6c8e6096da
Reset matrix-js-sdk back to develop branch
2021-01-18 15:16:31 +00:00
RiotRobot
c4570cdaee
Upgrade matrix-js-sdk to 9.5.0
2021-01-18 15:09:22 +00:00
Travis Ralston
f6a328a55b
Update widget api
2021-01-16 23:34:16 -07:00
RiotRobot
30dd24a59c
Upgrade matrix-js-sdk to 9.5.0-rc.1
2021-01-13 12:59:37 +00:00
David Baker
328d64ac23
Run TypeScript tests
...
There aren't any yet, but I'm about to write a test and it's going
to be in TypeScript and I don't want to lump this change in with
a bunch of other stuff.
2021-01-12 17:37:24 +00:00
Travis Ralston
777c0ca1ef
Merge pull request #5520 from matrix-org/dependabot/npm_and_yarn/node-notifier-8.0.1
...
Bump node-notifier from 8.0.0 to 8.0.1
2020-12-22 08:45:36 -07:00
RiotRobot
c4f7269321
Reset matrix-js-sdk back to develop branch
2020-12-21 17:52:30 +00:00
RiotRobot
8e6f8b11df
Merge branch 'master' into develop
2020-12-21 17:51:09 +00:00
RiotRobot
cc0bef7f8d
Upgrade matrix-js-sdk to 9.4.1
2020-12-21 17:36:46 +00:00
dependabot[bot]
9af2138171
Bump node-notifier from 8.0.0 to 8.0.1
...
Bumps [node-notifier](https://github.com/mikaelbr/node-notifier ) from 8.0.0 to 8.0.1.
- [Release notes](https://github.com/mikaelbr/node-notifier/releases )
- [Changelog](https://github.com/mikaelbr/node-notifier/blob/v8.0.1/CHANGELOG.md )
- [Commits](https://github.com/mikaelbr/node-notifier/compare/v8.0.0...v8.0.1 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-12-21 17:19:21 +00:00
RiotRobot
e551e7ac40
Reset matrix-js-sdk back to develop branch
2020-12-21 17:08:51 +00:00
RiotRobot
55fd463a9d
Merge branch 'master' into develop
2020-12-21 17:07:52 +00:00
RiotRobot
78e6fb9121
Upgrade matrix-js-sdk to 9.4.0
2020-12-21 17:00:39 +00:00
RiotRobot
d2ee89fa74
Upgrade matrix-js-sdk to 9.4.0-rc.2
2020-12-16 15:57:56 +00:00
RiotRobot
9f8a5f5107
Upgrade matrix-js-sdk to 9.4.0-rc.1
2020-12-16 14:22:44 +00:00
dependabot[bot]
456d21c9e7
Bump ini from 1.3.5 to 1.3.7
...
Bumps [ini](https://github.com/isaacs/ini ) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases )
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-12-11 02:56:41 +00:00
J. Ryan Stinnett
49bd7887d2
Add Olm as a dev dependency for types
...
Fixes https://github.com/vector-im/element-web/issues/15803
2020-12-08 16:18:12 +00:00
J. Ryan Stinnett
07a1754768
Merge pull request #5472 from matrix-org/dependabot/npm_and_yarn/highlight.js-10.4.1
...
Bump highlight.js from 10.1.2 to 10.4.1
2020-12-07 12:58:21 +00:00
RiotRobot
7d41604569
Reset matrix-js-sdk back to develop branch
2020-12-07 12:33:18 +00:00
RiotRobot
1241b7c335
Upgrade matrix-js-sdk to 9.3.0
2020-12-07 12:13:04 +00:00
dependabot[bot]
58eaccbba8
Bump highlight.js from 10.1.2 to 10.4.1
...
Bumps [highlight.js](https://github.com/highlightjs/highlight.js ) from 10.1.2 to 10.4.1.
- [Release notes](https://github.com/highlightjs/highlight.js/releases )
- [Changelog](https://github.com/highlightjs/highlight.js/blob/master/CHANGES.md )
- [Commits](https://github.com/highlightjs/highlight.js/compare/10.1.2...10.4.1 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-12-04 17:35:40 +00:00
RiotRobot
ed59b50448
Upgrade matrix-js-sdk to 9.3.0-rc.1
2020-12-02 14:25:55 +00:00
J. Ryan Stinnett
826466179a
Merge pull request #5244 from akissinger/katex
...
LaTeX rendering in element-web using KaTeX
2020-11-27 11:55:26 +00:00
Travis Ralston
67a0f1ef4c
Update widget API
2020-11-24 09:43:21 -07:00
RiotRobot
ddc3f275a8
Reset matrix-js-sdk back to develop branch
2020-11-23 16:41:50 +00:00
RiotRobot
8239649a45
Merge branch 'master' into develop
2020-11-23 16:40:45 +00:00
RiotRobot
be25a0e432
Upgrade matrix-js-sdk to 9.2.0
2020-11-23 16:29:44 +00:00
Travis Ralston
2446fb151a
Update widget-api
2020-11-20 09:05:09 -07:00
RiotRobot
2880083cbb
Upgrade matrix-js-sdk to 9.2.0-rc.1
2020-11-18 15:59:28 +00:00
Travis Ralston
1b6e47c01b
Update widget-api again
2020-11-12 11:52:47 -07:00
Travis Ralston
4bcb932355
Update widget-api
2020-11-12 11:33:44 -07:00
Aleks Kissinger
5f3af7863a
Merge branch 'develop' into katex
2020-11-10 18:19:20 +00:00
RiotRobot
46e01196f0
Reset matrix-js-sdk back to develop branch
2020-11-09 16:33:48 +00:00
RiotRobot
6f3cdadcdb
Upgrade matrix-js-sdk to 9.1.0
2020-11-09 16:26:36 +00:00
RiotRobot
1b55eb5f44
Upgrade matrix-js-sdk to 9.1.0-rc.1
2020-11-04 14:10:56 +00:00
RiotRobot
a708dbf6e9
Reset matrix-js-sdk back to develop branch
2020-10-28 14:32:26 +00:00
RiotRobot
de6589705c
Upgrade matrix-js-sdk to 9.0.1
2020-10-28 14:17:48 +00:00
RiotRobot
5446184e6e
Upgrade matrix-js-sdk to 9.0.0
2020-10-26 16:49:16 +00:00
Aleks Kissinger
4536f51ec0
Merge branch 'develop' into katex
2020-10-25 12:28:17 +00:00
RiotRobot
b585cf76bd
Upgrade matrix-js-sdk to 9.0.0-rc.1
2020-10-21 15:16:46 +01:00
RiotRobot
65d7b9c0f2
Upgrade matrix-js-sdk to 8.5.0
2020-10-21 14:38:51 +01:00
RiotRobot
bd1276c56b
Reset matrix-js-sdk back to develop branch
2020-10-20 11:27:33 +01:00
J. Ryan Stinnett
d6a166d3bf
Upgrade widget API
2020-10-19 16:56:36 +01:00
RiotRobot
d007b06d7c
Reset matrix-js-sdk back to develop branch
2020-10-12 13:40:23 +01:00
RiotRobot
ddd3d97b71
Merge branch 'master' into develop
2020-10-12 13:39:18 +01:00
RiotRobot
0ac4f21652
Upgrade matrix-js-sdk to 8.5.0
2020-10-12 13:24:53 +01:00
Aleks Kissinger
aafaf34233
Merge branch 'develop' into katex
2020-10-10 19:31:46 +01:00
Travis Ralston
2caf679024
Update widget-api
2020-10-08 21:22:17 -06:00
Travis Ralston
25db3e9efa
Update widget-api
2020-10-08 21:21:11 -06:00
Michael Telatynski
177b76d882
Merge pull request #5284 from matrix-org/t3chguy/fix/10353
...
Track replyToEvent along with Cider state & history
2020-10-08 14:59:14 +01:00
J. Ryan Stinnett
f77dace173
Shake lock file to attempt fixing CI
2020-10-07 17:07:44 +01:00
RiotRobot
2fd9b9b3b9
Upgrade matrix-js-sdk to 8.5.0-rc.1
2020-10-07 14:23:52 +01:00
Michael Telatynski
0d6edab708
Workaround Jest bug with ArrayBuffers
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 01:22:29 +01:00
Michael Telatynski
13afb8d4f1
Update Jest and JSDOM
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-07 00:08:40 +01:00
Travis Ralston
08c5e9e039
Use the beta release of the widget-api
2020-09-30 20:42:37 -06:00
RiotRobot
524b2dbd22
Reset matrix-js-sdk back to develop branch
2020-09-28 16:20:07 +01:00
RiotRobot
a16ca8226c
Upgrade matrix-js-sdk to 8.4.1
2020-09-28 16:12:05 +01:00
RiotRobot
fe5e1f4543
Upgrade matrix-js-sdk to 8.4.0
2020-09-28 14:25:51 +01:00
RiotRobot
ca4b11ec6a
Upgrade matrix-js-sdk to 8.4.0-rc.1
2020-09-23 15:27:40 +01:00
J. Ryan Stinnett
064ae187e2
Upgrade sanitize-html, set nesting limit
...
This uses the recently added option to allow specifying a nesting limit.
Fixes https://github.com/vector-im/element-web/issues/15122
2020-09-22 18:06:10 +01:00
Aleks Kissinger
0604c86779
added katex package and import
2020-09-19 15:45:35 +01:00
Michael Telatynski
d59a1fbd80
Merge pull request #5179 from matrix-org/t3chguy/tidy-dev-deps
...
Tidy devDeps, all the webpack stuff lives in the layer above
2020-09-17 15:06:16 +01:00
RiotRobot
148cad6ea2
Reset matrix-js-sdk back to develop branch
2020-09-14 13:42:34 +01:00
RiotRobot
ba73847296
Upgrade matrix-js-sdk to 8.3.0
2020-09-14 13:31:41 +01:00
RiotRobot
cc353dbe43
Upgrade matrix-js-sdk to 8.3.0-rc.1
2020-09-09 15:13:40 +01:00
Michael Telatynski
b878c27741
Tidy devDeps, all the webpack stuff lives in the layer above
2020-09-08 16:56:22 +01:00
Jason Robinson
db2e1a9cd0
Add rfc4648 (base64/32/16) encoder to dependencies
2020-09-04 10:04:18 +03:00
RiotRobot
0d290c9bd2
Reset matrix-js-sdk back to develop branch
2020-09-01 17:39:09 +01:00
RiotRobot
bb248670a6
Upgrade matrix-js-sdk to 8.2.0
2020-09-01 17:02:49 +01:00
RiotRobot
b142d72e97
Upgrade matrix-js-sdk to 8.2.0-rc.1
2020-08-26 11:52:28 +01:00
Travis Ralston
0a4d4e4df3
Revert "update js-sdk reference in lockfile"
...
This reverts commit cac4e6c920
.
2020-08-18 12:53:43 -06:00
Travis Ralston
cac4e6c920
update js-sdk reference in lockfile
2020-08-18 12:50:25 -06:00
Michael Telatynski
8cff59f123
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs
2020-08-18 17:36:04 +01:00
RiotRobot
c91fc99d4b
Reset matrix-js-sdk back to develop branch
2020-08-17 13:08:45 +01:00
RiotRobot
32ca810809
Upgrade matrix-js-sdk to 8.1.0
2020-08-17 12:53:33 +01:00
RiotRobot
47bb6d0b25
Upgrade matrix-js-sdk to 8.1.0-rc.1
2020-08-13 12:12:10 +01:00
Michael Telatynski
df980dbf92
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs
2020-08-12 22:48:03 +01:00
RiotRobot
45b79a0b7c
Reset matrix-js-sdk back to develop branch
2020-08-05 16:11:28 +01:00
RiotRobot
f8cdd51fe3
Merge branch 'master' into develop
2020-08-05 16:10:29 +01:00
RiotRobot
57814a40c1
Upgrade matrix-js-sdk to 8.0.1
2020-08-05 15:50:03 +01:00
Michael Telatynski
cbcac9dd49
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs
...
Conflicts:
package.json
2020-08-03 12:54:06 +01:00
Travis Ralston
fed20d46c5
Replace i18n generation script with something matching our project
...
We've been relying on flow being close enough to TypeScript for so long that it is starting to run into issues. Here we switch to babel's parser given we already use babel in the project.
Babel's parser is also *slightly* faster, allowing us to generate strings 0.1s faster.
2020-07-31 13:33:33 -06:00
RiotRobot
31c66a1128
Upgrade matrix-js-sdk to 8.0.1-rc.1
2020-07-31 13:24:17 +01:00
J. Ryan Stinnett
0404c7d9ae
Merge pull request #5059 from matrix-org/jryans/cleanup-lint-deps
...
Remove redundant lint dependencies
2020-07-31 11:42:29 +01:00
dependabot[bot]
8610760288
Bump elliptic from 6.5.2 to 6.5.3
...
Bumps [elliptic](https://github.com/indutny/elliptic ) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases )
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-07-30 12:52:17 +00:00
J. Ryan Stinnett
50bc7fc62f
Remove redundant lint dependencies
...
These are no longer needed with the new standard lint repo.
2020-07-29 12:00:42 +01:00
RiotRobot
96ba645cbd
Reset matrix-js-sdk back to develop branch
2020-07-27 21:29:22 +01:00
RiotRobot
ebb4d2ff87
Upgrade matrix-js-sdk to 8.0.0
2020-07-27 21:05:55 +01:00
Travis Ralston
66eb069651
Pin flow-parser for i18n
2020-07-23 15:43:53 -06:00
Travis Ralston
9d091e5e02
Update packages to modern versions
2020-07-23 15:27:10 -06:00
Michael Telatynski
c4fc70b9be
Post-merge fix
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 22:28:36 +01:00
Michael Telatynski
70c81cc377
Merge branches 'develop' and 'travis/download-logs' of github.com:matrix-org/matrix-react-sdk into travis/download-logs
...
Conflicts:
src/i18n/strings/en_EN.json
src/rageshake/submit-rageshake.ts
2020-07-21 22:22:28 +01:00
Jorik Schellekens
6219e67a8a
add dep eslint-config-matrix-org
2020-07-20 21:19:49 +01:00
Jorik Schellekens
4ba1f91a2b
Fix lint issues in new code
2020-07-20 20:43:55 +01:00
Jorik Schellekens
b3fa855bd8
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/eslint-config
2020-07-20 16:22:32 +01:00
Travis Ralston
65d7a82644
Merge pull request #5004 from matrix-org/dependabot/npm_and_yarn/lodash-4.17.19
...
Bump lodash from 4.17.15 to 4.17.19
2020-07-16 14:44:21 -06:00
dependabot[bot]
4aedf857cb
Bump lodash from 4.17.15 to 4.17.19
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-07-16 15:12:26 +00:00
RiotRobot
2f9bfdbb69
Reset matrix-js-sdk back to develop branch
2020-07-16 16:11:59 +01:00
RiotRobot
bc97f731fc
Upgrade matrix-js-sdk to 7.1.0
2020-07-16 16:03:00 +01:00
RiotRobot
7098cbfce1
Reset matrix-js-sdk back to develop branch
2020-07-15 12:01:14 +01:00
RiotRobot
c339e5cbf9
Upgrade matrix-js-sdk to 7.1.0
2020-07-15 11:40:31 +01:00
Travis Ralston
3912f2d21c
Merge remote-tracking branch 'origin/develop' into travis/room-list/resizable
2020-07-08 07:55:10 -06:00
Michael Telatynski
c5e8a0b5af
Convert HtmlUtils to TypeScript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-08 08:40:58 +01:00
Travis Ralston
15b6a273c9
Swap out the resizer lib for something more stable
...
react-resizer appears to be okay at tracking state, but it often desyncs from reality. re-resizer is more maintained and more broadly used (160k downloads vs 110k), and appears to generally do a better job of tracking the cursor.
The new library has some oddities though, such as deltas, touch support (hence the polyfill), and calling handles "Enable".
For https://github.com/vector-im/riot-web/issues/14022
2020-07-07 22:21:00 -06:00
Michael Telatynski
2c1eb07768
Merge pull request #4883 from matrix-org/t3chguy/ts123
...
Convert things to Typescript, including languageHandler
2020-07-06 18:54:19 +01:00
RiotRobot
5c56a55cf0
Reset matrix-js-sdk back to develop branch
2020-07-03 13:29:56 +01:00
RiotRobot
452bb73dcf
Upgrade matrix-js-sdk to 7.1.0
2020-07-03 13:22:03 +01:00
Michael Telatynski
48ce294a49
Transition languageHandler to Typescript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 23:15:08 +01:00
RiotRobot
161c37d93c
Upgrade matrix-js-sdk to 7.1.0-rc.1
2020-07-01 14:21:35 +01:00
Jorik Schellekens
b110639c76
Merge remote-tracking branch 'origin' into joriks/eslint-config
2020-06-29 16:49:33 +01:00
Jorik Schellekens
0a2934203f
Remove tslint
2020-06-23 17:01:40 +01:00
Jorik Schellekens
7699aafcaf
Use new eslint package- fix lint issues in ts and js
2020-06-23 17:01:19 +01:00
RiotRobot
f3af603102
Reset matrix-js-sdk back to develop branch
2020-06-23 15:19:55 +01:00
RiotRobot
54ba75afd7
Upgrade matrix-js-sdk to 7.0.0
2020-06-23 14:48:23 +01:00
RiotRobot
dd23a50a3c
Upgrade matrix-js-sdk to 7.0.0-rc.1
2020-06-17 21:40:30 +01:00
RiotRobot
6f6793bc85
Reset matrix-js-sdk back to develop branch
2020-06-16 11:45:28 +01:00
RiotRobot
8047bace91
Merge branch 'master' into develop
2020-06-16 11:44:27 +01:00
RiotRobot
1374d2020a
Upgrade matrix-js-sdk to 6.2.2
2020-06-16 11:26:12 +01:00
Travis Ralston
1467191a5d
Update the CSS transition for breadcrumbs
...
The actual transition length might need adjusting, but this is fairly close to what was requested.
2020-06-09 15:06:54 -06:00
J. Ryan Stinnett
1315ed503b
Upgrade deps
2020-06-08 10:12:11 +01:00
Michael Telatynski
69ea635398
Allow searching the emoji picker using other emoji
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-05 23:19:00 +01:00
Travis Ralston
ee3d2c51d8
Merge pull request #4697 from matrix-org/travis/room-list/scrolling-resize
...
New room list scrolling and resizing
2020-06-05 13:17:59 -06:00
RiotRobot
d54308a8c6
Reset matrix-js-sdk back to develop branch
2020-06-05 15:48:06 +01:00
RiotRobot
1d6141cf73
Merge branch 'master' into develop
2020-06-05 15:47:23 +01:00
RiotRobot
e78fa602c0
Upgrade matrix-js-sdk to 6.2.1
2020-06-05 15:13:55 +01:00
Travis Ralston
cdf2d70aea
Merge branch 'develop' into travis/room-list/scrolling-resize
2020-06-04 09:19:54 -06:00
RiotRobot
3c73930e9a
Reset matrix-js-sdk back to develop branch
2020-06-04 15:14:34 +01:00
RiotRobot
260d448db6
Merge branch 'master' into develop
2020-06-04 15:13:41 +01:00
RiotRobot
07a12a73ee
Upgrade matrix-js-sdk to 6.2.0
2020-06-04 15:06:40 +01:00
Travis Ralston
dbf996439b
Wedge t3chguy's resizer prototype into the sublist
2020-06-03 21:17:51 -06:00
RiotRobot
98a6dd88e3
Upgrade matrix-js-sdk to 6.2.0-rc.1
2020-06-02 13:53:13 +01:00
Matthew Hodgson
aab8f6755f
bump yarn lock
2020-05-31 16:06:33 +01:00
Matthew Hodgson
c3ad15e479
upgrade to twemoji 13.0.0
2020-05-31 14:09:44 +01:00
Jorik Schellekens
076a3e058d
Merge pull request #4635 from JorikSchellekens/joriks/field-ts
...
Move Field to Typescript
2020-05-26 16:13:03 +01:00
Michael Telatynski
c74d890774
Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3
...
Conflicts:
src/@types/global.d.ts
src/components/structures/ToastContainer.tsx
2020-05-26 13:38:17 +01:00
Jorik Schellekens
b4624baf2f
Merge branch 'develop' into joriks/field-ts
2020-05-25 17:29:25 +01:00
Jorik Schellekens
f34413c6ce
update yarn lock
2020-05-25 17:24:15 +01:00
Jorik Schellekens
5c9398a6b1
Types exiliary files
2020-05-25 16:47:57 +01:00
Jorik Schellekens
63f78b0808
Move tooltip to ts
2020-05-25 13:40:05 +01:00
Michael Telatynski
880e16aaa2
Merge branches 'develop' and 't3chguy/leaks' of github.com:matrix-org/matrix-react-sdk into t3chguy/leaks
...
Conflicts:
src/components/views/avatars/BaseAvatar.js
test/components/views/messages/TextualBody-test.js
2020-05-23 11:12:58 +01:00