Commit graph

2868 commits

Author SHA1 Message Date
Šimon Brandner
27ec3af03a
Merge branch 'develop' into feed
Looking forward to merging again! :D

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-03 09:15:55 +02:00
David Baker
299467c515 Merge remote-tracking branch 'origin/develop' into dbkr/attended_transfer 2021-03-31 10:14:48 +01:00
Travis Ralston
54412878a1 Merge branch 'develop' into travis/voice-messages/waveform 2021-03-29 22:59:51 -06: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
Michael Telatynski
4341dfb314 Iterate facepiles, fix default avatar alignment and sort explicit avatars first 2021-03-26 11:55:22 +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
09601f1071 Add display name tooltip to the facepile avatars 2021-03-26 00:05:05 +00:00
Travis Ralston
1419ac6b69 Hook up a clock and implement proper design 2021-03-25 17:12:26 -06:00
David Baker
82ba546142 WIP attended transfer 2021-03-25 19:56:21 +00:00
Michael Telatynski
5061db259a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spaces4.12 2021-03-25 16:37:56 +00:00
Michael Telatynski
ea77ab125e Show a face pile on a space preview 2021-03-25 16:15:34 +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
760b11f214
Merge pull request #5789 from matrix-org/t3chguy/spaces4.11
Tweak and fix some space features
2021-03-25 09:02:11 +00:00
Travis Ralston
449e028bbd Actually use a waveform instead of the frequency data 2021-03-24 23:31:02 -06:00
Travis Ralston
8ddd14e252 Early concept for rendering the frequency waveform 2021-03-24 22:17:45 -06: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
Travis Ralston
8587ec888b
Merge pull request #5769 from matrix-org/travis/voice-messages/exp
Labs feature: Early implementation of voice messages
2021-03-24 09:56:34 -06:00
Michael Telatynski
65a7d0621d Add invite to space button to room intro 2021-03-24 15:30:03 +00:00
Michael Telatynski
a2a1e37fa3 Add prompt to bottom of room list to invite to space 2021-03-24 14:18:06 +00:00
Michael Telatynski
6e0ab86168 Small usability tweaks to the add existing to space dialog 2021-03-24 14:10:26 +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
Germain Souquet
0db31dfeae fix: CIDER formatting buttons on Safari 2021-03-22 15:05:22 +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
128c7db28e
Merge pull request #5777 from matrix-org/t3chguy/spaces4.9
Spaces improve creation journeys
2021-03-22 13:24:10 +00:00
Tawfiek
90b8a66476 fix make btns in verify dailog respect system font 2021-03-21 14:11:45 +02:00
Jaiwanth
b2a72565d3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into add-invite-to-context-menu 2021-03-19 20:28:10 +05:30
Michael Telatynski
1fbbb67e74 Consolidate button styles in Space creation flows 2021-03-19 13:20:30 +00:00
Michael Telatynski
3718d550c5 Fix space creation menu shade width 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
Šimon Brandner
431a2c033d
Merge branch 'develop' into feed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-17 16:13:40 +01:00
Travis Ralston
51dca8d13d Fix positioning of stop square 2021-03-16 23:54:33 -06:00
Travis Ralston
9aa5348c7f Show a stop button to stop the recording 2021-03-16 23:43:59 -06:00
Travis Ralston
b5d32d92f3 Wire up a simple record button 2021-03-16 22:58:44 -06: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