Commit Graph

1782 Commits (f4f23dba04493cba9b82d69f3823e1ec65eba9ad)

Author SHA1 Message Date
Michael Telatynski f4f23dba04 Fix compact layout regression
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-05 10:53:00 +01:00
Bruno Windels 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
Michael Telatynski bde327e1e6
Merge pull request #4695 from aaronraimist/center-headerbuttons
Center HeaderButtons
2020-06-04 00:36:23 +01:00
Aaron Raimist a4c9a67325 Delete files.png and change UploadConfirmDialog to use svg used elsewhere
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 17:23:37 -05:00
Aaron Raimist 711ddd42c9 Remove some unused images
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 17:23:37 -05:00
Aaron Raimist 3b5de137c4 Center HeaderButtons
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 17:23:23 -05:00
Michael Telatynski 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
Aaron Raimist 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
Michael Telatynski 3c922329fe
Merge pull request #4672 from matrix-org/matthew/emoji13
upgrade to twemoji 13.0.0
2020-06-03 17:09:32 +01:00
Jorik Schellekens 5bc756cba1 Fix checkbox bleed 2020-06-03 16:48:05 +01:00
Michael Telatynski 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
Michael Telatynski 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
Michael Telatynski 170acef796 Fix sizing of the security warning icon
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-02 21:54:38 +01:00
Michael Telatynski 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
Michael Telatynski 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
Travis Ralston 613b994f9d
Revert "Prevent PersistedElements overflowing scrolled areas" 2020-06-02 00:21:31 -06:00
Michael Telatynski d3523afd29 delint scss and i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 23:11:47 +01:00
Michael Telatynski 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
Jorik Schellekens 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
Jorik Schellekens 85978426c9 Fix selectors 2020-06-01 16:45:19 +01:00
Jorik Schellekens 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
Jorik Schellekens b48818bb46 Increase specificity of compact layout selectors 2020-06-01 15:23:34 +01:00
Jorik Schellekens 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
Jorik Schellekens 419857c29c
Merge pull request #4647 from JorikSchellekens/joriks/fix-filepanel-regression
Fix FilePanel and NotificationsPanel regression
2020-05-31 21:17:14 +01:00
Matthew Hodgson 9cdc1788b2 rebuild with emojibase-data 5 2020-05-31 16:04:15 +01:00
Matthew Hodgson 566d368c70 fix sbix as per 407a1f4b6d 2020-05-31 15:41:28 +01:00
Matthew Hodgson c3ad15e479 upgrade to twemoji 13.0.0 2020-05-31 14:09:44 +01:00
Michael Telatynski 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
Michael Telatynski 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
Jorik Schellekens b61f1704d3
Merge branch 'develop' into joriks/fix-filepanel-regression 2020-05-29 19:14:19 +01:00
Michael Telatynski 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
Michael Telatynski f40cfe4a3b Implement new design with new iconography
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-29 15:00:27 +01:00
Jorik Schellekens 66c0d53f3e Create and use stylised checkboxes 2020-05-28 22:33:00 +01:00
Jorik Schellekens 930b8ff901
Merge pull request #4662 from JorikSchellekens/joriks/appearance-tab
Stop copy icon repeating weirdly
2020-05-28 19:57:46 +01:00
Jorik Schellekens 1ab6f27535 Stop copy icon repeating weirdly. 2020-05-28 19:37:49 +01:00
Michael Telatynski 0242b6f3f3
Merge pull request #4624 from matrix-org/t3chguy/toasts3_2
Migrate Banners to Toasts
2020-05-28 18:21:28 +01:00
Michael Telatynski 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
Michael Telatynski 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
Michael Telatynski 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
Jorik Schellekens 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
Jorik Schellekens 5c3208d942
Merge pull request #4649 from JorikSchellekens/joriks/fix-sublist-sizing-regression
Fix sublist sizing regression
2020-05-27 17:04:49 +01:00
Michael Telatynski 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
Jorik Schellekens 73213422a9 fix encryption icon missalignment 2020-05-26 18:15:06 +01:00
Jorik Schellekens 792859b939 Fix lines overflowing room list width 2020-05-26 17:39:39 +01:00
Jorik Schellekens d8836f0f4b Fir sublist sizing regression 2020-05-26 17:09:42 +01:00
Jorik Schellekens fcbd197e7d Fix file list regression 2020-05-26 15:56:16 +01:00
David Baker 563a36e0a1 Remove unused CSS too 2020-05-26 13:42:00 +01:00
Michael Telatynski 1f4aac9544
Merge pull request #4631 from matrix-org/t3chguy/emoji-picker-footer-height
Fix Emoji Picker footer being too small if text overflows
2020-05-26 12:00:51 +01:00
Michael Telatynski c00fd326c5
Merge pull request #4613 from matrix-org/t3chguy/toasts1
Improve style of toasts to match Figma
2020-05-26 11:59:58 +01:00
Michael Telatynski db6853e022 Fix Emoji Picker footer being too small if text overflows
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-24 20:00:02 +01:00