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

1791 commits

Author SHA1 Message Date
Kerry
f742e3a17d
matrix-mock-request 2.0 (#8717) 2022-05-30 12:19:13 +00:00
Michael Telatynski
f3f14afbbf
Move spaces tests from Puppeteer to Cypress (#8645) 
* Move spaces tests from Puppeteer to Cypress

* Add missing fixture

* Tweak synapsedocker to not double error on a docker failure

* Fix space hierarchy loading race condition

Fixes https://github.com/matrix-org/element-web-rageshakes/issues/10345

* Fix race condition when creating public space with url update code

* Try Electron once more due to perms issues around clipboard

* Try set browser permissions properly

* Try to enable clipboard another way

* Try electron again

* Try electron again again

* Switch to built-in cypress feature for file uploads

* Mock clipboard instead

* TMPDIR ftw?

* uid:gid pls

* Clipboard tests can now run on any browser due to mocking

* Test Enter as well as button for space creation

* Make the test actually work

* Update cypress/support/util.ts

Co-authored-by: Eric Eastwood <erice@element.io>

Co-authored-by: Eric Eastwood <erice@element.io>
 2022-05-26 10:19:00 +01:00
RiotRobot
d214387c88 Reset matrix-js-sdk back to develop branch 2022-05-24 13:04:54 +01:00
RiotRobot
b0a6c216b7 Resetting package fields for development 2022-05-24 13:03:38 +01:00
RiotRobot
b5fdf11a03 v3.45.0 2022-05-24 12:57:53 +01:00
RiotRobot
076598ca85 Upgrade matrix-js-sdk to 18.0.0 2022-05-24 12:41:56 +01:00
RiotRobot
17cdf58d2d v3.45.0-rc.3 2022-05-20 11:00:07 +01:00
RiotRobot
3c2e9c364a Upgrade matrix-js-sdk to 18.0.0-rc.2 2022-05-20 10:58:03 +01:00
RiotRobot
c0bac337de v3.45.0-rc.2 2022-05-17 19:18:54 +01:00
RiotRobot
ca157db9d8 v3.45.0-rc.1 2022-05-17 19:13:51 +01:00
RiotRobot
a68032760e Upgrade matrix-js-sdk to 18.0.0-rc.1 2022-05-17 18:32:12 +01:00
Michael Telatynski
d9b7e0721c
Add visual tests using Percy in Cypress (#8610) 
* Add basic Percy tests

* Run Percy in CI

* Fix snapshot timing

* Fix bad selector

* Hide another bit of dynamic text

* Add docs
 2022-05-17 15:16:14 +00:00
Michael Telatynski
ad4d3f9a88
Move threads e2e tests over to cypress (#8501) 
* Add non-consent (default) Synapse template

* Add consent test

* Add create room test

* Stash work

* Initial threads tests

* fix

* Delete old threads e2e tests, plan new ones

* Fix typed s'more

* Try something else

* specify d.ts

* Fix types once and for all?

* Fix the consent tests

* Iterate threads test harness

* Fix dispatcher types

* Iterate threads test

* fix typing

* Alternative import attempt

* let it break let it break let it break

* Tweak types

* Stash

* delint and update docs

* null-guard scrollIntoView

* Iterate threads test

* Apply suggestions from code review
 2022-05-10 17:09:31 +00:00
RiotRobot
38f34c3d6a Reset matrix-js-sdk back to develop branch 2022-05-10 15:07:41 +01:00
RiotRobot
6396d26d21 Resetting package fields for development 2022-05-10 15:06:06 +01:00
RiotRobot
3d2866917a Merge branch 'master' into develop 2022-05-10 15:03:45 +01:00
RiotRobot
6d0e44cfc1 v3.44.0 2022-05-10 14:59:47 +01:00
RiotRobot
ee47cb8024 Upgrade matrix-js-sdk to 17.2.0 2022-05-10 14:54:47 +01:00
Janne Mareike Koschinski
e05a3e6446
fix: update matrix-analytics-events (#8543) 2022-05-09 14:18:15 +00:00
RiotRobot
873e9726fd v3.44.0-rc.2 2022-05-06 17:13:29 +01:00
Kerry
2c19d286ed
Eslint - require copyright header rule (#8514) 
* bump eslint plugin to 0.5.2

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add rule

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add missing copyright headers

Signed-off-by: Kerry Archibald <kerrya@element.io>

* fix comment order

Signed-off-by: Kerry Archibald <kerrya@element.io>
 2022-05-06 09:09:28 +00:00
Michael Telatynski
9c8a887361 Pin linkify version due to breaking changes 2022-05-03 23:35:08 +01:00
RiotRobot
9e55dda8ca v3.44.0-rc.1 2022-05-03 15:28:14 +01:00
RiotRobot
fab2a49a53 Upgrade matrix-js-sdk to 17.2.0-rc.1 2022-05-03 15:26:00 +01:00
Michael Telatynski
7477a2df7d
Switch coverage over to SonarQube (#8463) 2022-05-02 21:34:31 +01:00
Germain
45180111d0
Update analytics SDK (#8437) 2022-04-28 12:19:00 +01:00
Germain
1ed68a718f
Add new user signup event tracking in PostHog (#8412) 2022-04-28 11:46:02 +01:00
Janne Mareike Koschinski
9b0ab3321c
Add opt-in analytics to onboarding tasks (#8409) 
* Add interaction tracking to explore room, send DM and create room events in onboarding view and elsewhere
* Update matrix analytics events dependency
 2022-04-26 13:31:53 +02:00
RiotRobot
c7c0fdbcc5 Reset matrix-js-sdk back to develop branch 2022-04-26 12:15:33 +01:00
RiotRobot
961565967e v3.43.0 2022-04-26 11:37:40 +01:00
RiotRobot
bff1a3b088 Upgrade matrix-js-sdk to 17.1.0 2022-04-26 11:36:14 +01:00
RiotRobot
db89816db9 v3.43.0-rc.1 2022-04-19 14:55:24 +01:00
RiotRobot
1da1460baf Upgrade matrix-js-sdk to 17.1.0-rc.1 2022-04-19 14:54:05 +01:00
David Baker
b8013fc52a
Add a Cypress Test 🌲 (#8295) 
* A first, maybe working cypress test

Plus cypress plugins to manage synapses in docker containers

* Fix yaml

* This file is important

* try & find where it's put the artifact

* Download artifact to a directory

* pics or it didn't happen

* Add conditional, otherwise no artifacts on failure...

* Try increasing timeout

also actually give the test a name

* Try in chrome

* Get docker logs to see why it's failing

also document the chrome setting

* Try changing mode on homeserver.yaml

* debug

* More debugging

* more file permissions debugging

* ARGH

* more debug

* sigh

* Eugh, that's not how arguments work

* Add the option to really allow open registration

and remove debug logging / comment fixes

* failure to yaml

* Upload docker logs as artifacts

and temporarily remove contional to test

* Put the conditional back

* Upgrade types in end to end tests

to be compatible with fs-extra types

* Try reducing timeout a bit

also make password more... sensible

* Hex is not octal

* Remove file mode

Seems to be unnecessary since the signing key is perfectly fine

* Give the log files extensions

* Rename workflow file now it also does tests

* Add cypress scripts

* copyright headers

* Use ? operator

Co-authored-by: Travis Ralston <travisr@matrix.org>

* Use develop synapse image

* Tidy up any remaining synapses after each spec run

Also:
 * Move the synapseStart / synapseStop functions out to the top level
   so they can be reused
 * Add a tsconfig file
 * Give the containers names

* Don't upload video on test pass

We don't upload it anyway so tell cypress not to so it can not
bother encoding them

* Enable linting on cypress files

and fix existing lint errors

* Type check cypress files

and make it pass the type checks, specifically:
 * Upgrade sinon fake timers to a version that has the right types
 * Set module resolution
 * Type check cypress files separately

* Rename workflow file again

Probably better to just call it an element web build

* Don't plus + characters in container name

* Fix yaml

* Stream logs to file

* Add note to end to end tester to sya what's been ported

* Put docker rm in finally block

Co-authored-by: Travis Ralston <travisr@matrix.org>
 2022-04-14 10:41:58 +01:00
RiotRobot
42dbe14f36 Reset matrix-js-sdk back to develop branch 2022-04-12 10:38:05 +01:00
RiotRobot
28512f20d3 Resetting package fields for development 2022-04-12 10:37:54 +01:00
RiotRobot
336492275a Merge branch 'master' into develop 2022-04-12 10:36:00 +01:00
RiotRobot
5f356093fd v3.42.3 2022-04-12 10:33:26 +01:00
RiotRobot
7844c3ac8d Upgrade matrix-js-sdk to 17.0.0 2022-04-12 10:31:47 +01:00
David Baker
285dc25b3e
Add a test for URL previews being disabled in e2e rooms (#8270) 
* Add a test for URL previews being disabled in e2e rooms

Regression test for https://github.com/matrix-org/matrix-react-sdk/pull/8227

* Fix the types
 2022-04-08 18:32:35 +01:00
Hugh Nimmo-Smith
457fc542da
Replace browser-encrypt-attachment with matrix-encrypt-attachment (#7795) 
* Replace browser-encrypt-attachment with matrix-encrypt-attachment

matrix-encrypt-attachment is maintained and includes TS typings

* Upgrade matrix-encrypt-attachment to latest with default exports
 2022-04-05 11:29:27 -06:00
RiotRobot
e4df547c31 v3.42.2-rc.1 2022-04-05 18:13:45 +01:00
RiotRobot
7571552836 Upgrade matrix-js-sdk to 16.0.2-rc.1 2022-04-05 18:12:37 +01:00
Travis Ralston
a6564d9ab9 Step 14: Remove reskindex 2022-03-28 15:30:30 -06:00
Travis Ralston
15b84bd9a6 Step 2: Remove the decorator 2022-03-28 14:02:31 -06:00
RiotRobot
2520d81784 Reset matrix-js-sdk back to develop branch 2022-03-28 16:19:31 +01:00
RiotRobot
7a130d2eb7 Resetting package fields for development 2022-03-28 16:19:20 +01:00
RiotRobot
7507d4f43d Merge branch 'master' into develop 2022-03-28 16:19:20 +01:00
RiotRobot
cc296ef3da v3.42.1 2022-03-28 16:17:36 +01:00
RiotRobot
eb51ba1d2a Upgrade matrix-js-sdk to 16.0.1 2022-03-28 16:16:39 +01:00
Michael Telatynski
bc01efa124
Improve handling of animated GIF and WEBP images (#8153) 2022-03-25 16:31:40 +00:00
Travis Ralston
f92fcb7945
Fix stylelint on Windows (#8132) 2022-03-23 12:23:35 -06:00
Šimon Brandner
3534e9b6ce
Upgrade emojibase and twemoji (#7286) 
Co-authored-by: Tulir Asokan <tulir@maunium.net>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2022-03-23 17:08:34 +00:00
RiotRobot
00d32482fa v3.42.1-rc.1 2022-03-22 21:48:22 +00:00
RiotRobot
cbb704fb24 Upgrade matrix-js-sdk to 16.0.1-rc.1 2022-03-22 21:46:47 +00:00
Michael Telatynski
7a22682a80
Install typings for escape-html package (#8098) 2022-03-21 17:02:22 +00:00
RiotRobot
2778fd135e Reset matrix-js-sdk back to develop branch 2022-03-15 14:34:00 +00:00
RiotRobot
2ed18a1d85 Resetting package fields for development 2022-03-15 14:33:47 +00:00
RiotRobot
d592537a3a Merge branch 'master' into develop 2022-03-15 14:33:46 +00:00
RiotRobot
ac3a907238 v3.42.0 2022-03-15 14:31:45 +00:00
RiotRobot
ddb3f57470 Upgrade matrix-js-sdk to 16.0.0 2022-03-15 14:26:48 +00:00
Andy Balaam
c89c2253fd
Add test coverage reporting (#8009) 2022-03-10 13:17:01 +00:00
RiotRobot
e485907443 v3.42.0-rc.1 2022-03-08 14:54:35 +00:00
RiotRobot
6dbcf837e5 Upgrade matrix-js-sdk to 16.0.0-rc.1 2022-03-08 14:53:26 +00:00
Kerry
547144a565
Jest mock for svgr icons (#7941) 
* add svg mock

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use same mock string as imageMock

Signed-off-by: Kerry Archibald <kerrya@element.io>

* newline

Signed-off-by: Kerry Archibald <kerrya@element.io>
 2022-03-02 12:05:50 +00:00
RiotRobot
b7787eaf2e Merge branch 'master' into develop 2022-03-01 11:57:55 +00:00
RiotRobot
915d8385d4 v3.41.1 2022-03-01 11:52:59 +00:00
RiotRobot
b02d5ecb97 Merge branch 'master' into develop 2022-02-28 17:01:22 +00:00
RiotRobot
bf2bb26cda v3.41.0 2022-02-28 16:51:08 +00:00
RiotRobot
9feae296f4 Upgrade matrix-js-sdk to 15.6.0 2022-02-28 16:48:46 +00:00
Michael Telatynski
75e41b4c1c
Basic threads analytics into Posthog MVP (#7871) 2022-02-28 14:11:14 +00:00
Kerry
6e143c313e
eslint to 8.9.0 (#7889) 
Signed-off-by: Kerry Archibald <kerrya@element.io>
 2022-02-24 15:54:06 +01:00
RiotRobot
4dccf9e98f v3.41.0-rc.1 2022-02-22 13:49:09 +00:00
RiotRobot
a793815aa2 Upgrade matrix-js-sdk to 15.6.0-rc.1 2022-02-22 13:39:33 +00:00
Andy Balaam
eed8db4c26 Bump matrix-events-sdk to 0.0.1-beta.7 (#7837) 
* Bump matrix-events-sdk to 0.0.1-beta.7

* Update lockfile
 2022-02-22 13:00:03 +00:00
Andy Balaam
213b32bf14
Bump matrix-events-sdk to 0.0.1-beta.7 (#7837) 
* Bump matrix-events-sdk to 0.0.1-beta.7

* Update lockfile
 2022-02-22 11:54:56 +00:00
Kerry
9db59d75b9
Bump react-focus-lock (#7858) 
* react-focus-lock to 2.5.1

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use enzyme in ASSD test so focus lock finds active element

Signed-off-by: Kerry Archibald <kerrya@element.io>

* findById and flushPromises to test utils

Signed-off-by: Kerry Archibald <kerrya@element.io>
 2022-02-21 17:09:01 +00:00
Michael Telatynski
38a547b5d0
Remove ResizeObserver Polyfill (#7844) 2022-02-18 13:51:27 +00:00
Michael Telatynski
658590e5bc
More posthog tracking around joining rooms and room search (#7807) 2022-02-17 18:03:27 +00:00
RiotRobot
c19aa957b6 Merge branch 'master' into develop 2022-02-17 12:08:14 +00:00
RiotRobot
5892d8b733 v3.40.1 2022-02-17 11:55:35 +00:00
RiotRobot
da6b6b3bc0 Upgrade matrix-js-sdk to 15.5.2 2022-02-17 11:52:34 +00:00
Travis Ralston
aba61fa390 Revert "Support refresh tokens (#7802)" 
This reverts commit 839593412c.
 2022-02-16 12:32:38 -07:00
Travis Ralston
839593412c
Support refresh tokens (#7802) 
MSC: https://github.com/matrix-org/matrix-doc/pull/2918
Fixes https://github.com/vector-im/element-web/issues/18698
Fixes https://github.com/vector-im/element-web/issues/20648
**Requires https://github.com/matrix-org/matrix-js-sdk/pull/2178**

**Note**: There's a lot of logging in this PR. That is intentional to ensure that if/when something goes wrong we can chase the exact code path. It does not log any tokens - just where the code is going. Overall, it should be fairly low volume spam (and can be relaxed at a later date).

----

This approach uses indexeddb (through a mutex library) to manage which tab actually triggers the refresh, preventing issues where multiple tabs try to update the token. If multiple tabs update the token then the server might consider the account hacked and hard logout all the tokens.

If for some reason the timer code gets it wrong, or the user has been offline for too long and the token can't be refreshed, they should be sent to a soft logout screen by the server. This will retain the user's encryption state - they simply need to reauthenticate to get an active access token again.

This additionally contains a change to fix soft logout not working, per the issue links above.

Of interest may be the IPC approach which was ultimately declined in favour of this change instead: https://github.com/matrix-org/matrix-react-sdk/pull/7803
 2022-02-15 20:16:49 +00:00
Michael Telatynski
cfa6e266cd
Wire up new fields on the ViewRoom posthog event and more interactions (#7787) 2022-02-14 19:31:13 +00:00
Travis Ralston
9141225a79
Add jest-mock to dependencies (#7800) 
It's being used by the chat export test, but is not listed as a dependency.

If we rely on it, we should rely on it.
 2022-02-14 19:29:08 +00:00
RiotRobot
9b3af6c493 Reset back to develop branch 2022-02-14 15:41:31 +00:00
RiotRobot
8c62945096 Resetting package fields for development 2022-02-14 15:39:36 +00:00
RiotRobot
0304d3245c Merge branch 'master' into develop 2022-02-14 15:39:33 +00:00
RiotRobot
f7e6250599 v3.40.0 2022-02-14 15:23:26 +00:00
RiotRobot
7558568158 Upgrade matrix-js-sdk to 15.5.1 2022-02-14 15:19:06 +00:00
Michael Telatynski
87ca70edb1
Switch to web-specific screens and $pageview event (#7777) 2022-02-10 14:38:31 +00:00
Michael Telatynski
fd832488f1
Update slash command posthog enum (#7776) 2022-02-10 13:11:10 +00:00
Michael Telatynski
f6565bfbc8
Send how many favorited rooms a user has to Posthog (#7772) 2022-02-10 10:02:34 +00:00
Michael Telatynski
5620b83d34
Wire up more Posthog tracking (#7689) 2022-02-09 14:25:58 +00:00
RiotRobot
db34ff8174 v3.40.0-rc.2 2022-02-09 10:27:18 +00:00
Kerry
ebb1feee50
Basic script to create react component with test and style files (#7757) 
* basically working script

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add test template

* add skinned-sdk import to test temp

* remove extra import

Signed-off-by: Kerry Archibald <kerrya@element.io>

* comments

Signed-off-by: Kerry Archibald <kerrya@element.io>
 2022-02-09 10:33:21 +01:00
Michael Telatynski
91ccbe4395
Add way to track posthog user properties and send numSpaces (#7716) 2022-02-09 09:21:56 +00:00
RiotRobot
4c3c20ae62 v3.40.0-rc.1 2022-02-08 15:40:30 +00:00
RiotRobot
ec571ddd8d Upgrade matrix-js-sdk to 15.5.1-rc.1 2022-02-08 15:37:07 +00:00
J. Ryan Stinnett
7f3f186044
Switch back to upstream Linkify (#7677) 2022-02-04 17:21:03 +00:00
Kerry
292971dd0e
Upgrade to jest 27 (#7699) 
* use jest@27.4.0, replace jest-environment-jsdom-sixteen with jest-environment-jsdom

Signed-off-by: Kerry Archibald <kerrya@element.io>

* polyfill setImmediate

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove done from async test cases

* useRealTimers in test relying on promise flushing

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove jest environment file

Signed-off-by: Kerry Archibald <kerrya@element.io>

* replace ts-jest mocked with jest utils mocked

Signed-off-by: Kerry Archibald <kerrya@element.io>
 2022-02-02 13:02:17 +01:00
RiotRobot
e90885dd9d Merge branch 'master' into develop 2022-02-01 15:52:12 +00:00
RiotRobot
34a95f4d27 v3.39.1 2022-02-01 15:50:26 +00:00
Michael Telatynski
8dd0722e04
Update eventName=Screen to $screen to match PostHog's special behaviour (#7667) 2022-02-01 15:49:49 +00:00
RiotRobot
8221faad6c Reset matrix-js-sdk back to develop branch 2022-01-31 14:57:25 +00:00
RiotRobot
9283202b87 Resetting package fields for development 2022-01-31 14:57:14 +00:00
RiotRobot
a25fea9f96 Merge branch 'master' into develop 2022-01-31 14:57:13 +00:00
RiotRobot
bdcdd745ba v3.39.0 2022-01-31 14:55:25 +00:00
RiotRobot
e0b041bdca Upgrade matrix-js-sdk to 15.5.0 2022-01-31 14:48:14 +00:00
Kerry
085ecc7f5f
Chat export parameter customisation (#7647) 
* use export settings and hide fields

Signed-off-by: Kerry Archibald <kerrya@element.io>

* fix exporter tests

Signed-off-by: Kerry Archibald <kerrya@element.io>

* test ExportDialog with settings

Signed-off-by: Kerry Archibald <kerrya@element.io>

* tidy debugs, rename setting to Parameters

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use reasonable 100gb limit

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use normal setting instead of UIFeature

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use a customisation

Signed-off-by: Kerry Archibald <kerrya@element.io>

* move validateNumberInRange to utils

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use nullish coalesce

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use 8gb size limit for customisation

Signed-off-by: Kerry Archibald <kerrya@element.io>

* update comments

Signed-off-by: Kerry Archibald <kerrya@element.io>
 2022-01-31 12:54:14 +01:00
RiotRobot
7567aebe47 v3.39.0-rc.2 2022-01-26 18:07:18 +00:00
RiotRobot
f2d360e639 v3.39.0-rc.1 2022-01-26 17:04:44 +00:00
RiotRobot
01d1e0292c Upgrade matrix-js-sdk to 15.5.0-rc.1 2022-01-26 17:01:37 +00:00
J. Ryan Stinnett
51a44f491e
Upgrade linkifyjs to fix schemes as domain prefixes (#7628) 2022-01-25 17:37:54 +00:00
David Baker
91743c9a1a
Switch to github: URL to be consistent with other deps (#7588) 
and resolves to a tarball which can be cached nicely. Also
some other yarn.lock change that yarn seems to be insisting on.

Fixes https://github.com/vector-im/element-web/issues/20628
 2022-01-21 09:32:09 +00:00
Travis Ralston
6712a5b1c5
Parse matrix-schemed URIs (#7453) 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
Co-authored-by: Dariusz Niemczyk <dariuszn@element.io>
Co-authored-by: Timo K <toger5@hotmail.de>

With this pr all href use matrix matrix.to links. As a consequence right-click copy link will always return get you a sharable matrix.to link.
 2022-01-20 18:18:47 +01:00
Dariusz Niemczyk
336e1ae3b6
Upgrade linkify to v3.0 (#7282) 
Co-authored-by: Timo K <toger5@hotmail.de>
 2022-01-18 18:24:16 +01:00
Travis Ralston
65987e6b72
Move all polls processing to events-sdk & prep for stable polls (#7517) 
* Move all polls processing to events-sdk

This makes polls support the full range of extensible events (both parsing and generation).

* Appease the linter

* Fix & update tests

* Update events-sdk for polls bugfix

* Update events-sdk for typechecking

* Add missing type cast

* Update per review
 2022-01-17 10:06:30 -07:00
RiotRobot
4028b5ef2e Resetting package fields for development 2022-01-17 14:26:25 +00:00
RiotRobot
11ca9bd707 Merge branch 'master' into develop 2022-01-17 14:24:39 +00:00
RiotRobot
0b83dfcd63 v3.38.0 2022-01-17 14:17:04 +00:00
RiotRobot
3c26418b5c Upgrade matrix-js-sdk to 15.4.0 2022-01-17 14:13:57 +00:00
Travis Ralston
61a0be7d46
Render events as extensible events (behind labs) (#7462) 
* Render events as extensible events (behind labs)

* Include the SDK

* Appease linter

* Update for changed property name

* Fix formatting error

* Fix branch matching for build steps

* Update SDK

* Update scripts/fetchdep.sh

Co-authored-by: Andy Balaam <andyb@element.io>

Co-authored-by: Andy Balaam <andyb@element.io>
 2022-01-13 17:03:37 +00:00
J. Ryan Stinnett
8b01b68fa3
Use published matrix-web-i18n (#7530) 2022-01-13 10:30:09 +00:00
Eric Eastwood
038a6bc204
Make slash command errors translatable but also work in rageshakes (#7377) 
See https://github.com/matrix-org/matrix-react-sdk/pull/7372#discussion_r769556546

We want the error to be translated for the user but not in our rageshake logs.

Also updates some error messages to give more info.
 2022-01-11 12:25:28 -06:00
RiotRobot
3c7c620b1f v3.38.0-rc.1 2022-01-11 15:04:11 +00:00
RiotRobot
0d84372da2 Upgrade matrix-js-sdk to 15.4.0-rc.1 2022-01-11 15:02:33 +00:00
J. Ryan Stinnett
6199c337ea
Fix spacing errors (#7484) 2022-01-10 12:57:20 +00:00
Kerry
846fbfa2a0
Add jsx-a11y eslint plugin (#7434) 
* add matrix-org a11y eslint plgin

Signed-off-by: Kerry Archibald <kerrya@element.io>

* add eslint a11y, enable and fix anchor-has-content rule

Signed-off-by: Kerry Archibald <kerrya@element.io>

* enable and fix jsx-a11y/no-redundant-roles

Signed-off-by: Kerry Archibald <kerrya@element.io>

* remove debug

Signed-off-by: Kerry Archibald <kerrya@element.io>

* i18n

Signed-off-by: Kerry Archibald <kerrya@element.io>

* use jsx-a11y via matrix-org-eslint

Signed-off-by: Kerry Archibald <kerrya@element.io>
 2022-01-03 18:51:58 +01:00
RiotRobot
2330292c24 Reset back to develop branch 2021-12-20 14:29:05 +00:00
RiotRobot
689ddb2ba7 Resetting package fields for development 2021-12-20 14:22:48 +00:00
RiotRobot
96e16940bb v3.37.0 2021-12-20 14:05:26 +00:00
RiotRobot
fa63c939ba Upgrade matrix-js-sdk to 15.3.0 2021-12-20 14:03:15 +00:00
Michael Telatynski
3bf85a05a9
[Release] Pin qrcode to fix e2e verification bug (#7379) 2021-12-15 16:23:18 +00:00
RiotRobot
12abc9731a v3.37.0-rc.1 2021-12-14 14:43:37 +00:00
RiotRobot
0fac781f47 Upgrade matrix-js-sdk to 15.3.0-rc.1 2021-12-14 14:42:11 +00:00
Michael Telatynski
132e19beb7
Update typescript-eslint plugin & parser (#7351) 2021-12-13 23:39:45 +00:00
RiotRobot
56dcce6bfc Merge branch 'master' into develop 2021-12-13 15:30:11 +00:00
RiotRobot
b693ecffb8 v3.36.1 2021-12-13 15:27:02 +00:00
RiotRobot
72bdd61407 Upgrade matrix-js-sdk to 15.2.1 2021-12-13 15:25:24 +00:00
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
Aaron Raimist
7b94e13a84 Merge branch 'develop' into sort-imports 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-12-09 08:34:20 +00: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
b856083716 v3.36.0 2021-12-06 15:20:39 +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
ba83f2f1a6 v3.36.0-rc.1 2021-11-30 18:22:22 +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
a5f2f4df0a Resetting package fields for development 2021-11-22 14:27:30 +00:00
RiotRobot
bb55c76d81 v3.35.1 2021-11-22 14:25:48 +00:00
RiotRobot
74fd21c505 v3.35.0 2021-11-22 13:35:23 +00:00
RiotRobot
a434270879 Upgrade matrix-js-sdk to 15.1.1 2021-11-22 13:34:00 +00:00
RiotRobot
525a492ae1 v3.35.0-rc.1 2021-11-17 14:06:59 +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
5cd1aaa13b Merge branch 'master' into develop 2021-11-08 17:52:25 +00:00
RiotRobot
27e2faaf64 v3.34.0 2021-11-08 17:43:59 +00:00
RiotRobot
d0483bf4b1 Upgrade matrix-js-sdk to 15.1.0 2021-11-08 17:42:01 +00:00
Germain
7a203461f7
Fix TimeZone to be UTC in Jest tests (#7082) 2021-11-04 10:39:49 +00:00
RiotRobot
5040ef951f v3.34.0-rc.1 2021-11-02 14:19:05 +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
Aaron Raimist
bc1dd6fedf Merge branch 'develop' into sort-imports 2021-10-28 19:44:21 -05:00
J. Ryan Stinnett
76254977d6 Upgrade widget API 2021-10-28 11:07:09 +01:00
Aaron Raimist
f3867ad0a9 Merge branch 'develop' into sort-imports 2021-10-27 21:50:56 -05:00
RiotRobot
fabbf6c48a Reset matrix-js-sdk back to develop branch 2021-10-25 11:36:39 +01:00
RiotRobot
70963e3a21 Resetting package fields for development 2021-10-25 11:35:26 +01:00
RiotRobot
cecea8109b Merge branch 'master' into develop 2021-10-25 11:34:33 +01:00
Aaron Raimist
860c0596e1
Add rule to group imports by external and internal 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-10-22 17:21:46 -05:00
Travis Ralston
0d29626163
Update allchange (#6990) 2021-10-19 18:22:04 +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
89365d943b Resetting package fields for development 2021-10-12 08:48:24 +01:00
RiotRobot
b1baa3575a v3.32.1 2021-10-12 08:42:35 +01:00
RiotRobot
6b4bcbd289 Upgrade matrix-js-sdk to 14.0.1 2021-10-12 08:40:57 +01:00
RiotRobot
425eeada6f v3.32.0-rc.1 2021-10-04 12:03:41 +01:00
RiotRobot
7fc4f54ae7 Upgrade matrix-js-sdk to 14.0.0-rc.1 2021-10-04 12:01:31 +01:00
Travis Ralston
fe0a68b71e
Merge pull request #6869 from SimonBrandner/task/src-ts 
Convert `/src` to TS
 2021-09-30 12:48:23 -06:00
Jaiwanth
208b914cb0 Merge branch 'develop' into export-conversations 2021-09-29 19:32:05 +05:30
Šimon Brandner
de44b3aacc
Convert index to TS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-09-27 18:40:01 +02:00
RiotRobot
b635d01779 Reset matrix-js-sdk back to develop branch 2021-09-27 14:33:56 +01:00
RiotRobot
3e2e3fcd20 Resetting package fields for development 2021-09-27 14:33:46 +01:00
RiotRobot
dad60804ba v3.31.0 2021-09-27 14:31:26 +01:00
RiotRobot
ccfc57657a Upgrade matrix-js-sdk to 13.0.0 2021-09-27 14:27:26 +01:00
RiotRobot
a22e2ef874 v3.31.0-rc.2 2021-09-22 14:35:24 +01:00
Jaiwanth
94e4fb71c1 Merge branch 'develop' into export-conversations 2021-09-22 18:07:01 +05:30
RiotRobot
531622f3b5 v3.31.0-rc.1 2021-09-21 09:41:50 +01: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
16065e0a8b Pin react too... 2021-09-15 16:14:58 +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
RiotRobot
85fea9cfd0 Merge branch 'master' into develop 2021-09-14 16:02:04 +01:00
RiotRobot
c3089a1097 v3.30.0 2021-09-14 15:56:23 +01:00
RiotRobot
4ea0385061 Upgrade matrix-js-sdk to 12.5.0 2021-09-14 15:54:30 +01:00
RiotRobot
f9e17621af Merge branch 'master' into develop 2021-09-13 13:00:40 +01:00
RiotRobot
df20960ee8 v3.29.1 2021-09-13 12:54:45 +01:00
RiotRobot
2a2c2c19cf Upgrade matrix-js-sdk to 12.4.1 2021-09-13 12:54:01 +01:00
RiotRobot
a5e2877862 v3.30.0-rc.2 2021-09-09 18:28:58 +01:00
RiotRobot
71b20608a2 v3.30.0-rc.1 2021-09-07 18:28:33 +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
0a09682982 Resetting package fields for development 2021-08-31 13:57:16 +01:00
RiotRobot
417415ab3b Merge branch 'master' into develop 2021-08-31 13:56:00 +01:00
RiotRobot
e4f27f04b9 v3.29.0 2021-08-31 13:52:40 +01:00
RiotRobot
09b40870d4 Upgrade matrix-js-sdk to 12.4.0 2021-08-31 13:51:17 +01:00
RiotRobot
54b93f44d0 v3.29.0-rc.3 2021-08-26 14:19:19 +01:00
David Baker
59833d1306 Update changelog generator 2021-08-25 17:21:48 +01:00
RiotRobot
ccafcd0d39 v3.29.0-rc.2 2021-08-25 11:46:07 +01:00
RiotRobot
b58f7fea57 v3.29.0-rc.1 2021-08-24 17:30:44 +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
0f9e8f280a Merge branch 'master' into develop 2021-08-17 09:41:43 +01:00
RiotRobot
0dd479c466 v3.28.1 2021-08-17 09:40:11 +01:00
RiotRobot
6e82b064ec Upgrade matrix-js-sdk to 12.3.1 2021-08-17 09:29:20 +01:00
RiotRobot
0f382efb46 Resetting package fields for development 2021-08-16 15:02:29 +01:00
RiotRobot
c4de03ddb0 v3.28.0 2021-08-16 14:45:13 +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
429befac62 v3.28.0-rc.1 2021-08-11 16:02:12 +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
850b5452a0 Add tests for reply regex 2021-08-09 12:36:06 +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
Travis Ralston
9b32a1c609 Appease Jest 2021-08-04 15:23:35 -06:00
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
e2ef5d1737 Resetting package fields for development 2021-08-02 13:08:10 +01:00
RiotRobot
e77f7319f2 v3.27.0 2021-08-02 13:06:29 +01:00
RiotRobot
d1e7c48125 Upgrade matrix-js-sdk to 12.2.0 2021-08-02 13:05:48 +01:00
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
df6d772d8d Pin posthog version 
We'd like to manually review each posthog change to avoid unanticipated tracking leakages;
each upgrade should include reviewing the data coming in on events
 2021-07-28 14:40:32 +01:00
James Salter
55e8173ee9 remove whitespace 2021-07-28 12:12:10 +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
cc0ff41360 v3.27.0-rc.1 2021-07-27 16:01:52 +01:00
RiotRobot
78eb8ffc26 Upgrade matrix-js-sdk to 12.2.0-rc.1 2021-07-27 15:51:16 +01: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
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
ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00
RiotRobot
676d2aa187 Resetting package fields for development 2021-07-19 16:16:18 +01:00
RiotRobot
13731177a3 Merge branch 'master' into develop 2021-07-19 16:14:58 +01:00
RiotRobot
e7ad33db0f v3.26.0 2021-07-19 16:00:26 +01:00
RiotRobot
3335ffa069 Upgrade matrix-js-sdk to 12.1.0 2021-07-19 15:54:25 +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
Michael Telatynski
296d5d1d5e stub out workers for jest tests as it doesn't like the worker-loader 2021-07-14 18:50:01 +01:00
RiotRobot
0fe91c07b8 v3.26.0-rc.1 2021-07-14 16:27:35 +01: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
d8bf618d73 unrelated: move @types/commonmark to devDeps 2021-07-07 20:08:52 +01:00
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
edae9a4844 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 10:19:25 +02:00
RiotRobot
7b4fd161e5 Reset fields for development 2021-07-05 16:27:07 +01:00
RiotRobot
f1b4d72cec Merge branch 'master' into develop 2021-07-05 16:25:02 +01:00
RiotRobot
8baa92f2b1 v3.25.0 2021-07-05 15:07:00 +01:00
RiotRobot
2fa2877aed Upgrade matrix-js-sdk to 12.0.1 2021-07-05 15:00:00 +01:00
Jaiwanth
190ccb6f00 Merge and add export support for the modified MAudioBody 2021-07-02 10:41:04 +05:30
David Baker
6aa0a4428e Merge remote-tracking branch 'origin/develop' into dbkr/tests_lint 2021-07-01 23:11:43 +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
536e3aadd7 Merge remote-tracking branch 'origin/develop' into dbkr/tests_lint 2021-07-01 21:39:17 +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
David Baker
ee9be5438e eslint --fix 2021-07-01 20:43:05 +01:00
Jaiwanth
551639811b Merge and resolve conflicts 2021-06-30 12:29:13 +05:30