mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 15:12:07 +03:00
Code Issues Projects Releases Packages Wiki Activity
39316 commits 219 branches 562 tags 474 MiB
Commit graph

826 commits

Author SHA1 Message Date
Šimon Brandner
d479373af9
Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-04 09:21:45 +02:00
Michael Telatynski
9eb0986353 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 
 Conflicts:
	src/i18n/strings/en_EN.json
 2021-07-30 11:34:52 +01:00
Michael Telatynski
259627fba2 Clean up SpaceHierarchy 2021-07-30 11:01:49 +01:00
Michael Telatynski
02dbdc5c0a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093 
 Conflicts:
	src/components/views/spaces/SpaceTreeLevel.tsx
	src/dispatcher/actions.ts
	src/i18n/strings/en_EN.json
 2021-07-29 16:11:16 +01:00
Michael Telatynski
9fb1c8e4cd Iterate PR 2021-07-28 19:33:07 +01:00
Michael Telatynski
ac800ad94d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093 2021-07-28 19:24:26 +01:00
Michael Telatynski
a5606c72de Update feedback prompt to match designs 2021-07-28 17:56:57 +01:00
Michael Telatynski
6123ccb2eb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 2021-07-28 17:45:15 +01:00
Michael Telatynski
67ef263940 Refactor SpaceButton to be more reusable and add context menu to Home button 2021-07-28 17:40:33 +01:00
Michael Telatynski
0c79aec19d Fix broken layout of the space hierarchy view 
Not sure what this min-height was trying to achieve but removing it prevents the grid layout collapsing on itself
 2021-07-27 13:09:43 +01:00
Šimon Brandner
7ed5dee74b
Make colors a bit clearer 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-26 13:17:06 +02:00
Šimon Brandner
277fdf1711
voipcall-plinth-color -> quinary-content-color 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-26 12:42:18 +02:00
Michael Telatynski
1ba601ba22 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/dialogs/BetaFeedbackDialog.tsx
 2021-07-23 18:28:21 +01:00
