2fe7c37566
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/font-scaling-unit-change
2020-06-08 13:37:05 +01:00
ee3d2c51d8
Merge pull request #4697 from matrix-org/travis/room-list/scrolling-resize
...
New room list scrolling and resizing
2020-06-05 13:17:59 -06:00
efa12b8c2f
Merge pull request #4687 from matrix-org/travis/split-left-panel
...
Split the left panel into new and old for new room list designs
2020-06-05 10:07:13 -06:00
f4f23dba04
Fix compact layout regression
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-05 10:53:00 +01:00
e90e70bd77
Misc cleanup
2020-06-04 21:43:33 -06:00
f347019cf8
Remove obviously questionable color choices
2020-06-04 21:37:10 -06:00
dc01607ad9
Merge branch 'develop' into travis/split-left-panel
2020-06-04 15:09:51 -06:00
2fe56276f2
css for vis
2020-06-04 10:07:41 -06:00
f6504d67ba
Use 10px instead
2020-06-04 16:23:28 +01:00
cdf2d70aea
Merge branch 'develop' into travis/room-list/scrolling-resize
2020-06-04 09:19:54 -06:00
aec588dada
Merge pull request #4691 from JorikSchellekens/joriks/fix-addressselector-dropdown-checkbox-overlap
...
Stop checkbox styling bleeding through room address selector
2020-06-04 09:16:45 +00:00
dbf996439b
Wedge t3chguy's resizer prototype into the sublist
2020-06-03 21:17:51 -06:00
c07b5ebe9a
Initial experiments with resizing of room lists
2020-06-03 21:17:18 -06:00
bde327e1e6
Merge pull request #4695 from aaronraimist/center-headerbuttons
...
Center HeaderButtons
2020-06-04 00:36:23 +01:00
3b5de137c4
Center HeaderButtons
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 17:23:23 -05:00
eccacb1bc7
Merge pull request #4605 from matrix-org/t3chguy/e2eedefault
...
Add .well-known option to control default e2ee behaviour
2020-06-03 22:12:13 +01:00
92c28f089c
Add max-width to right and left panels
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 14:56:48 -05:00
5bc756cba1
Fix checkbox bleed
2020-06-03 16:48:05 +01:00
eb536ff2f7
Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault
...
Conflicts:
src/components/views/dialogs/CreateRoomDialog.js
src/components/views/dialogs/InviteDialog.js
src/components/views/right_panel/UserInfo.js
src/createRoom.js
2020-06-03 10:51:17 +01:00
936445ab2d
Merge pull request #4660 from matrix-org/t3chguy/kill_UDE_and_UDD
...
Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling
2020-06-03 10:45:47 +01:00
6d96d66c03
Split the left panel into new and old for new room list designs
...
Though we consider the "room list" to mean the RoomList component specifically, the room list is actually the entire left panel as far as the user is concerned.
The new proposed designs for the room list modify the whole left panel, so we had might as well break it into new and old now instead of later. This "new" left panel is a bare-bones implementation and meant to only provide the absolute basic feature set to function for those who enable the experimental room list, for whatever reason. This is not intended to be a final implementation, or even remotely close to what it could be. An example of this is the lack of breadcrumbs. Given they are likely to change, they are excluded from this temporary skeleton completely.
This also includes a purple/pink bar between the tag panel and left panel. This is so we can, if needed, differentiate between people who made the mistake of turning on the experimental room list while the overall aesthetic makes it indistinguishable. Once the designs are moderately approved, we can (and definitely should) remove the hideous indicator.
2020-06-02 19:26:07 -06:00
170acef796
Fix sizing of the security warning icon
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-02 21:54:38 +01:00
d99babfe05
Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault
2020-06-02 21:51:05 +01:00
c0ac44e471
Change internal font size from from 15 to 20.
2020-06-02 17:10:22 +01:00
3fbfb62bc9
Merge branches 'develop' and 't3chguy/emoji_picker_composer' of github.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer
2020-06-02 14:00:37 +01:00
613b994f9d
Revert "Prevent PersistedElements overflowing scrolled areas"
2020-06-02 00:21:31 -06:00
d3523afd29
delint scss and i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 23:11:47 +01:00
702bbe3bcd
Add e2ee-default:false notice to Setting>Security
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 23:09:14 +01:00
50124d3476
Merge pull request #4675 from JorikSchellekens/joriks/fix-compact-layout-regression
...
Increase specificity of compact layout selectors
2020-06-01 18:11:52 +01:00
85978426c9
Fix selectors
2020-06-01 16:45:19 +01:00
03c6813425
Update res/css/views/rooms/_GroupLayout.scss
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2020-06-01 16:00:11 +01:00
b48818bb46
Increase specificity of compact layout selectors
2020-06-01 15:23:34 +01:00
69747b6114
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/appearance-tab
2020-06-01 14:32:31 +01:00
419857c29c
Merge pull request #4647 from JorikSchellekens/joriks/fix-filepanel-regression
...
Fix FilePanel and NotificationsPanel regression
2020-05-31 21:17:14 +01:00
097f27c822
Merge pull request #4668 from matrix-org/t3chguy/toasts6
...
Give contextual feedback for manual update check instead of banner
2020-05-30 12:46:53 +01:00
3f76b73b50
Merge pull request #4659 from matrix-org/t3chguy/dialog_cancel_space
...
Dialog wrap title instead of taking same space as the close/cancel button
2020-05-29 20:47:31 +01:00
b61f1704d3
Merge branch 'develop' into joriks/fix-filepanel-regression
2020-05-29 19:14:19 +01:00
efd0da44a1
Give contextual feedback for manual update check instead of banner
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-29 18:24:45 +01:00
f40cfe4a3b
Implement new design with new iconography
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-29 15:00:27 +01:00
66c0d53f3e
Create and use stylised checkboxes
2020-05-28 22:33:00 +01:00
930b8ff901
Merge pull request #4662 from JorikSchellekens/joriks/appearance-tab
...
Stop copy icon repeating weirdly
2020-05-28 19:57:46 +01:00
1ab6f27535
Stop copy icon repeating weirdly.
2020-05-28 19:37:49 +01:00
0242b6f3f3
Merge pull request #4624 from matrix-org/t3chguy/toasts3_2
...
Migrate Banners to Toasts
2020-05-28 18:21:28 +01:00
8aaa7825ef
Also kill off things that these kept behind
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 17:12:19 +01:00
f0cabd55c0
Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling
...
as we now always `setGlobalErrorOnUnknownDevices(false)`
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 17:01:22 +01:00
03058bacbd
Dialog wrap title instead of taking same space as the close/cancel button
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 16:48:50 +01:00
46134f5368
Merge pull request #4651 from JorikSchellekens/joriks/fix-encryption-icons-irc
...
Fix encryption icon miss-alignment
2020-05-27 17:05:32 +01:00
5c3208d942
Merge pull request #4649 from JorikSchellekens/joriks/fix-sublist-sizing-regression
...
Fix sublist sizing regression
2020-05-27 17:04:49 +01:00
c492ae97fd
Merge branches 'develop' and 't3chguy/toasts3_2' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_2
2020-05-27 09:45:38 +01:00
73213422a9
fix encryption icon missalignment
2020-05-26 18:15:06 +01:00
Jorik Schellekens