mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-24 19:55:54 +03:00
Code Issues Projects Releases Packages Wiki Activity
34564 commits 206 branches 547 tags 600 MiB
Commit graph

2464 commits

Author SHA1 Message Date
Šimon Brandner
430ae0e79f
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click 2021-06-24 16:59:18 +02:00
Michael Telatynski
6d3e7730ef Fix two PRs duplicating the css attribute 2021-06-24 11:40:49 +01:00
Michael Telatynski
71414904fc
Merge pull request #6201 from matrix-org/t3chguy/fix/15051 2021-06-24 11:20:12 +01:00
Michael Telatynski
26d8c4d2e6 Improve design of the multi inviter error dialog 2021-06-24 10:03:32 +01:00
Germain Souquet
09c22c37ff Add comment to specify variable origin 2021-06-24 10:01:44 +01:00
Šimon Brandner
0fe6a28853
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click 2021-06-24 10:57:09 +02:00
Germain Souquet
56467485f5 Merge branch 'develop' into gsouquet/voice-messages-waveform-perf 2021-06-24 09:42:47 +01:00
Šimon Brandner
8d47ea63c2
Make pinned message text clickable 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-24 10:41:55 +02:00
Michael Telatynski
0e2f617d94 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051 2021-06-24 09:33:39 +01:00
Michael Telatynski
47be728eb2 Fix invite dialog being cut off when it has limited results 2021-06-24 09:21:52 +01:00
Michael Telatynski
5d93216c94 Decrease e2e shield fill mask size so that it doesn't overlap 2021-06-23 16:10:47 +01:00
Michael Telatynski
cdb97d5494 Fix trashcan.svg by exporting it with its viewbox 
then fix sizing and alignment of consumers
 2021-06-23 12:30:23 +01:00
David Baker
f0ad70f0e7
Merge pull request #5786 from DantrazTrev/DialPad 
Dial Pad UI bug fixes
 2021-06-23 11:41:41 +01:00
Michael Telatynski
1286be1ffb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 
 Conflicts:
	src/components/views/room_settings/AliasSettings.tsx
 2021-06-22 22:02:09 +01:00
Michael Telatynski
b3b9135b1f
Merge pull request #6134 from matrix-org/t3chguy/fix/17529 2021-06-22 21:28:51 +01:00
Michael Telatynski
e3e6b74272 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665 
 Conflicts:
	src/stores/SpaceStore.tsx
 2021-06-22 17:38:05 +01:00
Germain Souquet
27d255f30e Reduce audio waveform layout trashing 2021-06-22 12:27:54 +01:00
Germain Souquet
adb42b7927 Deprecate FormButton to use AccessibleButton everywhere 2021-06-21 14:16:37 +01:00
Šimon Brandner
21a960acc7
Fix timestamp issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-19 17:53:00 +02:00
Šimon Brandner
c0f34c9a01
Merge remote-tracking branch 'upstream/develop' into fix/irc-layout-mxid/17648 2021-06-19 17:24:30 +02:00
Germain Souquet
6271c5c3d8 first iteration for message bubble layout 2021-06-18 18:59:22 +01:00
Germain
71ff5248fe
Merge pull request #6082 from SimonBrandner/fix/mute-incoming-call/15591 2021-06-17 16:41:00 +01:00
Michael Telatynski
7d90612371 Iterate PR 2021-06-17 16:22:40 +01:00
Šimon Brandner
dbdb61c820
Improve the mxid overlap situation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-16 17:21:29 +02:00
Michael Telatynski
384bb3af2e Fix layout regression in the invite dialog for few results 2021-06-16 10:37:34 +01:00
Michael Telatynski
b4fbc791bb Add experimental options to the Spaces beta 2021-06-16 09:01:13 +01:00
Šimon Brandner
5dc87869eb
Also override mx_SenderProfile_mxid 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-15 17:22:47 +02:00
Michael Telatynski
a52dd57eb2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17529 
 Conflicts:
	package.json
	yarn.lock
 2021-06-15 13:59:54 +01:00
Michael Telatynski
660a849cdd Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash 
 Conflicts:
	package.json
	src/ContentMessages.tsx
	yarn.lock
 2021-06-15 12:58:29 +01:00
