Commit Graph

36556 Commits (0414ea27b8bb21dc57edb5618e5e3569faf8be40)

Author SHA1 Message Date
Michael Telatynski 0414ea27b8 Iterate PR based on feedback 2021-08-12 15:53:10 +01:00
Michael Telatynski 03e3da885d i18n 2021-08-12 12:09:28 +01:00
Michael Telatynski 57bf64bd28 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
 Conflicts:
	src/components/views/spaces/SpacePanel.tsx
2021-08-12 12:05:55 +01:00
Dariusz Niemczyk fbc5729daf
Merge pull request #6590 from matrix-org/palid/fix/images-loading-ux
Make loading encrypted images look snappier
2021-08-12 12:55:52 +02:00
Michael Telatynski 228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092 2021-08-12 11:28:14 +01:00
Michael Telatynski 9d3569a577 Iterate PR based on feedback 2021-08-12 10:58:56 +01:00
Michael Telatynski c6085a1a89
Merge pull request #6603 from SimonBrandner/fix/remove-unnecessary-code 2021-08-12 09:23:28 +01:00
Šimon Brandner ccaa69b25b
Remove unnecessary code
This somehow doesn't seem to be neccessary anymore, I don't really know why but everything seems to work without it

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 08:53:42 +02:00
Michael Telatynski 0ef9ea76e1 delint unused imports 2021-08-11 23:38:48 +01:00
Michael Telatynski 4f47907abf Show disabled spaces section in preferences regardless 2021-08-11 23:33:10 +01:00
Michael Telatynski 09ffad96ff
Merge pull request #6569 from matrix-org/t3chguy/fix/spaces-a11y 2021-08-11 23:18:52 +01:00
David Baker 1321e2fe6a
Merge pull request #6600 from matrix-org/dbkr/edit_pr_desc
Edit PR Description instead of commenting
2021-08-11 21:46:12 +01:00
David Baker 002c7328f3 Merge remote-tracking branch 'origin/develop' into dbkr/edit_pr_desc 2021-08-11 21:39:07 +01:00
David Baker db67a911d8
Merge pull request #6599 from matrix-org/dbkr/netlify_forked_pr_hack
Fix Netflify builds from fork PRs
2021-08-11 21:38:35 +01:00
David Baker 8016b340b0 Just upload the PR object itself
We don't know what secret info might end up in the context
2021-08-11 21:20:28 +01:00
David Baker 1fe5ace8ed Edit PR Description instead of commenting
We could include the magic comments in the PR template so the various
automated comments were always in the same order, if we wanted.
2021-08-11 21:10:22 +01:00
Travis Ralston 2e6da2dc6e
Merge pull request #6596 from SimonBrandner/fix/scrollbar-dot/18474
Remove tiny scrollbar dot from code blocks
2021-08-11 13:54:47 -06:00
Michael Telatynski 38dbe89316 Merge branch 't3chguy/fix/18092' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
	src/i18n/strings/en_EN.json
2021-08-11 20:53:41 +01:00
Michael Telatynski 5f54abc7e5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-08-11 20:51:47 +01:00
David Baker bbdee0d83b publish the right directory 2021-08-11 19:41:37 +01:00
David Baker cf8ee19e23 Fix Netflify builds from fork PRs
Some absolutely horrenous hacks to upload the context as an artifact
then download it, unzip it and set the PR number as a variable we can
use, because GitHub Actions just doesn't offer any other way of doing
this.

