PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
43730 commits 1 branch 0 tags 338 MiB
Commit graph

794 commits

Author SHA1 Message Date
Dariusz Niemczyk
bc336abf47
Fix missing snapshot serializer&enzyme init (#6932) 2021-10-13 11:09:43 +01:00
RiotRobot
193a060ec9 Reset matrix-js-sdk back to develop branch 2021-10-12 09:13:06 +01:00
RiotRobot
3bc1a6613b Merge branch 'release-v3.32.1' 2021-10-12 08:48:16 +01:00
RiotRobot
6b4bcbd289 Upgrade matrix-js-sdk to 14.0.1 2021-10-12 08:40:57 +01:00
RiotRobot
93cdda8693 Upgrade matrix-js-sdk to 14.0.0 2021-10-11 11:55:21 +01:00
RiotRobot
0af5f8a173 Upgrade matrix-js-sdk to 14.0.0-rc.2 2021-10-08 08:30:34 +01:00
RiotRobot
7fc4f54ae7 Upgrade matrix-js-sdk to 14.0.0-rc.1 2021-10-04 12:01:31 +01:00
Jaiwanth
208b914cb0 Merge branch 'develop' into export-conversations 2021-09-29 19:32:05 +05:30
RiotRobot
b635d01779 Reset matrix-js-sdk back to develop branch 2021-09-27 14:33:56 +01:00
RiotRobot
8471445b1e Merge branch 'master' into develop 2021-09-27 14:33:45 +01:00
RiotRobot
ccfc57657a Upgrade matrix-js-sdk to 13.0.0 2021-09-27 14:27:26 +01:00
Jaiwanth
94e4fb71c1 Merge branch 'develop' into export-conversations 2021-09-22 18:07:01 +05:30
dependabot[bot]
b161b86c10
Bump nth-check from 2.0.0 to 2.0.1 
Bumps [nth-check](https://github.com/fb55/nth-check) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/fb55/nth-check/releases)
- [Commits](https://github.com/fb55/nth-check/compare/v2.0.0...v2.0.1)

---
updated-dependencies:
- dependency-name: nth-check
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-22 02:05:08 +00:00
RiotRobot
308f6b1d86 Upgrade matrix-js-sdk to 13.0.0-rc.1 2021-09-21 09:39:41 +01:00
David Baker
22500a2e29 yarn upgrade 
And also pin @types/react harder because yarn wanted to give
@types/flux a newer version meaning they conflicted.
 2021-09-15 16:59:13 +01:00
David Baker
4e694df6b0 Pin typescript/types version 
type: task

Because we have a collection of usages of things and conflicts
that break with the new version: https://github.com/vector-im/element-web/issues?q=is%3Aissue+is%3Aopen+preventing+TypeScript+upgrade
 2021-09-15 16:04:26 +01:00
David Baker
f6b0b12c60 fix lockfile 2021-09-14 18:47:01 +01:00
RiotRobot
4ea0385061 Upgrade matrix-js-sdk to 12.5.0 2021-09-14 15:54:30 +01:00
RiotRobot
2cbe35cbd9 Upgrade matrix-js-sdk to 12.5.0-rc.1 2021-09-07 18:26:09 +01:00
David Baker
e1fdf7c69d Update changelog generator 2021-09-07 18:01:13 +01:00
Travis Ralston
4b557fe0ad Update widget-api 2021-09-01 13:22:09 -06:00
David Baker
855c3819c1 Reset matrix-js-sdk back to develop branch 2021-09-01 09:52:32 +01:00
RiotRobot
417415ab3b Merge branch 'master' into develop 2021-08-31 13:56:00 +01:00
RiotRobot
09b40870d4 Upgrade matrix-js-sdk to 12.4.0 2021-08-31 13:51:17 +01:00
David Baker
59833d1306 Update changelog generator 2021-08-25 17:21:48 +01:00
David Baker
586810d288 Not @types/react because it breaks stuff 2021-08-25 11:23:41 +01:00
David Baker
b53e0eee67 yarn upgrade 2021-08-25 10:57:03 +01:00
RiotRobot
d4a4ac5680 Upgrade matrix-js-sdk to 12.4.0-rc.1 2021-08-24 17:09:26 +01:00
Dariusz Niemczyk
e54191f6b0
Move background-blur to fully css version 2021-08-23 19:26:57 +02:00
Jaiwanth
6a26154271 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-08-20 15:02:13 +05:30
Dariusz Niemczyk
455a914cf3
Merge remote-tracking branch 'origin/develop' into gsouquet/fix-backdrop-filter 
* origin/develop: (43 commits)
  Update copy to indicate debug logs contain which UI elements you last interacted with
  Fix name of Netlify workflow
  Add type declarations
  Fix pagination and improve typing
  Fix import
  Reset matrix-js-sdk back to develop branch
  v3.28.1
  Prepare changelog for v3.28.1
  Upgrade matrix-js-sdk to 12.3.1
  Explicitly handle first state change
  Properly listen for call_state
  Proper init in constructors
  Resetting package fields for development
  v3.28.0
  Prepare changelog for v3.28.0
  Fix error on accessing encrypted media without keys
  Fix call tile buttons
  Upgrade matrix-js-sdk to 12.3.0
  Remove test code; good job we have tests
  Fix dates
  ...
 2021-08-19 07:11:02 +02:00
James Salter
834f72a9a8 Merge remote-tracking branch 'origin' into sentry-rageshakes 2021-08-17 11:47:00 +01:00
RiotRobot
d5ffdf1196 Reset matrix-js-sdk back to develop branch 2021-08-17 09:42:20 +01:00
RiotRobot
6e82b064ec Upgrade matrix-js-sdk to 12.3.1 2021-08-17 09:29:20 +01:00
RiotRobot
62e1a30532 Upgrade matrix-js-sdk to 12.3.0 2021-08-16 14:21:59 +01:00
David Baker
d0e82ee603 Update changelog generator 2021-08-16 13:18:10 +01:00
Dariusz Niemczyk
5f9b55eaa9
Merge remote-tracking branch 'origin/develop' into gsouquet/fix-backdrop-filter 
* origin/develop: (1278 commits)
  Add a little padding
  Keep number field in focus when pressing dialpad buttons (#6520)
  Remove old version
  Fix video call persisting when widget removed
  Update link to matrix-js-sdk CONTRIBUTING file (#6557)
  $toast-bg-color -> $system
  $system-... -> $system
  Iterate PR based on feedback
  Remove unnecessary code
  Use AccessibleTooltipButton
  Just upload the PR object itself
  Edit PR Description instead of commenting
  publish the right directory
  Fix Netflify builds from fork PRs
  This doesn't need to be here as it was moved into CallViewButtons
  Make scrollbar dot transparent
  Iterate PR based on feedback
  Don't set hidden RRs labs setting at account level
  Add a comment for weirdly placed div
  Add full class names to animations.scss
  ...
 2021-08-13 15:12:07 +02:00
David Baker
34249caa9e Use changelog generator from npm 2021-08-11 21:50:25 +01:00
James Salter
de398f46f4 initial spike 2021-08-11 18:00:21 +01:00
RiotRobot
15731848ad Upgrade matrix-js-sdk to 12.3.0-rc.1 2021-08-11 16:00:43 +01:00
Jaiwanth
e396dcfb10 Remove @types/streamsaver 2021-08-10 13:22:40 +05:30
Jaiwanth
45ce352d02 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-08-09 10:44:13 +05:30
David Baker
15d42a2fd2
Merge pull request #6537 from matrix-org/dbkr/allchange 
Switch to new changelog generator
 2021-08-04 10:02:48 +01:00
James Salter
57f5c30af8
Merge pull request #6532 from matrix-org/posthog-analytics 
Reinstate Posthog analytics PR fixing type definitions via installing dev dependencies
 2021-08-04 09:47:39 +01:00
James Salter
17b935cbc4 Add @sentry/types and rrweb-snapshot as dev dependencies 
This is neccessary to resolve re-exported types referred to by posthog-js' type definitions.

This isn't ideal, but

* We intend to start using sentry anyway
* Discussion with posthog maintainers about rrweb-snapshot at https://github.com/PostHog/posthog-js/issues/252, perhaps we can find another solution soon
 2021-08-04 09:34:12 +01:00
James Salter
4b78edd652 Remove patch-package and postinstall-postinstall 2021-08-04 09:32:01 +01:00
David Baker
612384a6a3 Switch to new changelog generator 
allchange is typescript so has a 'prepare' script to tsc it into
javascript so it can be a binscript - hopefully this won't cause
it to make too much of a pain of itself causing tsc to run on every
yarn add/install
 2021-08-03 18:03:46 +01:00
David Baker
28f5dc483b Update eslint plugin & fix silly indenting 
As per https://github.com/matrix-org/eslint-plugin-matrix-org/pull/15
this caused a bunch of silly indenting to creep in, so this fixes it
back to the previous style.
 2021-08-03 17:07:37 +01:00
James Salter
c66d0017de Patch posthog's type definitions using patch-package 
Remove definitions for sentry and rrweb-snapshot
 2021-08-03 11:59:54 +01:00
James Salter
dc7aad1abf Revert "Revert "Add support for Posthog Analytics under a labs flag"" 
This reverts commit c5ea253181.
 2021-08-03 11:55:02 +01:00
James Salter
c5ea253181
Revert "Add support for Posthog Analytics under a labs flag" 2021-08-03 07:30:02 +01:00
Jaiwanth
46e2f67f54 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-08-03 10:03:16 +05:30
James Salter
a65b41be63
Merge pull request #6495 from matrix-org/posthog-analytics 
Add support for Posthog Analytics under a labs flag
 2021-08-02 14:46:17 +01:00
RiotRobot
d1e7c48125 Upgrade matrix-js-sdk to 12.2.0 2021-08-02 13:05:48 +01:00
Jaiwanth
17e9cf4d2a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-30 12:17:31 +05:30
James Salter
e4722ee457 Override posthog type definitions to point to a locally fixed type definition file 
Posthog's type definitions refer to types in transitive dependencies we don't want to include.

Clone posthog.d.ts locally, remove the offending types from it, and provide an overriding mapping in tsconfig.

If this proves annoying to maintain, posthog.d.ts could just be an empty file.
 2021-07-28 17:14:36 +01:00
James Salter
d96e7e3375 Add transitive dev dependencies of posthog 
This is needed during tsc lint as posthog imports types from these
libraries into its type definitions
 2021-07-28 12:08:55 +01:00
James Salter
bd7e2dee3d Merge remote-tracking branch 'origin' into posthog-analytics 2021-07-28 11:13:22 +01:00
RiotRobot
78eb8ffc26 Upgrade matrix-js-sdk to 12.2.0-rc.1 2021-07-27 15:51:16 +01:00
Dariusz Niemczyk
7c9ff40863
Update ESLint Config 2021-07-27 09:52:37 +02:00
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
b04bfeda33 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-07-26 00:18:56 +05:30
Michael Telatynski
3c1902c26a Update matrix-org-eslint-plugin 2021-07-23 16:09:41 +01:00
David Baker
35e74db25e yarn upgrade 2021-07-21 15:41:16 +01:00
James Salter
2a48d3c9bc First pass at a PosthogAnalytics class 2021-07-21 07:40:39 +01:00
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
53b0ef20f4 Update eslint-plugin-matrix-org 2021-07-20 09:15:25 +01:00
RiotRobot
13731177a3 Merge branch 'master' into develop 2021-07-19 16:14:58 +01:00
RiotRobot
3335ffa069 Upgrade matrix-js-sdk to 12.1.0 2021-07-19 15:54:25 +01:00
David Baker
99edfc24e5 Update eslint-plugin-matrix-org 2021-07-19 15:26:40 +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
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
Germain Souquet
36ba65b534 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-12 13:00:34 +02: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
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
Germain Souquet
06337e72fa Update lockfile with correct dependencies 2021-07-07 12:10:35 +02:00
Germain Souquet
d6c3a22a25 fix lockfiles 2021-07-06 15:10:33 +02:00
Germain Souquet
edae9a4844 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 10:19:25 +02:00
Jaiwanth
190ccb6f00 Merge and add export support for the modified MAudioBody 2021-07-02 10:41:04 +05:30
David Baker
1fe0c2ab88 Bump eslint plugin version 2021-07-01 23:45:08 +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
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
Germain Souquet
c9fa347015 Upgrade browserlist target versions 2021-07-01 12:27:06 +01:00
Jaiwanth
551639811b Merge and resolve conflicts 2021-06-30 12:29:13 +05:30
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
Germain Souquet
6d293d1092 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-06-25 09:43:54 +01:00
Germain Souquet
652ad3617d Backdrop filter compatibility for Firefox and Safari 2021-06-25 09:20:03 +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
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
Jaiwanth
5fff64f128 Fix types 2021-06-23 12:14:20 +05:30
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
99e3aea1e5 i18n and regen yarn lock 2021-06-22 21:17:33 +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
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
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
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
Germain Souquet
84679cf8ec remove legacy polyfills and unused dependencies 2021-06-11 12:19:14 +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
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
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
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
Jaiwanth
0ee290648a Add support for firefox 2021-05-25 17:49:18 +05:30
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
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
Jaiwanth
ebdb340a5c Create a basic HTML export tool with support only for text based events 2021-05-21 10:50:56 +05:30
RiotRobot
7d0f3b0d99 Upgrade matrix-js-sdk to 11.1.0-rc.1 2021-05-19 14:33:21 +01:00
Michael Telatynski
00d093b4ff yarn lock 2021-05-19 08:56:14 +01:00
Travis Ralston
7cdca77f39 Update widget-api 2021-05-17 16:27:48 -06:00
RiotRobot
12a9ce1a94 Reset matrix-js-sdk back to develop branch 2021-05-17 13:50:34 +01:00
RiotRobot
6c066ee401 Upgrade matrix-js-sdk to 11.0.0 2021-05-17 13:33:45 +01:00
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