Michael Telatynski
83c30b2280 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-06-15 12:24:26 +01:00
Šimon Brandner
d08495bde6
Fix display name overlap 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-15 06:30:22 +02:00
Michael Telatynski
539465ecb4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-06-14 22:22:30 +01:00
Michael Telatynski
91df392a2a
Merge pull request #5880 from SimonBrandner/show-username 2021-06-14 21:34:01 +01:00
Šimon Brandner
5343be7814
Fix buggy hovering/selecting of event tiles 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-10 18:53:56 +02:00
Šimon Brandner
8174973cfe
Use the same styling as for mx_TextualEvent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-10 15:31:27 +02:00
Germain Souquet
15132074e2 Restore copy button icon when sharing permalink 2021-06-09 13:44:31 +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
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
90bb7c1482 Switch Space Settings for a tabbed view with a bunch more settings exposed 2021-06-08 16:33:47 +01:00
Šimon Brandner
bf77a4a2ab
Merge remote-tracking branch 'upstream/develop' into show-username 2021-06-08 17:14:42 +02: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
b97867271b Merge branch 'develop' into improved-forwarding-ui 2021-06-07 19:09:36 -04:00
Šimon Brandner
025148d9fc
Merge branch 'develop' into show-username 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-07 19:37:22 +02:00
Michael Telatynski
6d2a7390d7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 2021-06-07 14:15:49 +01:00
Michael Telatynski
bd8fd77d54
Merge pull request #6148 from robintown/fix-timestamps 2021-06-07 13:12:11 +01:00
Michael Telatynski
8c34a8461e Add way to specify address during public space creation 2021-06-07 08:57:39 +01:00
Robin Townsend
ea2120bdfd Fix timestamps 
7f83590846 changed timestamps to be hidden
at the DOM level, not the CSS level. We can keep that approach, we just
need to ensure they still get shown at the right times.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-06 01:55:01 -04:00
Robin Townsend
e891d18fa2 Add my email to my copyright notices 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 21:41:28 -04:00
Robin Townsend
17edfec3aa Make it easier to pan images in the lightbox 
Previously, if you were dragging an image and your cursor outpaced the
edge of the image as it was moving, panning would abruptly stop. This
moves a few of the lightbox event listeners one level up to the image
wrapper to ensure that all drag movements are detected, even if they
don't end over the image's current position.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 21:08:44 -04:00
Robin Townsend
a06306d560 Merge branch 'develop' into improved-forwarding-ui 2021-06-05 11:04:17 -04:00
Michael Telatynski
93f41ce0ab Actually finish the empty state for the pinned messages card 2021-06-04 11:35:17 +01:00
Šimon Brandner
629201a074
Merge branch 'develop' into fix/mute-incoming-call/15591 2021-06-04 07:59:28 +02:00
Michael Telatynski
93010d34fd
Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +01:00
Michael Telatynski
0c97d90fb9 Iterate PR based on feedback 2021-06-03 16:44:28 +01:00
Germain
a36063704d
Merge pull request #6138 from matrix-org/gsouquet/containment-event 
Fix mx_Event containment rules and empty read avatar row
 2021-06-03 16:38:55 +01:00
Germain Souquet
5ef78f43a4 fix containment rule to keep height when resizing vertically 2021-06-03 16:26:20 +01:00
Michael Telatynski
f2643151c6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-06-03 16:22:59 +01:00
Germain
7f83590846
Merge pull request #6079 from matrix-org/gsouquet/switch-rooms 2021-06-03 08:44:01 +01:00
Michael Telatynski
4f50727010 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/6606 
 Conflicts:
	src/components/structures/RoomView.tsx
	src/components/views/right_panel/UserInfo.tsx
 2021-06-03 08:42:05 +01:00
Germain
430cfa9c06
Merge pull request #6127 from matrix-org/gsouquet/css-containment 
Add CSS containment rules for shorter reflow operations
 2021-06-03 08:10:29 +01:00
Germain Souquet
bc50028f70 Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-06-02 13:57:33 +01:00
Germain
9d126c51e4
Merge pull request #6113 from matrix-org/gsouquet/improve-layout-rendering 2021-06-02 11:41:59 +01:00
J. Ryan Stinnett
2d50325836
Merge pull request #6133 from matrix-org/jryans/event-tile-radius 
Tweak event border radius to match action bar
 2021-06-02 11:39:54 +01:00
