Commit Graph

39508 Commits (f3990ff21857bbc34833d7285cb2b0b562f2af0b)

Author SHA1 Message Date
Šimon Brandner 7ce88c9966
$toast-bg-color -> $system
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 16:20:30 +02:00
Šimon Brandner aca073f5da
$system-... -> $system
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 16:16:13 +02:00
David Baker ca207da38f
Merge pull request #6601 from matrix-org/dbkr/allchange_npm
Use changelog generator from npm
2021-08-12 15:02:21 +01:00
Jaiwanth e88edba650
Merge branch 'develop' into export-conversations 2021-08-12 17:10:13 +05:30
Michael Telatynski 03e3da885d i18n 2021-08-12 12:09:28 +01:00
Michael Telatynski 8ddaa7faf1 i18n 2021-08-12 12:08:57 +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
Michael Telatynski 85b1f166e8 post-merge tidy up 2021-08-12 12:03:14 +01:00
Weblate bf10c7db04 Merge branch 'origin/develop' into Weblate. 2021-08-12 10:56:00 +00:00
jelv 0f77847900 Translated using Weblate (Dutch)
Currently translated at 99.4% (3124 of 3141 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-08-12 10:56:00 +00: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 0a209afdc2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
 Conflicts:
	res/css/structures/_SpaceHierarchy.scss
	src/components/structures/SpaceHierarchy.tsx
	src/i18n/strings/en_EN.json
2021-08-12 11:41:03 +01:00
Weblate 71de0a355c Merge branch 'origin/develop' into Weblate. 2021-08-12 10:28:23 +00:00
Nikita Epifanov 31ffe33cf3 Translated using Weblate (Russian)
Currently translated at 98.3% (3067 of 3117 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
2021-08-12 10:28:23 +00:00
Michael Telatynski 228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092 2021-08-12 11:28:14 +01:00
Michael Telatynski f53eb4eeed Fix tab trapping behaviour 2021-08-12 11:27:34 +01:00
Michael Telatynski f9527c9d6b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete
 Conflicts:
	src/components/views/rooms/BasicMessageComposer.tsx
	src/editor/autocomplete.ts
2021-08-12 11:21:20 +01:00
Michael Telatynski 9d3569a577 Iterate PR based on feedback 2021-08-12 10:58:56 +01:00
Weblate a93ffe7e99 Merge branch 'origin/develop' into Weblate. 2021-08-12 08:23:45 +00:00
XoseM d51e2e3500 Translated using Weblate (Galician)
Currently translated at 100.0% (3117 of 3117 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
2021-08-12 08:23:45 +00:00
waclaw66 8f1e5b7cad Translated using Weblate (Czech)
Currently translated at 100.0% (3117 of 3117 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-08-12 08:23:42 +00:00
Tirifto c4e4b91302 Translated using Weblate (Esperanto)
Currently translated at 92.7% (2891 of 3117 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
2021-08-12 08:23:40 +00:00
Jeff Huang dc3fd69736 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3117 of 3117 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-08-12 08:23:36 +00:00
Michael Telatynski c6085a1a89
Merge pull request #6603 from SimonBrandner/fix/remove-unnecessary-code 2021-08-12 09:23:28 +01:00
Š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
Š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
Šimon Brandner 71008c9e87
Use AccessibleTooltipButton
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 08:14:02 +02:00
Šimon Brandner 29d20b8125
Use AccessibleTooltipButton
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 08:11:11 +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
Weblate fe6af71590 Merge branch 'origin/develop' into Weblate. 2021-08-11 22:19:01 +00:00
waclaw66 23b59b15e2 Translated using Weblate (Czech)
Currently translated at 100.0% (3116 of 3116 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-08-11 22:19:01 +00:00
Szimszon 7265874217 Translated using Weblate (Hungarian)
Currently translated at 100.0% (3116 of 3116 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2021-08-11 22:18:59 +00:00
Michael Telatynski 09ffad96ff
Merge pull request #6569 from matrix-org/t3chguy/fix/spaces-a11y 2021-08-11 23:18:52 +01:00
Michael Telatynski 69cf64249f add comment 2021-08-11 21:50:26 +01:00
David Baker 34249caa9e Use changelog generator from npm 2021-08-11 21:50:25 +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
Michael Telatynski 5d98c6f02d Iterate PR based on feedback 2021-08-11 21:45:49 +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
Michael Telatynski 8216a35a56 remove spurious mxclient stub 2021-08-11 21:02:30 +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