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
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
148cad6ea2
Reset matrix-js-sdk back to develop branch
2020-09-14 13:42:34 +01:00
ba73847296
Upgrade matrix-js-sdk to 8.3.0
2020-09-14 13:31:41 +01:00
cc353dbe43
Upgrade matrix-js-sdk to 8.3.0-rc.1
2020-09-09 15:13:40 +01:00
b878c27741
Tidy devDeps, all the webpack stuff lives in the layer above
2020-09-08 16:56:22 +01:00
db2e1a9cd0
Add rfc4648 (base64/32/16) encoder to dependencies
2020-09-04 10:04:18 +03:00
0d290c9bd2
Reset matrix-js-sdk back to develop branch
2020-09-01 17:39:09 +01:00
bb248670a6
Upgrade matrix-js-sdk to 8.2.0
2020-09-01 17:02:49 +01:00
b142d72e97
Upgrade matrix-js-sdk to 8.2.0-rc.1
2020-08-26 11:52:28 +01:00
0a4d4e4df3
Revert "update js-sdk reference in lockfile"
...
This reverts commit cac4e6c920
2020-08-18 12:53:43 -06:00
cac4e6c920
update js-sdk reference in lockfile
2020-08-18 12:50:25 -06:00
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
c91fc99d4b
Reset matrix-js-sdk back to develop branch
2020-08-17 13:08:45 +01:00
32ca810809
Upgrade matrix-js-sdk to 8.1.0
2020-08-17 12:53:33 +01:00
47bb6d0b25
Upgrade matrix-js-sdk to 8.1.0-rc.1
2020-08-13 12:12:10 +01:00
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
45b79a0b7c
Reset matrix-js-sdk back to develop branch
2020-08-05 16:11:28 +01:00
f8cdd51fe3
Merge branch 'master' into develop
2020-08-05 16:10:29 +01:00
57814a40c1
Upgrade matrix-js-sdk to 8.0.1
2020-08-05 15:50:03 +01:00
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
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
31c66a1128
Upgrade matrix-js-sdk to 8.0.1-rc.1
2020-07-31 13:24:17 +01:00
0404c7d9ae
Merge pull request #5059 from matrix-org/jryans/cleanup-lint-deps
...
Remove redundant lint dependencies
2020-07-31 11:42:29 +01:00
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
50bc7fc62f
Remove redundant lint dependencies
...
These are no longer needed with the new standard lint repo.
2020-07-29 12:00:42 +01:00
96ba645cbd
Reset matrix-js-sdk back to develop branch
2020-07-27 21:29:22 +01:00
ebb4d2ff87
Upgrade matrix-js-sdk to 8.0.0
2020-07-27 21:05:55 +01:00
66eb069651
Pin flow-parser for i18n
2020-07-23 15:43:53 -06:00
9d091e5e02
Update packages to modern versions
2020-07-23 15:27:10 -06:00
c4fc70b9be
Post-merge fix
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 22:28:36 +01:00
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
6219e67a8a
add dep eslint-config-matrix-org
2020-07-20 21:19:49 +01:00
4ba1f91a2b
Fix lint issues in new code
2020-07-20 20:43:55 +01:00
b3fa855bd8
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/eslint-config
2020-07-20 16:22:32 +01:00
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
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
2f9bfdbb69
Reset matrix-js-sdk back to develop branch
2020-07-16 16:11:59 +01:00
bc97f731fc
Upgrade matrix-js-sdk to 7.1.0
2020-07-16 16:03:00 +01:00
7098cbfce1
Reset matrix-js-sdk back to develop branch
2020-07-15 12:01:14 +01:00
c339e5cbf9
Upgrade matrix-js-sdk to 7.1.0
2020-07-15 11:40:31 +01:00
3912f2d21c
Merge remote-tracking branch 'origin/develop' into travis/room-list/resizable
2020-07-08 07:55:10 -06:00
c5e8a0b5af
Convert HtmlUtils to TypeScript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-08 08:40:58 +01:00
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
2c1eb07768
Merge pull request #4883 from matrix-org/t3chguy/ts123
...
Convert things to Typescript, including languageHandler
2020-07-06 18:54:19 +01:00
5c56a55cf0
Reset matrix-js-sdk back to develop branch
2020-07-03 13:29:56 +01:00
452bb73dcf
Upgrade matrix-js-sdk to 7.1.0
2020-07-03 13:22:03 +01:00
48ce294a49
Transition languageHandler to Typescript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 23:15:08 +01:00
161c37d93c
Upgrade matrix-js-sdk to 7.1.0-rc.1
2020-07-01 14:21:35 +01:00
b110639c76
Merge remote-tracking branch 'origin' into joriks/eslint-config
2020-06-29 16:49:33 +01:00
J. Ryan Stinnett