Commit Graph

34126 Commits (2a3b92f7d703ebe69ab47bf6c67d053562e275b6)

Author SHA1 Message Date
Germain Souquet 0e2e327c46 Delete new room intro stale CSS 2021-06-10 11:19:25 +01:00
Germain Souquet 7f3173f170 Implement unencrypted warning slate in rooms 2021-06-10 11:14:43 +01:00
Germain Souquet 4f649f290c Migrate RoomSettingsDialog to TypeScript 2021-06-10 10:46:54 +01:00
Germain Souquet c2d1eb3e8e Merge branch 'develop' into gsouquet-e2ee-warning 2021-06-10 10:25:20 +01:00
Germain 4660101944
Merge pull request #6165 from matrix-org/gsouquet/react-17 2021-06-10 10:13:18 +01:00
Germain Souquet b4cb275ca1 Fix expanding last collapsed sticky session when zoomed in 2021-06-09 17:59:41 +01:00
Germain 91a88f25a8
Merge pull request #6168 from matrix-org/gsouquet/fix-17586
Revert refreshStickyHeaders optimisations
2021-06-09 16:34:11 +01:00
David Baker 0b90560b1a
Merge pull request #6170 from matrix-org/dbkr/call_room_logging
Add logging for which rooms calls are in
2021-06-09 16:24:12 +01:00
J. Ryan Stinnett 9aaf506ad5
Merge pull request #6169 from matrix-org/jryans/rebuild-the-sky
Restore read receipt animation from event to event
2021-06-09 16:16:17 +01:00
David Baker bd8fd246c6 Add logging for which rooms calls are in 2021-06-09 16:04:03 +01:00
J. Ryan Stinnett c6972c4535 Fix spelling 2021-06-09 15:53:38 +01:00
J. Ryan Stinnett e566704bdf Remove redundant early return 2021-06-09 15:48:30 +01:00
J. Ryan Stinnett b43315c6c1 Restore read receipt animation from event to event
This restores expected read receipt animation by always including the positioned
parent of read receipts. I imagine there's something smarter we could be doing,
but for now, at least least get back to expected behaviour.

Fixes https://github.com/vector-im/element-web/issues/17561
2021-06-09 15:46:10 +01:00
Germain Souquet 927de02a8e Revert refreshStickyHeaders optimisations 2021-06-09 14:59:55 +01:00
Germain 66a953a678
Merge pull request #6166 from matrix-org/gsouquet/fix-17547
Restore copy button icon when sharing permalink
2021-06-09 14:14:04 +01:00
Germain fcef43c122
Merge pull request #6167 from matrix-org/gsouquet/fix-17588
Restore Page Up/Down key bindings when focusing the composer
2021-06-09 14:13:16 +01:00
Germain Souquet ceed6ecbe8 Restore Page Up/Down key bindings when focusing the composer 2021-06-09 14:03:31 +01:00
Germain Souquet 15132074e2 Restore copy button icon when sharing permalink 2021-06-09 13:44:31 +01:00
Germain Souquet 4e14c612b7 Remove extraenous instructions 2021-06-09 12:17:49 +01:00
Germain Souquet 90cc26c78f rename workflow 2021-06-09 12:17:12 +01:00
Germain Souquet 6e0a908c59 Merge branch 'develop' into gsouquet/react-17 2021-06-09 12:01:35 +01:00
Germain Souquet d492ee4d8a Update Enzyme adapter name 2021-06-09 11:57:29 +01:00
Germain Souquet 85d1bb65c6 Upgrade to React@17 2021-06-09 11:40:20 +01:00
Germain c9b1d1aef0
Only run e2e tests on develop and PR targetting develop
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-06-09 10:38:28 +01:00
Germain 8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf 2021-06-09 09:13:56 +01:00
Šimon Brandner fccd71f82e
Update styling based on review
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-09 06:23:51 +02:00
Robin Townsend a28f5754c7 Convert TextForEvent to TypeScript
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-08 21:58:48 -04:00
Travis Ralston 624aed053a
Merge pull request #6164 from matrix-org/dependabot/npm_and_yarn/css-what-5.0.1
Bump css-what from 5.0.0 to 5.0.1
2021-06-08 14:13:25 -06: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
Travis Ralston 692200b9c5
Merge pull request #6145 from matrix-org/dependabot/npm_and_yarn/test/end-to-end-tests/ws-6.2.2
Bump ws from 6.2.1 to 6.2.2 in /test/end-to-end-tests
2021-06-08 14:08:24 -06:00
Travis Ralston 16ddf18e69
Merge pull request #6163 from matrix-org/dependabot/npm_and_yarn/trim-newlines-3.0.1
Bump trim-newlines from 3.0.0 to 3.0.1
2021-06-08 14:08:02 -06: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
Michael Telatynski 2938bfbadf
Merge pull request #6162 from matrix-org/t3chguy/fix/17596
Fix upgrade to element home button in top left menu
2021-06-08 17:48:45 +01:00
Michael Telatynski 90982f9b3f Fix upgrade to element home button in top left menu 2021-06-08 17:31:08 +01:00
Michael Telatynski 2b99afc741 i18n 2021-06-08 17:05:56 +01:00
Michael Telatynski f34a2e61bc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 2021-06-08 16:54:49 +01:00
Michael Telatynski 34cc494a8e
Merge pull request #6140 from matrix-org/t3chguy/fix/17553 2021-06-08 16:45:35 +01:00
Michael Telatynski 93eb9feaa7 iterate PR based on feedback 2021-06-08 16:42:58 +01:00
Michael Telatynski f84ee22769 Add comment 2021-06-08 16:36:53 +01:00
David Baker 399be4fa5d
Merge pull request #6161 from matrix-org/dbkr/widget_load_error
Better handling for widgets that fail to load
2021-06-08 16:28:44 +01:00
David Baker 90a58380fd Make it translateable
And also the other one that I copied from
2021-06-08 16:15:20 +01:00
Šimon Brandner bf77a4a2ab
Merge remote-tracking branch 'upstream/develop' into show-username 2021-06-08 17:14:42 +02:00
Germain Souquet 5c62728d13 Migrate end to end tests pipeline to GitHub Actions 2021-06-08 12:52:32 +01:00
David Baker 26a030abcd Better handling for widgets that fail to load 2021-06-08 12:40:38 +01:00
Michael Telatynski 432373a00e
Merge pull request #5999 from robintown/improved-forwarding-ui 2021-06-08 10:52:06 +01:00
Michael Telatynski 826d56585e
Merge pull request #6118 from aaronraimist/share-room 2021-06-08 09:03:49 +01:00
Robin Townsend 372f24ff99 Hide download links from forward dialog preview
since trying to interact with them is pointless.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-07 19:19:14 -04:00
Robin Townsend b00ad63a35 Fix whitespace nitpick
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-07 19:16:00 -04:00
Robin Townsend a8dab04d5e Remove mystery dot from forward dialog preview
It was a bullet point, since EventTiles now get created as li by default
:P

Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-07 19:10:45 -04:00
Robin Townsend b97867271b Merge branch 'develop' into improved-forwarding-ui 2021-06-07 19:09:36 -04:00