Maybe we'd be better off going back to Netlify...
2021-08-11 19:25:17 +01:00
Michael Telatynski eadc94035d
Merge pull request #6598 from SimonBrandner/fix/remove-line 2021-08-11 18:22:57 +01:00
Šimon Brandner 012f2c9e7e
This doesn't need to be here as it was moved into CallViewButtons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-11 19:16:55 +02:00
David Baker abba7983ce
Merge pull request #6578 from SimonBrandner/task/export-call-view-buttons
Move Call View Buttons into a separate component
2021-08-11 18:09:48 +01:00
Travis Ralston c93cc89cca
Merge pull request #6540 from SimonBrandner/task/color-cleanup-1
First cleanup of the theme files
2021-08-11 10:55:27 -06:00
Travis Ralston a149108a7d
Merge pull request #6353 from SimonBrandner/feature/improved-composer
Improve handling of pills in the composer
2021-08-11 10:55:13 -06:00
Šimon Brandner 5bc165f2ac
Make scrollbar dot transparent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-11 18:33:16 +02:00
Michael Telatynski 54d85a3864 Iterate PR based on feedback 2021-08-11 16:32:48 +01:00
Michael Telatynski 29e5a69b7a delint e2e test 2021-08-11 16:24:32 +01:00
Michael Telatynski d602dac7ef Add basic spaces tests to the e2e suite 2021-08-11 16:20:50 +01:00
Michael Telatynski 6b9dc40ad6 delint test 2021-08-11 16:12:08 +01:00
Michael Telatynski da110855f0 delint and remove groups-specific tests and setups 2021-08-11 15:36:35 +01:00
Michael Telatynski cbd6f2de44 Tweak copy on space preview 2021-08-11 15:03:38 +01:00
Michael Telatynski be85dcd1bf Delabs Spaces, keeping it as a default-on preference for the time being 2021-08-11 14:52:40 +01:00
Michael Telatynski c758f7de5b
Merge pull request #6592 from SimonBrandner/fix/hidden-rrs-setting
Don't set hidden RRs labs setting at account level
2021-08-11 13:45:44 +01:00
Šimon Brandner 833a5ee182
Don't set hidden RRs labs setting at account level
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-11 14:37:35 +02:00
Dariusz Niemczyk 723400ace6
Add a comment for weirdly placed div 2021-08-11 10:56:36 +02:00
Dariusz Niemczyk ef3737d179
Add full class names to animations.scss 2021-08-11 10:52:22 +02:00
Michael Telatynski 40cf05a3ce Fix space public share dialog showing atop the space invite dialog 2021-08-11 09:39:59 +01:00
Hubert Chathi 7415aa45d2
Merge pull request #6591 from uhoreg/use_mimetype_from_info
Use the mimetype from the info property rather than the EncryptedFile
2021-08-10 19:43:39 -04:00
Hubert Chathi 82c34e9ed1
Update src/utils/DecryptFile.ts
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-08-10 19:37:18 -04:00
Hubert Chathi 3b9810719f use the mimetype from the info property rather than the EncryptedFile
the mimetype in EncryptedFile is undocumented and redundant.
see https://github.com/matrix-org/matrix-doc/pull/2582
2021-08-10 19:27:24 -04:00
Michael Telatynski 013ccd46ad Fix feedback form in space create menu exploding 2021-08-10 18:24:58 +01:00
Dariusz Niemczyk c872609ed3
Modify encrypted images loading for better UX
Adds proper react css transition to encrypted images placeholders, so
that we can animate it's entrance and exit properly.
In addition, adds simple css animations file to properly handle all of
the animations in one place, so that it's much easier to properly handle
prefers-reduced-motion media query.
2021-08-10 19:24:17 +02:00
David Baker d7cb855419
Merge pull request #6589 from matrix-org/dbkr/upscale_thumbnails
Upscale thumbnails to the container size
2021-08-10 18:14:26 +01:00
Michael Telatynski 6efb699670 Tweak copy in the space create menu 2021-08-10 16:46:11 +01:00
Michael Telatynski f98de18427 Add blue beta dot to the space panel create button 2021-08-10 16:45:56 +01:00
Michael Telatynski 1272b375d5 Tweak space panel new/cancel button colouring 2021-08-10 16:45:21 +01:00
David Baker 50aa3d6c46 Upscale thumbnails to the container size
Force thumbnails to be the size of the container, even if that means
upscaling them. As per comment, this will mean that the thumbnails
will sometimes be larger and a bit blurry rather than small. It looks
like this was probably a source of scroll jumps before.

As per comment, a better fix would be to be be able to know what
size thumbnails the HS will give us so we can size the containers
appropriately.

Type: defect
Regressed by: https://github.com/matrix-org/matrix-react-sdk/pull/6514
Fixes https://github.com/vector-im/element-web/issues/18307
2021-08-10 15:14:04 +01:00
David Baker 87690f0739 Fix netflify preview build comment 2021-08-10 11:49:25 +01:00