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

36835 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
f99e0d111e
Merge pull request #6607 from SimonBrandner/release/fix/toast-colors 
[Release] Fix toast colors
 2021-08-12 08:54:18 -06:00
Šimon Brandner
bf5c94572c
$toast-bg-color -> $system 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 16:34:41 +02:00
Andrew Morgan
adce43600d
Update link to matrix-js-sdk CONTRIBUTING file (#6557) 2021-08-12 15:34:33 +01:00
Šimon Brandner
9249a6e80c
$system-... -> $system 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 16:32:04 +02:00
Š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
Michael Telatynski
8ddaa7faf1 i18n 2021-08-12 12:08:57 +01:00
Michael Telatynski
85b1f166e8 post-merge tidy up 2021-08-12 12:03:14 +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
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
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
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
Š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
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
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
James Salter
cc9ddb351f Remove test error on startup, and send correct user text 2021-08-11 18:01:22 +01:00
James Salter
ba1618812c Send user text as context 2021-08-11 18:00:21 +01:00
James Salter
c6202bf653 lint 2021-08-11 18:00:21 +01:00
James Salter
dface1928d Load all rageshake attributes 2021-08-11 18:00:21 +01:00
James Salter
de398f46f4 initial spike 2021-08-11 18:00:21 +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
38645d9054 Fix loading state issues for spaces pagination 2021-08-11 17:07:53 +01:00
Michael Telatynski
d74e9c4f90 Remove impossible space hierarchy size string 2021-08-11 16:47:14 +01:00
Michael Telatynski
54d85a3864 Iterate PR based on feedback 2021-08-11 16:32:48 +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
David Baker
a330b3c596 Changelog 2021-08-11 15:50:45 +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