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

670 commits

Author SHA1 Message Date
David Baker
b54a6d570e
update olm to 3.2.8 (#7347) 2021-12-13 14:59:13 +00:00
Michael Telatynski
c96b9413e7
Update Typescript to 4.5 (#7344) 2021-12-13 11:22:53 +00:00
Andy Balaam
c56833816a
Update yarn.lock (#7327) 2021-12-10 11:29:27 +00:00
Travis Ralston
9cc8a6d24a Update eslint 2021-12-09 16:04:45 -07:00
J. Ryan Stinnett
8715316a66 Require matrix-widget-api to be 0.1.0-beta.18 2021-12-06 16:38:44 +00:00
RiotRobot
8b82836499 Reset back to develop branch 2021-12-06 15:34:09 +00:00
RiotRobot
906d32aec8 Upgrade matrix-js-sdk to 15.2.0 2021-12-06 15:19:13 +00:00
James Salter
43f264ccfc
Integrate analytics stubs (#7186) 
* Add matrix-analytics-events as a dependency
* Make IEvent look like a stub definition
* Update pageview tracking to track screens, using a hypothetical definition of a screen event
* Remove distinction between pseudo and anon tracking, will need to rework it considering stubs
 2021-12-06 21:43:42 +11:00
Matthew Hodgson
1262021417
Simple static location sharing (#7135) 
Adds maplibre as a dependency, and behind a labs flag, lets users send and receive [MSC3488](https://github.com/matrix-org/matrix-doc/blob/matthew/location/proposals/3488-location.md) style location shares - with backwards compatibility with old school `m.location` `msgtype` location shares too.

For this to work, you have to define a valid maptile server and API in your config.json's `map_style_url`.
 2021-12-06 09:45:12 +00:00
J. Ryan Stinnett
16a58ef2da Upgrade matrix-widget-api to 0.1.0-beta.18 2021-12-02 12:41:21 +00:00
RiotRobot
e2ce332830 Upgrade matrix-js-sdk to 15.2.0-rc.1 2021-11-30 18:20:45 +00:00
J. Ryan Stinnett
c09e0efdb9
Upgrade allchange to 1.0.6 (#7238) 2021-11-30 17:55:57 +00:00
RiotRobot
ea25f74714 Reset matrix-js-sdk back to develop branch 2021-11-22 14:28:13 +00:00
RiotRobot
a434270879 Upgrade matrix-js-sdk to 15.1.1 2021-11-22 13:34:00 +00:00
RiotRobot
f234d756ad Upgrade matrix-js-sdk to 15.1.1-rc.1 2021-11-17 14:04:01 +00:00
RiotRobot
06e1f8ce85 Resetting package fields for development 2021-11-08 17:54:45 +00:00
RiotRobot
d0483bf4b1 Upgrade matrix-js-sdk to 15.1.0 2021-11-08 17:42:01 +00:00
RiotRobot
4270d9d659 Upgrade matrix-js-sdk to 15.1.0-rc.1 2021-11-02 14:15:52 +00:00
David Baker
1ef8a2c486
Update allchange to 1.0.5 (#7070) 2021-11-02 13:30:42 +00:00
J. Ryan Stinnett
76254977d6 Upgrade widget API 2021-10-28 11:07:09 +01:00
RiotRobot
fabbf6c48a Reset matrix-js-sdk back to develop branch 2021-10-25 11:36:39 +01:00
RiotRobot
cecea8109b Merge branch 'master' into develop 2021-10-25 11:34:33 +01:00
Germain
e3946cc7de
Upgrade ua-parser-js (#7026) 2021-10-25 09:55:37 +01:00
Travis Ralston
0d29626163
Update allchange (#6990) 2021-10-19 18:22:04 +01:00
Germain Souquet
493de82774 Upgrade yarn dependencies 2021-10-19 14:53:44 +01:00
David Baker
2b7ea16c2d Upgrade highlight.js 
Major version bump for highlight.js. Update usage of deprecated function & some cleanups.
 2021-10-18 19:32:20 +01:00
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