Šimon Brandner
0a4a1506d4
Use ignoreSelfEvent in the RoomListStore (which doesn't work!)
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 09:40:26 +02:00
Šimon Brandner
f2dccbc9f7
Use function syntax
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 09:38:57 +02:00
Šimon Brandner
10e42d4d48
Merge remote-tracking branch 'upstream/develop' into fix/rl-resort/110
2021-08-12 09:08:02 +02: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
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
Šimon Brandner
1f98ea4562
Use ignoreSelfEvent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-11 18:02:40 +02:00
Šimon Brandner
ee0eda7947
Add ignoreSelfEvent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-11 18:02:33 +02: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
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
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
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
David Baker
c1b49092f8
Merge pull request #6586 from matrix-org/dbkr/pr_comment_in_workflow_run
...
Do the PR comment a different way
2021-08-10 11:40:57 +01:00
David Baker
c76859a809
Merge pull request #6588 from RiotTranslateBot/weblate-element-web-matrix-react-sdk
...
Translations update from Weblate
2021-08-10 11:39:51 +01:00
Weblate
a09ebfe2b5
Merge branch 'origin/develop' into Weblate.
2021-08-10 09:34:35 +00:00
Ihor Hordiichuk
49ab42613c
Translated using Weblate (Ukrainian)
...
Currently translated at 45.8% (1428 of 3115 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
2021-08-10 09:34:35 +00:00
jelv
a9d3219838
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (3115 of 3115 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-08-10 09:34:33 +00:00
Michael Telatynski
6877c8fe0c
Merge pull request #6587 from matrix-org/t3chguy/fix/18465
...
Fix create room dialog in spaces no longer adding to the space
2021-08-10 10:34:26 +01:00
Michael Telatynski
b7246404be
Fix create room dialog in spaces no longer adding to the space
2021-08-10 10:05:19 +01:00
Michael Telatynski
857bb9db44
Add some treeview labels
2021-08-10 09:46:25 +01:00
Weblate
fdd0747d94
Merge branch 'origin/develop' into Weblate.
2021-08-09 19:21:20 +00:00
David Baker
6eed09f261
Merge pull request #6574 from matrix-org/dbkr/preview_changelog
...
Add changelog preview action
2021-08-09 20:21:16 +01:00
David Baker
32ad5dc19c
Do the PR comment a different way
...
Because the built in netlify action's way doesn't work in workflow_run
2021-08-09 20:16:54 +01:00
Weblate
3454495a47
Merge branch 'origin/develop' into Weblate.
2021-08-09 18:27:43 +00:00
想不出网名
3a6bfe3572
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 95.4% (2973 of 3115 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
2021-08-09 18:27:43 +00:00
David Baker
d2e8e13afb
No event.number in the workflow_run action
2021-08-09 19:27:13 +01:00
Weblate
ca0b2ac333
Merge branch 'origin/develop' into Weblate.
2021-08-09 18:16:24 +00:00
想不出网名
a5921597ed
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 95.4% (2973 of 3115 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
2021-08-09 18:16:23 +00:00
David Baker
dd36dde8c9
rename artifact
2021-08-09 19:16:08 +01:00
Weblate
42a451650b
Merge branch 'origin/develop' into Weblate.
2021-08-09 18:09:48 +00:00
David Baker
99cc79bec9
Merge pull request #6585 from matrix-org/dbkr/fix_netlify_upload
...
Hopefully working Netlify upload
2021-08-09 19:09:44 +01:00
David Baker
28eb45b928
Hopefully working Netlify upload
...
as per comment
2021-08-09 18:35:36 +01:00
Weblate
4e3465faaa
Merge branch 'origin/develop' into Weblate.
2021-08-09 17:03:36 +00:00
David Baker
81b72fe70e
disable netlify uplaod while I debug it
2021-08-09 18:03:15 +01:00