Michael Telatynski
bc3c759feb Add temporary mechanism for managing communities without dnd 2021-06-02 11:33:25 +01:00
J. Ryan Stinnett
234c65b331 Tweak event border radius to match action bar 
This adjusts the `border-radius` used when hovering on an event to match the
recently changed value for the action bar (changed to `8px` in
https://github.com/matrix-org/matrix-react-sdk/pull/6066).
 2021-06-02 10:25:29 +01:00
Robin Townsend
8efbdd0406 Match forward dialog send failed indicator color with button 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-01 17:56:46 -04:00
Robin Townsend
56714525f2 Merge branch 'develop' into improved-forwarding-ui 2021-06-01 17:28:55 -04:00
Germain Souquet
ebd7cd6212 Add CSS containement rules for shorter reflow operations 2021-06-01 11:26:32 +01:00
Germain Souquet
d894cc6f7a Merge branch 'develop' into gsouquet/switch-rooms 2021-06-01 09:02:28 +01:00
Germain Souquet
18188538f6 Move the read receipt animation to the compositing layer 2021-05-28 14:59:54 +01:00
Michael Telatynski
caaef63077 delint1 2021-05-28 13:11:48 +01:00
Michael Telatynski
36e43270ca
Apply suggestions from code review 2021-05-28 13:08:05 +01:00
Michael Telatynski
e41645795c Merge branch 't3chguy/fix/17365' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 2021-05-28 13:05:41 +01:00
Nique Woodhouse
ea26393709 Styling amends to accommodate the invite dialog footer 2021-05-28 13:00:18 +01:00
Michael Telatynski
2c750fcb7a Fix overflow issue in suggestion tiles 2021-05-28 12:48:12 +01:00
Germain Souquet
1a51ed9ffd Make breadcrumb animation run on the compositing layer 2021-05-28 09:34:08 +01:00
Michael Telatynski
f75fb3b349 Add footer and privacy note to the start dm dialog 2021-05-27 15:51:25 +01:00
Germain Souquet
aaca71b316 Reintroduce sticky header width 2021-05-27 12:44:53 +01:00
Michael Telatynski
54d8953024 delint 2021-05-26 14:00:53 +01:00
Michael Telatynski
27ad90760d Iterate pinned messages 2021-05-26 13:51:17 +01:00
Germain Souquet
c7c6a818f0 Merge branch 'develop' into gsouquet/switch-rooms 2021-05-26 09:51:27 +01:00
Michael Telatynski
59f4c728c9 Initial cut of Pinned event card in the right panel 2021-05-25 16:10:44 +01:00
Germain Souquet
36dddea338 remove CSS out of sync comment 2021-05-25 14:57:07 +01:00
Germain Souquet
7303166924 fix sticky headers when results num get displayed 2021-05-25 13:53:20 +01:00
Michael Telatynski
13427aaf07 Add a pulse animation to the pinned messages indicator and move it 2021-05-25 13:07:39 +01:00
Robin Townsend
400917623c Make myself the copyright holder for forward dialog code 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-24 08:33:28 -04:00
Nique Woodhouse
153d0ae66d
Merge pull request #6066 from matrix-org/niquewoodhouse-message-action-bar-refine-ui 
Improve styling of the message action bar
 2021-05-24 13:30:27 +01:00
Germain Souquet
ecff5bd65c Merge branch 'develop' into gsouquet-scroll-to-live-reset-hash 2021-05-24 09:20:12 +01:00
Šimon Brandner
c678211a42
Add styling for silencing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-22 20:24:20 +02:00
Michael Telatynski
3f9b6caacd fix missing rounded corners on blurhash placeholder 2021-05-21 21:46:18 +01:00
Robin Townsend
7a04502151 Iterate on forward dialog design feedback 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-21 12:41:29 -04:00
Robin Townsend
f34d61cf5d Merge branch 'develop' into improved-forwarding-ui 2021-05-21 08:15:09 -04:00
Travis Ralston
767c7a1e38
Merge pull request #5680 from robintown/better-spinners 
Vectorize spinners
 2021-05-20 13:31:35 -06:00
Germain Souquet
f058fd8869 Reduce amount of DOM nodes 2021-05-20 15:39:25 +01:00
Germain Souquet
d362321706 Simplify SenderProfile DOM structure 2021-05-20 15:25:20 +01:00
Robin Townsend
6cb6c7f3d0 Combine forward dialog room and DM lists 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-19 13:33:48 -04:00
Robin Townsend
83224dc7b6 Ensure forward list room decorations are aligned 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-19 13:32:27 -04:00
Robin Townsend
678b298bab Merge branch 'develop' into improved-forwarding-ui 2021-05-19 12:39:48 -04:00
Michael Telatynski
abd290938a Fix room name not wrapping in summary card 2021-05-19 17:12:25 +01:00