Commit Graph

1320 Commits (bde327e1e6889d2e31f353e66a3af1ba698b9049)

Author SHA1 Message Date
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
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
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
David Baker 563a36e0a1 Remove unused CSS too 2020-05-26 13:42:00 +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
Michael Telatynski 891ba1bbe3 Replace New Version Bar with a Toast
discards the `new_version` dispatch

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-22 23:08:45 +01:00
David Baker ef4d0a8051 Make linter happy 2020-05-22 10:33:19 +01:00
Travis Ralston a425c5440b Fix visibility of message timestamps
Fixes https://github.com/vector-im/riot-web/issues/13736

This also fixes an unreported but complained about issue regarding the 'always show timestamps' option not working.

Looks like this regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4531 when things got shuffled around.
2020-05-21 16:34:23 -06:00
Jorik Schellekens 6d9d4ee547 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-20 13:46:17 +01:00
Jorik Schellekens 3e30df17fb Slider is more responsive 2020-05-20 13:07:33 +01:00
Travis Ralston b96c1ada8a
Merge pull request #4494 from pv/auxpanel-scrolling-persisted
Prevent PersistedElements overflowing scrolled areas
2020-05-19 15:28:58 -06:00
Jorik Schellekens 323d0762fc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/irc-ui 2020-05-19 18:03:44 +01:00
Jorik Schellekens 2e325191bc Merge remote-tracking branch 'nv/develop' into joriks/irc-ui 2020-05-19 17:18:36 +01:00
Jorik Schellekens 5380e76b7b lint 2020-05-18 16:43:47 +01:00
Jorik Schellekens 17f535e5f8 Fix review problems
- removed superfluous position and classes
- fixed compact view
- fixed event list summary avatar and text overlap
- fixed a problem where the mention list refuses to load.
2020-05-18 16:37:10 +01:00
Michael Telatynski 1eea203db6
Merge pull request #4599 from matrix-org/t3chguy/progress_colour
Consolidate password/passphrase fields into a component & add dynamic colour to progress
2020-05-18 11:08:08 +01:00
Michael Telatynski 8bab8be3dd delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 21:01:49 +01:00
Michael Telatynski f2979f3fd8 replace zxcvbn field in CreateKeyBackupDialog with PassphraseField
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 20:59:46 +01:00
Michael Telatynski 865495dd69 replace zxcvbn field in CreateSecretStorageDialog with PassphraseField
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 20:50:22 +01:00
Michael Telatynski cf3c4d9e5f Extract Password field from Registration into a reusable component
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 20:20:36 +01:00
Michael Telatynski 09a4af49f3 Consolidate zxcvbn progress bars into a component and add dynamic colour
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 18:49:55 +01:00
Michael Telatynski 47ff67c6be
Merge pull request #4586 from matrix-org/revert-4448-t3chguy/imageview
Revert "ImageView make clicking off it easier"
2020-05-14 17:31:37 +01:00
Michael Telatynski d1c6f3099c move styling to QRCode scss
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-14 11:20:06 +01:00
Michael Telatynski 1ba19e78f8 Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode
 Conflicts:
	package.json
2020-05-14 10:50:42 +01:00
Jorik Schellekens fc6e5227ac FIx roomsublist heights.
- also fiddles the font size numbers
2020-05-13 22:24:22 +01:00
Jorik Schellekens 5c2abcf1a4 Show username on continuations 2020-05-13 17:05:37 +01:00