Commit Graph

4792 Commits (d388f877b463cdc16dfb5e4cb0e649502871af81)

Author SHA1 Message Date
Matthew Hodgson d388f877b4 add PHASE_LOADING to SetupEncryptionStore to avoid flashing cross-signing setup 2021-03-08 23:28:44 +00:00
Matthew Hodgson 14b828ecc6 shorten verify button label 2021-03-08 17:58:30 +00:00
Matthew Hodgson 7abc48a716 lint 2021-03-08 05:30:02 +00:00
Matthew Hodgson 997d6e1281 lint 2021-03-08 05:08:01 +00:00
Matthew Hodgson c02d03cc5b Merge branch 'develop' of git+ssh://github.com/matrix-org/matrix-react-sdk into develop 2021-03-08 04:57:10 +00:00
Matthew Hodgson 7673818400 switch to using an explicit verify button when cross-signing a new login 2021-03-08 04:43:59 +00:00
Will Hunt d07069238f Merge remote-tracking branch 'origin/develop' into hs/blocked-err 2021-03-05 18:50:00 +00:00
Will Hunt 35dbc82b87
Add issue comments 2021-03-05 15:01:48 +00: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
Michael Telatynski 73411fa53d tidy code style 2021-03-03 13:42:44 +00:00
Michael Telatynski 43cc7deeda Show hierarchy of auto_join rooms in the space view 2021-03-02 14:37:28 +00:00
Michael Telatynski faf7a4b8bc Initial Space room directory view 2021-03-02 14:14:50 +00:00
Michael Telatynski 4e93452275 Tweak resizer collapse distributor behaviour to work with the expanding space panel 2021-03-02 14:02:03 +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
Šimon Brandner 0a4c0b69b0
Move fileDropTarget to RoomView
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-03-02 12:07:33 +01:00
Michael Telatynski 926e226a78 Add Invite CTA to Space View 2021-03-02 10:12:49 +00:00
Michael Telatynski dfd0aaffe3 Iterate copy for some global warning prompts for spaces 2021-03-02 09:56:43 +00:00
Šimon Brandner ff00683f32
Use ===
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-03-02 07:42:07 +01:00
Michael Telatynski c10512fd56 Initial SpaceRoomView work 2021-03-01 18:53:11 +00:00
Michael Telatynski c8fe3f7676 Pass room creation opts for new rooms into RoomView 2021-03-01 17:54:53 +00:00
Michael Telatynski 483d56320c Beginning of space creation UX from space panel 2021-03-01 17:47:40 +00:00
Michael Telatynski ce64863326 Annotate User Menu handle with currently selected space 2021-03-01 15:53:16 +00:00
Michael Telatynski d248a5fa5d
Merge pull request #5689 from matrix-org/t3chguy/spaces2
Space Store and Space Panel for Room List filtering
2021-03-01 09:42:04 +00:00
Travis Ralston 4e27b00cf3 Move call buttons to the room header
This is to make some room in the composer for voice messages. The hangup behaviour is intentionally lost by this change as the VOIP UX is intended to rely on dedicated hangup buttons instead.
2021-02-26 13:46:39 -07:00
Michael Telatynski f21aedc6cf Add Space Panel with Room List filtering 2021-02-26 10:41:26 +00:00
Šimon Brandner 9a5ba072ba
Fix auxPanel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 11:23:58 +01:00
Šimon Brandner 11c5aa02d2
Remove mx_RoomView_container
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 11:19:45 +01:00
Šimon Brandner 0d6a9fce67
Remove weird styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-26 11:12:14 +01:00
Šimon Brandner c1a105f071
Merge branch 'develop' into improve-file-drop-ui 2021-02-25 18:12:37 +01:00
Will Hunt c78d1c49ab Apply changes from review 2021-02-24 17:32:00 +00:00
Will Hunt 84bcdf66f2 Fix TS check 2021-02-23 13:00:05 +00:00
Will Hunt aa86c1d751 Ensure that a dismissed usage alert toast stays dismissed 2021-02-23 12:51:47 +00:00
Will Hunt 0daed98627 Do not process an older usage event if we've already processed a newer one 2021-02-23 12:51:17 +00:00
J. Ryan Stinnett 72ff919512
Merge pull request #5644 from weeman1337/fix-contextmenu-padding
Fix context menu leaving visible area
2021-02-22 17:42:09 +00:00
Germain bce88efa4f update isUserOnDarkTheme to return correct theme when use_system_theme is true
Signed-off-by: Germain <germain@grabyo.com>
2021-02-21 16:49:30 +00:00
Michael Telatynski 3ca5632f6a Replace ObjectUtils.js with objects.ts 2021-02-19 00:00:10 +00:00
Michael Telatynski 354925c2c8 Improve TS definitions 2021-02-18 15:16:07 +00:00
J. Ryan Stinnett 53c4a1ada5
Merge pull request #5571 from SimonBrandner/improve-layout-handling
Use a more generic layout setting - useIRCLayout → layout
2021-02-17 11:02:26 +00:00
J. Ryan Stinnett 234f1bf2c4 Test domains in config directly 2021-02-15 17:38:11 +00:00
J. Ryan Stinnett d96043d5ab Use config for host signup branding 2021-02-15 17:37:33 +00:00
Šimon Brandner 5072fb0608
Merge branch 'develop' into improve-layout-handling 2021-02-15 16:12:08 +01:00
Michael Weimann f343aaa05a
fix context menu padding calculation
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-02-14 18:37:06 +01:00
Jason Robinson 23140a84ff Remove host signup config strings, make translatable instead
Also replace the icon in the UserMenu and change the text, requested from design.
2021-02-10 13:38:32 +02:00
Jason Robinson 2197c1e519 Address some of the PR feedback 2021-02-09 20:13:58 +02:00
Jason Robinson a4a478cf72 Remove host signup link from UserMenu.tsx
It duplicates the new host signup modal dialog.
2021-02-09 20:01:45 +02:00
Jason Robinson 5fe3c83f27 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-09 11:18:51 +02:00
J. Ryan Stinnett 811ae9ba82
Merge pull request #5616 from dangwynne/develop
Close current modal when session is logged out
2021-02-08 12:56:00 +00:00
J. Ryan Stinnett 5abced7049
Merge pull request #5551 from weeman1337/fix-15347-explore-rooms-spacing
Switch room explorer list to CSS grid
2021-02-08 11:18:01 +00:00