mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 02:05:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
25220 commits 203 branches 553 tags 406 MiB
Commit graph

1824 commits

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
Travis Ralston
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
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
Jorik Schellekens
c0ac44e471 Change internal font size from from 15 to 20. 2020-06-02 17:10:22 +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
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
Michael Telatynski
1dfd62c142 iterate alignment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 17:47:35 +01:00
Michael Telatynski
6a0ffe905f Iterate text alignment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 17:12:16 +01:00
Michael Telatynski
5995a27ced Iterate paddings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 16:52:36 +01:00
Michael Telatynski
7e7c48e046 Improve style of toasts to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 16:32:19 +01: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
03e090f4e6 fix chevron 2020-05-13 22:55:14 +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
Jorik Schellekens
328bb7bcaf Remove all animations 2020-05-13 15:24:08 +01:00
Jorik Schellekens
3f04f5163a Implement more nitpicks 
- fix avatar inital aligment
- right align names
- set flair height to avatar's
- fix conditions for resizing to be more stable
 2020-05-13 14:04:46 +01:00
Michael Telatynski
d63008f9c5
Merge pull request #4576 from matrix-org/t3chguy/kosovo2.0 
Replace png flags and add Kosovo to country code dropdown
 2020-05-13 09:58:10 +01:00
Michael Telatynski
52e3c97f8c
Revert "ImageView make clicking off it easier" 2020-05-13 06:36:14 +01:00
Jorik Schellekens
5029c3f143 Implement IRC draggable display name width 2020-05-13 02:16:43 +01:00
Michael Telatynski
004f75f289 Rename trash (custom).svg as electron doesn't like serving files with spaces 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-12 16:16:47 +01:00
Michael Telatynski
3bb800bb81 Replace png flags with use of Twemoji 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-11 22:04:18 +01:00
Jorik Schellekens
fef4d882c4 lint 2020-05-08 22:35:40 +01:00
Jorik Schellekens
82396661cf Implement nitpicks 
- usernames are elipsed
- icon alignment fixed
- replies are more dense
- reply messages respond to name widths
- fixed between message padding problem (flex ftw)
 2020-05-08 22:21:26 +01:00
Michael Telatynski
6ff093f5a3 Bring back UnknownBody for UISIs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-08 19:15:59 +01:00
Jorik Schellekens
33a5b5142d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-07 18:01:20 +01:00
Jorik Schellekens
ac95172ed4 tighter layout 2020-05-07 14:56:45 +01:00
Jorik Schellekens
771ae5e18f Fix encryption badge layouts and replies. 
Begin removing dependence on slider.
Move settings to labs.
Username disambiguation.
 2020-05-07 14:04:56 +01:00
Jorik Schellekens
5568e6488d Fix encryption badge layout 2020-05-07 14:04:34 +01:00
Jorik Schellekens
0af265bf93 Fix replies 2020-05-07 14:04:34 +01:00
Jorik Schellekens
027826c2e1 Replies have the same layout as messages 2020-05-07 14:04:33 +01:00
Jorik Schellekens
67249e1e9c Fix hover 2020-05-07 14:04:33 +01:00
Jorik Schellekens
54d211a847 Index file name changes 2020-05-07 14:04:33 +01:00
Jorik Schellekens
6c3e3161de Reduce padding 2020-05-07 14:04:33 +01:00
Jorik Schellekens
37e8dc0477 Include new css files 2020-05-07 14:04:33 +01:00
Jorik Schellekens
10c8d253c8 Create irc layout 2020-05-07 14:04:33 +01:00
Jorik Schellekens
c1e740a596 Break out group layout settings 2020-05-07 14:04:33 +01:00
Michael Telatynski
4d6cd3c050 Update padding-left to 20px as per Nad's iteration 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-07 12:50:04 +01:00
Michael Telatynski
f0085a9feb Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign 2020-05-07 09:56:21 +01:00
Travis Ralston
9ae812c346 Add a loading state for email addresses/phone numbers in settings 
Fixes https://github.com/vector-im/riot-web/issues/13432
 2020-05-06 15:17:55 -06:00
Jorik Schellekens
bab7d5f461 Some lints 2020-05-06 17:25:54 +01:00
Jorik Schellekens
d62e6ed05d
Merge pull request #4546 from JorikSchellekens/joriks/font-scaling-regressions 
Fix slider toggle regression.
 2020-05-06 17:08:18 +01:00
Jorik Schellekens
83bd96a091 Css rounds weirdly sometimes. Heigher precision fixes it. 2020-05-04 17:15:09 +01:00
Jorik Schellekens
a11812a402 Fix slider toggle regression. 2020-05-04 15:07:41 +01:00
Michael Telatynski
c00b070269 Fix reply RR spacing getting doubled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-03 13:28:16 +01:00
Zoe
3acb952d9a
Merge pull request #4507 from matrix-org/foldleft/13167-spinner-progress 
Show progress when loading keys
 2020-04-30 14:09:47 +01:00
David Baker
34d6eb591f Put overflows back 2020-04-29 17:38:32 +01:00