Michael Telatynski
dec2c48155 remove unused import and revert removing some needed css 2021-07-23 15:56:00 +01:00
Michael Telatynski
1d1a396c1f get rid of spurious hr 2021-07-23 15:51:59 +01:00
Michael Telatynski
9c7fa71a4a Remove spaces beta feedback prompts except a couple more strategic ones 2021-07-23 15:07:24 +01:00
Michael Telatynski
2b133deb63 fix scroll behaviour to match that of prior to the spinner fix 2021-07-23 12:19:54 +01:00
Michael Telatynski
4a4ec596bd Fix position of the space hierarchy spinner 2021-07-23 11:27:00 +01:00
Germain Souquet
02b08888b5 Use modern layout in file and notification panel 2021-07-22 16:00:41 +02:00
Travis Ralston
097cc858ce Remove hover effect from files in the files panel 2021-07-19 10:07:16 -06:00
Andrew Morgan
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements (#6363) 
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
 2021-07-15 09:55:58 +01:00
Germain Souquet
8f345dc1ba Rework backdrop to draw one image with two different level of blur 2021-07-12 13:51:46 +02:00
Germain Souquet
edae9a4844 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 10:19:25 +02:00
Germain Souquet
a22baa1b2b move file drop image animation to compositor 2021-07-02 15:23:27 +01:00
Germain Souquet
a093ea6357 Move RightPanel animation to compositor 2021-07-02 15:23:03 +01:00
Germain Souquet
fdced3da1b Remove reminescent references to the tinter 2021-06-30 08:09:55 +01:00
Germain Souquet
4cfdad8aa2 Add spacing between toast buttons with cross browser support in mind 2021-06-29 11:59:13 +01:00
Michael Telatynski
1d374f6cbb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17731 2021-06-25 14:50:24 +01:00
Michael Telatynski
2e940b7763
Update res/css/structures/_RoomStatusBar.scss 
Co-authored-by: Germain <germain@souquet.com>
 2021-06-25 14:47:17 +01:00
Germain Souquet
5932b93325 make backdrop closer to what is happening in production 2021-06-25 14:09:49 +01:00
Andrew Morgan
a8e2c1bc2a
Move the dial pad button next to Explore button from Create Room context menu (#6237) 
This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected.
 2021-06-25 11:45:15 +01:00
Germain Souquet
6d293d1092 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-06-25 09:43:54 +01:00
Germain Souquet
652ad3617d Backdrop filter compatibility for Firefox and Safari 2021-06-25 09:20:03 +01:00
Germain Souquet
27ee7c5836 Move backdrop filter to a canvas based solution 2021-06-24 17:51:11 +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
Michael Telatynski
6e3c647109 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 
 Conflicts:
	package.json
	src/components/views/spaces/SpacePanel.tsx
	src/i18n/strings/en_EN.json
	src/stores/SpaceStore.tsx
	yarn.lock
 2021-06-22 21:15:53 +01:00
Germain Souquet
adb42b7927 Deprecate FormButton to use AccessibleButton everywhere 2021-06-21 14:16:37 +01:00
Michael Telatynski
f8eea2ae23 Fix word wrap in space descriptions 2021-06-14 22:18:02 +01:00
Michael Telatynski
66fce64ee0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 
 Conflicts:
	package.json
	yarn.lock
 2021-06-14 21:39:06 +01:00
Michael Telatynski
801b5f9c1a
Merge pull request #6155 from matrix-org/t3chguy/spacesteammatewarning 
Add warning to private space creation flow
 2021-06-07 22:21:07 +01:00
J. Ryan Stinnett
a895b083a2 Fix notif panel timestamp padding 
This restores some space around the timestamp in the notif panel. We were
previously relying somewhat randomly on the presence on empty flair elements to
create space.

Fixes https://github.com/vector-im/element-web/issues/17580
 2021-06-07 16:21:53 +01:00
Michael Telatynski
f3aa505673 Add warning to private space creation flow 2021-06-07 14:14:31 +01:00
Michael Telatynski
93010d34fd
Merge branch 'develop' into t3chguy/fix/6606 2021-06-03 19:33:09 +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
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 Souquet
a34f8a29f4 fix mx_Event containment rules and empty read avatar row 2021-06-03 08:41:12 +01:00
Michael Telatynski
e334ce8192 First cut of space panel drag-and-drop ordering 2021-06-03 08:32:36 +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
ebd7cd6212 Add CSS containement rules for shorter reflow operations 2021-06-01 11:26:32 +01:00
Michael Telatynski
b2f01b8438 Respect newlines in space topics 2021-06-01 10:48:53 +01:00
Germain Souquet
1a51ed9ffd Make breadcrumb animation run on the compositing layer 2021-05-28 09:34:08 +01:00
Michael Telatynski
59f4c728c9 Initial cut of Pinned event card in the right panel 2021-05-25 16:10:44 +01:00
Michael Telatynski
a6adfde8e2
Merge pull request #6070 from matrix-org/t3chguy/fix/17360 
Improve explore rooms when no results are found
 2021-05-23 21:17:35 +01:00
Robin Townsend
332412782e Remove logo spinner 
Removed since design wants to avoid associating slowness with the brand.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-20 17:31:10 -04:00
Michael Telatynski
aa7ccc1420 Show prompt to create new room from room directory results 2021-05-19 20:07:54 +01:00
Michael Telatynski
7396ce76e5 Tweak the feedbacks a tad 2021-05-11 17:30:33 +01:00
Michael Telatynski
7de626824e Sprinkle some more feedback prompts in the spaces beta 2021-05-11 17:01:31 +01:00
Michael Telatynski
2e19c7fd24 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-05-11 13:40:28 +01:00
Michael Telatynski
de04d82395 Switch to using forms for implicit submission 2021-05-11 10:01:40 +01:00
Michael Telatynski
1e6c6e9d80
Merge pull request #5983 from matrix-org/t3chguy/fix/16994 
Improve style of notification badges on the space panel
 2021-05-07 13:49:41 +01:00
Michael Telatynski
a8c4aabb52 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/i18n/strings/en_EN.json
 2021-05-07 11:50:49 +01:00
Michael Telatynski
237399f13e fix button height inconsistency between Chrome & FF 2021-05-07 11:40:39 +01:00
Michael Telatynski
03ca7e0107 move notification dot on the space panel up by 1px 2021-05-07 10:22:56 +01:00
Michael Telatynski
d2fc1c42b0 Improve style of notification badges on the space panel 2021-05-06 15:58:22 +01:00
Michael Telatynski
d47eecbd24 Make button sizes more consistent and fix untrapped behaviour of join button leaking to parent 2021-05-06 13:05:58 +01:00
Michael Telatynski
90538c95aa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 2021-05-06 08:05:14 +01:00
Michael Telatynski
650933096a Iterate Spaces admin UX around room management 2021-05-05 17:25:29 +01:00
Michael Telatynski
caa772348f Actually fix the layout bug without re-regressing the prior issue 2021-05-04 14:14:06 +01:00
Michael Telatynski
4489f8a6ea Fix hover behaviour of space invites 2021-05-04 14:01:26 +01:00
Michael Telatynski
d14ea1bd58 Fix layout issue with expanded space panel 2021-05-04 14:01:10 +01:00
Michael Telatynski
c5cbca7c57 Fix edge case with space panel alignment with subspaces on ff 2021-05-04 12:38:55 +01:00
Michael Telatynski
158a0f90cb Further design iteration 2021-04-29 22:02:18 +01:00
Michael Telatynski
279654cc9e Design iterations based on PR feedback 2021-04-29 16:08:59 +01:00
Michael Telatynski
a4f02937cb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	res/css/structures/_SpaceRoomView.scss
	src/components/structures/SpaceRoomView.tsx
 2021-04-29 09:52:21 +01:00
Michael Telatynski
9f8955fb6c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628 
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
 2021-04-28 22:49:36 +01:00
Michael Telatynski
1802adb4d2 Iterate styling and decoration for the beta prompts 2021-04-28 22:47:08 +01:00
Michael Telatynski
c0f11fd316 Fix communities spaces beta card layout 2021-04-28 09:35:25 +01:00
Michael Telatynski
18a01d9271 Show spaces beta prompt when viewing a space without the beta 2021-04-28 08:41:31 +01:00
Michael Telatynski
4f02dc9050 delint 2021-04-27 17:19:34 +01:00
Michael Telatynski
46d35411b4 Add animated mx_BetaDot atop the legacy Communities button 2021-04-27 17:01:22 +01:00
Michael Telatynski
c5f653245a Show Spaces beta card in Labs & My Communities view 
the image is temporary
 2021-04-27 16:29:42 +01:00
Michael Telatynski
489b4be6cf Fix space hierarchy css not applying as it should 2021-04-26 15:48:33 +01:00
Michael Telatynski
8656212eb9 Space creation prompt user to add existing rooms instead of creating new ones 2021-04-26 12:41:04 +01:00
Travis Ralston
82119ad595 Merge branch 'develop' into travis/error-states 2021-04-23 15:53:37 -06:00
Robin Townsend
cc5a7671a7 Keep invite button separate from space info 
60828913d2 caused the space info and
invite buttons to have no separation when you are the only person in a
space, since the margin was set on the face pile, which may be absent.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-04-22 11:39:58 -04:00
Michael Telatynski
d9dac7b261
Merge pull request #5898 from matrix-org/t3chguy/fix/16976 
Iterate the spaces face pile design
 2021-04-22 09:29:00 +01:00
Michael Telatynski
c0f8098a86
Merge pull request #5890 from matrix-org/t3chguy/fix/17006 
Fix alignment issue with nested spaces being cut off wrong
 2021-04-22 08:32:54 +01:00
Michael Telatynski
90cd5d0472 Remove old redundant hover effect 2021-04-22 08:18:28 +01:00
Michael Telatynski
60828913d2 Iterate the spaces face pile design 2021-04-22 08:13:03 +01:00
Travis Ralston
cc095c85bf Dark theme support 2021-04-21 16:24:17 -06:00
Travis Ralston
91b3688feb Redesign "failed to send messages" status bar 2021-04-21 16:24:17 -06:00
Michael Telatynski
c30b62ef35 Fix alignment issue with nested spaces being cut off wrong 2021-04-20 11:12:47 +01:00
Šimon Brandner
548cd38a5c
Remove weird margin from the file panel 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-20 08:22:43 +02:00
J. Ryan Stinnett
495aff898f
Merge pull request #5864 from SimonBrandner/dont-render-msg-option 
Render msgOption only if showReadReceipts is enabled
 2021-04-15 17:24:13 +01:00
Šimon Brandner
aad22903a7
Remove overflow: hidden 
This line doesn't seem to do anything * shrug

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-15 18:02:48 +02:00
Travis Ralston
eed5efdbe1 Labs: Add quick/cheap "do not disturb" flag 
This just disables audio notifications and the popup, which is the easiest way to do "do not disturb" for a device. This needs spec changes to be done properly, as it's a shame that mobile devices for the user will still go off.

Disabling all of push doesn't sound ideal as it would potentially mean missing highlights for when leaving DND mode.
 2021-04-15 00:47:09 -06:00
Šimon Brandner
ba0384f381
Render msgOption only if showReadReceipts is enabled 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-14 11:43:42 +02:00
Michael Telatynski
a00af446b3 Don't hide notification badge on the home space button as it has no context menu 2021-04-12 11:55:47 +01:00
Germain Souquet
0312b55007 Remove status area UI defects when in-call 2021-04-06 11:00:32 +01:00
Michael Telatynski
83612dd4ad
Merge pull request #5792 from matrix-org/t3chguy/spaces4.12 
Fixing spaces papercuts
 2021-03-26 15:01:31 +00:00
Michael Telatynski
af18019314 Final spaces tweaks for the demo 2021-03-26 13:46:01 +00:00
Michael Telatynski
eff0e6fcc3 Add facepile to Space landing page and tweak layout slightly 2021-03-26 13:11:57 +00:00
Michael Telatynski
d10241b1c4 Fix misalignment on the room search input caused by a 1px transparent border 2021-03-26 13:10:44 +00:00
J. Ryan Stinnett
5f70c625ab
Merge pull request #5807 from matrix-org/jryans/tweak-cs-text 
Tweak cross-signing copy
 2021-03-26 12:12:25 +00:00
J. Ryan Stinnett
fd59a66523 Tweak cross-signing copy 
This makes some Design-approved copy tweaks to the recent cross-signing flow
changes.
 2021-03-26 11:13:39 +00:00
Michael Telatynski
8c6d92cc99 Move space room discovery & management into the space room view 2021-03-26 09:54:15 +00:00
Michael Telatynski
4df197ac61 Tweak layout of the space room directory for better legibility 2021-03-25 14:09:56 +00:00
Panagiotis
aa1f468235 fix: room id sticked with event id 2021-03-25 14:36:40 +02:00
Michael Telatynski
b6a57f73c6 Tweak border colours in spaces 2021-03-25 12:17:39 +00:00
Michael Telatynski
20ea1436fc Update iconography for spaces 2021-03-24 19:43:33 +00:00
Michael Telatynski
ee5d0d6842 Fix alignment bug with space panel on spaces with subspaces in Chrome 2021-03-24 17:05:21 +00:00
Michael Telatynski
f7a3805eed Fix styling inconsistency in space room view 2021-03-24 14:02:25 +00:00
Michael Telatynski
fb46815b6a Spaces move away from Form Buttons 2021-03-24 13:15:31 +00:00
Michael Telatynski
03ab2dc8e0
Merge pull request #5776 from matrix-org/t3chguy/spaces4.10 
Improve discovery of rooms in a space
 2021-03-22 13:24:23 +00:00
Michael Telatynski
1fbbb67e74 Consolidate button styles in Space creation flows 2021-03-19 13:20:30 +00:00
Michael Telatynski
31ce19373b Fix space panel spacings 2021-03-19 13:20:30 +00:00
Michael Telatynski
d04c8b3fb4 Improve discovery of rooms in a space 2021-03-19 11:54:10 +00:00
Michael Telatynski
17399c6be6
Merge pull request #5764 from matrix-org/t3chguy/spaces4.9 
Fix left panel resizing and lower min-width improving flexibility
 2021-03-18 11:34:55 +00:00
Michael Telatynski
0ce78f469f
Merge pull request #5761 from matrix-org/t3chguy/spaces4.8 
Iterate space panel visually and functionally
 2021-03-16 17:41:14 +00:00
Michael Telatynski
5ce3a05867
Update _SpacePanel.scss 2021-03-16 16:34:28 +00:00
Michael Telatynski
688407abe6
Merge branch 'develop' into t3chguy/spaces4.9 2021-03-16 11:14:38 +00:00
Michael Telatynski
11cd791c76 Tweak left panel min widths for better flexibility 2021-03-16 11:13:39 +00:00
Michael Telatynski
baaceccfda Rearrange dom hierarchy to put space panel at same level as LeftPanel 
so they don't steal horizontal space from each other
 2021-03-16 11:13:39 +00:00
Michael Telatynski
62983ca48e Fix space panel alignments when no scrollbar is present 2021-03-15 12:57:35 +00:00
Michael Telatynski
f9eace1729 Rebuild alignment of the menu buttons and notification badges 2021-03-15 11:59:46 +00:00
Travis Ralston
4811154f25 Remove now-unused assets and CSS from CompleteSecurity step 2021-03-12 15:24:16 -07:00
Michael Telatynski
6210614ce7 Rebuild space panel layout to resolve weirdness with selections and nesting 2021-03-12 17:37:15 +00:00
Michael Telatynski
081e745417
Merge pull request #5751 from matrix-org/t3chguy/spaces4.7 
Rebuild space previews with new designs
 2021-03-11 14:06:31 +00:00
Michael Telatynski
6d81634eec Rebuild space previews with new designs 2021-03-11 11:49:43 +00:00
Michael Telatynski
98338f1505
Merge pull request #5736 from matrix-org/t3chguy/spaces4.5 
Spaces suggested rooms support
 2021-03-10 10:56:17 +00:00
Ayush Kumar
54bbc2c2b1 Fix Style-lint error 2021-03-10 15:23:29 +05:30
Ayush Kumar
35e0464536 Fix Style-lint error 2021-03-10 15:12:00 +05:30
Ayush Kumar
c883bd0cbf Fix _RoomDirectory.scss for mobile screen 2021-03-10 15:00:53 +05:30
Ayush Kumar
34146f347f Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into ayush25802 2021-03-10 14:58:24 +05:30
Michael Telatynski
3ac4cb49fc Tweak styling of manage rooms in space ux 2021-03-09 14:16:29 +00:00
J. Ryan Stinnett
d33acaac95
Merge pull request #5713 from panoschal/improve-view-source 
Display decrypted and encrypted event source on the same dialog
 2021-03-09 11:36:53 +00:00
Travis Ralston
08072aca9a Add upload icon, fix cancel button, refresh styles 2021-03-05 14:42:15 -07:00
Travis Ralston
711181cc69 Rough style for new upload bar 
This repurposes ProgressBar which was not used anywhere in code.
 2021-03-05 14:14:43 -07:00
Travis Ralston
676259e78c
Merge pull request #5505 from SimonBrandner/improve-file-drop-ui 
File drop UI fixes and improvements
 2021-03-04 20:30:45 -07:00
Panagiotis
6d792cc08c feat: use <details> to hide encrypted block 2021-03-03 23:48:39 +02:00
Panagiotis
ae08f74336 feat: improve "view source" 
display encrypted and decrypted event source on the same dialog
keep only one "View Source" action on event context menu
 2021-03-03 22:38:30 +02:00
Michael Telatynski
43cc7deeda Show hierarchy of auto_join rooms in the space view 2021-03-02 14:37:28 +00:00
Michael Telatynski
716268b2f9 Add context menu to spaces in the space panel 2021-03-02 14:35:29 +00:00
Michael Telatynski
faf7a4b8bc Initial Space room directory view 2021-03-02 14:14:50 +00:00
Michael Telatynski
e479edd47a Add an add existing room to space CTA to Space View 2021-03-02 13:34:53 +00:00
Michael Telatynski
a687b9883c Add a create room in space CTA to Space View 2021-03-02 13:29:34 +00:00
Michael Telatynski
ab4b7b73ea Add a basic Space Settings view 2021-03-02 13:26:00 +00:00
Michael Telatynski
926e226a78 Add Invite CTA to Space View 2021-03-02 10:12:49 +00:00