Michael Telatynski
343403f1ef
clean up
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 00:09:56 +00:00
Michael Telatynski
86e53ea2c3
Initial attempt to redesign explore servers in room directory
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 00:02:50 +00:00
Michael Telatynski
5c582037ce
Tweak padding to match Figma
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-10 23:11:48 +00:00
Travis Ralston
f33c930c41
Revert "Merge pull request #3892 from krkc/move-read-receipts-to-bottom"
...
This reverts commit 191abb5b0d
.
2020-03-10 11:28:52 -06:00
Bruno Windels
c5e62ec0ef
Merge pull request #4187 from matrix-org/bwindels/altaliases
...
Allow editing of alt_aliases according to MSC2432
2020-03-10 12:45:16 +00:00
J. Ryan Stinnett
c541bc0705
Fix mark as read button for dark theme
...
This changes the mark as read button to a mask image so that it can be themed
like other images.
Fixes https://github.com/vector-im/riot-web/issues/12640
2020-03-09 17:34:17 +00:00
Bruno Windels
8ee714f86d
show hand cursor over summary
2020-03-09 16:50:48 +01:00
Travis Ralston
6aeca7b853
UX polish for custom themes
2020-03-06 17:43:10 -07:00
Travis Ralston
1975a8e082
Merge branch 'develop' into move-read-receipts-to-bottom
2020-03-05 17:13:24 -07:00
Travis Ralston
fcc28c4d4d
Merge pull request #4159 from mstriemer/mark-as-read-button
...
Include a mark as read X under the scroll to unread button
2020-03-05 11:01:12 -07:00
J. Ryan Stinnett
3c2f4a5c42
Merge pull request #4129 from matrix-org/benp/add-security-disclosure-link
...
link to matrix.org/security-disclosure-policy in help screen
2020-03-05 14:47:02 +00:00
Ben Parsons
a6882cece1
increase margin between Settings sections
2020-03-05 14:10:44 +00:00
Tulir Asokan
a8c5574bc8
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2020-03-05 13:19:15 +02:00
Mark Striemer
07348a65ad
Include a mark as read X under the scroll to unread button
2020-03-02 13:59:14 -06:00
Michael Telatynski
4996139b1a
word-break in pills and wrap the background correctly
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-29 01:56:02 +00:00
Michael Telatynski
1875bf4bfe
remove the first preference section's margin
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-26 23:18:01 +00:00
Michael Telatynski
6a66c4162b
Space preference sections out more significantly to make the section headers obvious
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-26 23:16:27 +00:00
David Baker
1edda88351
Merge pull request #4127 from benbucksch/patch-1
...
Solve fixed-width digit display in flowed text
2020-02-26 16:48:13 +00:00
Ben Bucksch
c8493d5b08
Solve fixed-width digits display in flowed text
...
Noto Color Emoji contains digits, in fixed-width, therefore causing digits in flowed text to stand out.
Fixes: https://github.com/vector-im/riot-web/issues/12504
Signed-off-by: Ben Bucksch <ben.bucksch@beonex.com>
2020-02-26 15:32:29 +01:00
Michael Telatynski
2ce006a9ea
delint css
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-26 13:48:22 +00:00
Michael Telatynski
c4ce9a310e
Limit UserInfo Displayname to 3 lines to get rid of scrollbars and ugliness
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-26 13:44:35 +00:00
Travis Ralston
d2e7cc7f19
Merge branch 'develop' into feature/padLockInviteOnly
2020-02-24 09:50:06 -07:00
Zoe
0663ab3b87
lint, and detect new requests
2020-02-24 10:17:33 +00:00
Zoe
72789897a0
Quick n dirty verificatio request viewer in devtools
2020-02-21 17:15:53 +00:00
rtestard
650f412acb
I have added a new line at the end of the scss file
2020-02-19 10:15:58 +01:00
J. Ryan Stinnett
b46af07752
Merge pull request #4051 from TestardR/feature/WhoIsTyping
...
Fix uncentered letter inside avatar for currently typing users
2020-02-12 15:36:02 +00:00
unknown
078401c58f
I have reverted and used the styling a bit higher in the DOM
2020-02-11 20:06:07 +01:00
unknown
3da630beb8
I have removed problematic ligns
2020-02-10 21:38:31 +01:00
Bruno Windels
0e0b0e8d09
fix css lint
2020-02-10 16:19:27 +01:00
Bruno Windels
9059f00b29
move css to correct file
...
Move the CSS for the dialog layout used in VerificationPanel to
_VerificationPanel.scss,
and delete the latter as it doesn't have any css of it's own anymore
2020-02-10 16:19:27 +01:00
Bruno Windels
a865cfb013
put encryption in a proper dialog with close button
2020-02-10 16:19:27 +01:00
Bruno Windels
d9b7b28e5a
add css hacks to make EncryptionPanel look ok in Dialog
...
for the sas and verified phase
2020-02-10 16:19:27 +01:00
Travis Ralston
469d533964
Apply some CSS
2020-02-10 16:19:27 +01:00
Michael Telatynski
0393a57b5a
fix submit button disabled breaking async task
2020-02-09 14:49:54 +00:00
unknown
06ba55e1a1
I have made changes according to turt2live recommandations, mainly css indentation and variable definition
2020-02-09 15:05:08 +01:00
J. Ryan Stinnett
a4228907a6
Merge pull request #4037 from matrix-org/jryans/scroll-up-pointer
...
Let pointer events fall through to scroll button
2020-02-06 13:52:14 +00:00
J. Ryan Stinnett
b522d78533
Let pointer events fall through to scroll button
...
This makes it easier to click the entire visible area of the scroll button,
including the green circle at the top.
2020-02-05 12:43:50 +00:00
Travis Ralston
73b177d075
Merge pull request #4024 from TestardR/develop
...
Button size reviewed for word consuming languages & Settings showing devices are a bit too tight
2020-02-05 10:43:03 +00:00
Bruno Windels
c50bd8d30e
Merge pull request #4007 from hellcp/patch-1
...
Add a class for styling room directory permissions
2020-02-04 16:30:10 +00:00
rtestard
153703426a
I have removed the newline at the end of file to pass tests
2020-02-04 16:02:49 +01:00
rtestard
f023bcfd63
I have modified padlocks styling when the left panel is collapsed
2020-02-04 15:05:26 +01:00
unknown
20fc8514a5
I have added spacing, as devices are very hard to read otherwise
2020-02-02 18:47:16 +01:00
unknown
aa52118fa1
the width was not properly set to other languages than english, a min-width will keep the proper size of the button while leaving some room for more word expensive languages such as french
2020-02-02 17:31:06 +01:00
J. Ryan Stinnett
ffc3cdf7b5
Tweak emoji sizes
2020-02-01 13:49:11 +01:00
David Baker
9d343a4705
Merge pull request #4018 from matrix-org/dbkr/truncate_sas
...
Truncate SAS emoji labels to fit
2020-01-31 16:23:50 +00:00
David Baker
29024c5172
Truncate SAS emoji labels to fit
...
This keeps the layout of the emoji fixed as much as possible.
Other changes:
* Fix width of each emoji container to static 52px
* Bump minimum width of right panel from 250px to 264px to match the
width in the figma
* Use normal font-weight for labels as per design
* Smaller vertical gap between emojis, again to match design
2020-01-31 15:28:58 +00:00
David Baker
2dbceca8b3
Fix size of invite only icon
...
So it doesn't become tiny with long room names
Fixes https://github.com/vector-im/riot-web/issues/12168
2020-01-31 13:46:42 +00:00
J. Ryan Stinnett
68b2454920
Merge pull request #4006 from matrix-org/jryans/user-list-deco
...
Add shields to member list, move power label to text
2020-01-31 10:20:13 +00:00
David Baker
24075dc248
Merge pull request #4005 from matrix-org/dbkr/encryption_events
...
Make encryption events into bubble-style tiles
2020-01-31 10:20:03 +00:00
J. Ryan Stinnett
31476737ea
Enforce a max width on power labels
2020-01-31 10:11:34 +00:00
Stasiek Michalski
bf9f473ed9
Add a class for styling room directory permissions
...
Fixes vector-im/riot-web#11174
2020-01-31 00:09:08 +01:00
J. Ryan Stinnett
6f6d6b096a
Ensure QR code, verified hero are centered
2020-01-30 22:43:14 +00:00
J. Ryan Stinnett
673fb792e5
Remove unused power level icons
2020-01-30 22:09:57 +00:00
J. Ryan Stinnett
3ef7e5113b
Move power label to right of name
...
The power label is shown to the right of the name, but hidden on hover.
Part of https://github.com/vector-im/riot-web/issues/11940
2020-01-30 22:09:57 +00:00
J. Ryan Stinnett
5933bd15b1
Remove strange size change on member hover
...
Unclear why this is here, but removing as it feels quite glitchy, esp on
matrix.org where there's no second line to print.
2020-01-30 21:46:49 +00:00
J. Ryan Stinnett
57c4293fc6
Add verification status icons to room members
...
This displays verification status on each room member tile using the same shield
logic as elsewhere.
Part of https://github.com/vector-im/riot-web/issues/11940
2020-01-30 21:38:40 +00:00
David Baker
39e9bffe1f
Make encryption events into bubble-style tiles
...
Factors out the verification tile stuff into encryption event
styles so we can reuse them betwen all the encryption event tiles.
Also makes the event list summary stuff even more gnarly by
putting the encryption event tile above the group. We really need
to refactor that. :/
Fixes https://github.com/vector-im/riot-web/issues/12006
2020-01-30 20:03:26 +00:00
J. Ryan Stinnett
bae35c0859
Change power icon to label instead
2020-01-30 16:40:25 +00:00
David Baker
77618d30fd
Actually this is green because it's a link
...
not because the things were verified. Use the linkButton class
2020-01-30 16:08:42 +00:00
David Baker
0956d00637
Make shields in UserInfo black if user isn't verified
2020-01-30 15:59:03 +00:00
Michael Telatynski
ea0fafc4e9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/olympics
2020-01-29 22:55:02 +00:00
Michael Telatynski
afecaa1662
fix left margins in UserInfo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 22:54:56 +00:00
Michael Telatynski
d17a2ff80c
clean up unused CSS rules
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 22:54:45 +00:00
Michael Telatynski
33ec73095e
Apply the Olympic effect to SAS Emoji Verification
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 22:44:49 +00:00
Michael Telatynski
a180dddc66
Pass an ID to the <Field/> as needed and fix div inside p nesting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 22:31:19 +00:00
J. Ryan Stinnett
725ec1dda6
Merge pull request #3978 from matrix-org/jryans/cs-polish
...
Change new session toast to unverified
2020-01-29 15:33:19 +00:00
Michael Telatynski
9457520cc2
Merge pull request #3975 from matrix-org/t3chguy/right_panel_learn_more
...
Replace Verify button in UserInfo verification with "Learn more"
2020-01-29 15:27:46 +00:00
J. Ryan Stinnett
f12fe984e5
Change new session toast to unverified
...
This also changes text to show the device ID and name in the toast.
Fixes https://github.com/vector-im/riot-web/issues/11916
2020-01-29 15:00:04 +00:00
J. Ryan Stinnett
6d47f9620f
Adjust icons with in person with design
2020-01-29 14:28:19 +00:00
Michael Telatynski
00dd1a4a8f
Re-use existing classes to fix font-size matching
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 14:22:20 +00:00
Michael Telatynski
19e7c768b6
Replace Verify button in UserInfo verification with "Learn more"
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 14:11:50 +00:00
Michael Telatynski
b24c7f3a04
Merge pull request #3967 from matrix-org/t3chguy/cs_verification_decoration
...
Right Panel Verification improvements
2020-01-29 09:46:24 +00:00
Michael Telatynski
61d0021c8e
Fix styling special case for DialogButtons
2020-01-29 07:58:43 +00:00
Michael Telatynski
2fbda42374
Fix buttons in right panel verif
2020-01-29 07:53:06 +00:00
Michael Telatynski
2c973f7467
Merge pull request #3950 from matrix-org/t3chguy/cs_verification_decoration
...
Cross Signing Right Panel Verification Decoration
2020-01-28 23:57:48 +00:00
Michael Telatynski
2fb6e73794
speed up user info verification css transitions by 2x
2020-01-28 23:43:27 +00:00
David Baker
8c471d6713
Merge pull request #3964 from matrix-org/dbkr/start_key_backup_in_bootstrap
...
Start new key backup in security setup flow
2020-01-28 22:02:20 +00:00
J. Ryan Stinnett
463bddb7e9
Merge pull request #3958 from mstange/fix-unread-scroll-button-hittarget-and-alignment
...
Tweak styling of the unread indicator circle.
2020-01-28 21:53:50 +00:00
David Baker
39c8a9d204
Start new key backup in security setup flow
...
Part of https://github.com/vector-im/riot-web/issues/11889
2020-01-28 19:42:09 +00:00
Michael Telatynski
76e61b9948
Merge branches 'develop' and 't3chguy/cs_verification_decoration' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
2020-01-28 17:19:59 +00:00
Half-Shot
bfaa9d56fb
prefixes
2020-01-28 16:05:27 +00:00
Half-Shot
ff532dd684
Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty
2020-01-28 16:01:50 +00:00
Half-Shot
85bcad0ea0
Styling for Nad
2020-01-28 14:46:22 +00:00
Markus Stange
9821e25e0b
Tweak styling of unread indicator circle.
...
This makes the element symmetric and reduces the size of the hit target.
With the previous styling, the mid-circle glyph was sometimes offset from the center.
Furthermore, the large font size increased the hit box of the ::after element, eating into the scroll up arrow button's hit target.
It might be a good idea to give the ::after element pointer-events:none so that the scroll up button is clickable in its entirety.
Signed-off-by: Markus Stange <mstange@themasta.com>
2020-01-28 15:35:34 +01:00
J. Ryan Stinnett
dea919f6ee
Merge pull request #3953 from matrix-org/jryans/verif-toast-details-2
...
Add new session verification details dialog
2020-01-28 11:50:03 +00:00
Half-Shot
7c0a461cbb
Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty
2020-01-28 11:22:02 +00:00
Half-Shot
785277d4b8
Review bits for travis
2020-01-28 11:17:51 +00:00
Michael Telatynski
657457c14b
Apply remainder of ux
2020-01-28 11:13:09 +00:00
J. Ryan Stinnett
6a9786e202
Merge pull request #3951 from matrix-org/jryans/comp-sec-body
...
Add separate component for post-auth security flows
2020-01-28 10:01:13 +00:00
J. Ryan Stinnett
d014c5239b
Add new session verification details dialog
...
This gives more info on the session you're about to verify, including device
name and ID.
Fixes https://github.com/vector-im/riot-web/issues/11977
2020-01-27 23:16:26 +00:00
J. Ryan Stinnett
89f110f60a
Add separate component for post-auth security flows
...
Instead of twisting `AuthBody`, this adds a new component for the different
styling of post-auth security flows. This also makes them fixed width and
adjusts padding to match designs.
2020-01-27 22:28:07 +00:00
Michael Telatynski
ca5d4d88a2
Style the QR code
2020-01-27 17:17:05 +00:00
Damir Jelić
e2dd2bd950
Merge branch 'poljar/seshat-ui-pr' into develop
2020-01-27 17:18:17 +01:00
Michael Telatynski
ddb0f06005
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
...
Conflicts:
src/components/views/right_panel/VerificationPanel.js
2020-01-27 15:46:38 +00:00
Damir Jelić
7e0ab2f0a3
DisableEventIndexDialog: Turn the cancel button red.
2020-01-27 15:28:43 +01:00
Half-Shot
c0d1298c4f
Factor out into BridgeTile
2020-01-27 14:05:22 +00:00
Half-Shot
c9a0e93a74
tidy up borders
2020-01-27 11:14:32 +00:00
David Baker
988ae14d35
Merge pull request #3937 from matrix-org/dbkr/e2esetup
...
Setup flow for cross-signing on login / registration
2020-01-25 12:40:17 +00:00
J. Ryan Stinnett
cb34f37a2c
Merge pull request #3935 from matrix-org/jryans/prof-avatar-size
...
Update profile avatar letter size
2020-01-24 22:39:47 +00:00
David Baker
3d7137d4ad
Setup flow for cross-signing on login / registration
...
Still outstanding:
* Keep password from login / registration
* Confirmation on skip button
Fixes https://github.com/vector-im/riot-web/issues/11902
2020-01-24 19:11:57 +00:00
J. Ryan Stinnett
2021498755
Update profile avatar letter size
...
Fixes https://github.com/vector-im/riot-web/issues/12042
2020-01-24 17:31:04 +00:00
Michael Telatynski
342fcb09c4
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
...
Conflicts:
src/components/views/right_panel/VerificationPanel.js
src/components/views/toasts/VerificationRequestToast.js
2020-01-24 16:19:41 +00:00
Michael Telatynski
7a5e172b88
Apply a huge part of the decorations and copy
2020-01-24 16:16:46 +00:00
David Baker
098d097922
Re-enable stylelint on CI
2020-01-24 14:03:31 +00:00
Zoe
131aacd3ab
Merge pull request #3929 from matrix-org/zip/11840-tooltips-on-padlocks
...
Seperates out the padlock icon, and adds a tooltip
2020-01-24 13:26:59 +00:00
Michael Telatynski
2c40b73ff6
Merge pull request #3910 from matrix-org/t3chguy/cross-signing-composer
...
Cross Signing redesign for composer
2020-01-24 13:18:09 +00:00
Zoe
a6fcbcacf6
Seperates out the padlock icon, and adds a tooltip
...
Fixes https://github.com/vector-im/riot-web/issues/11840
2020-01-24 12:06:21 +00:00
Michael Telatynski
210616c737
Phase 1, split out UserInfo into a generic Pane, use for EncInfo
2020-01-24 11:45:39 +00:00
Zoe
1d686fe49e
Merge pull request #3908 from matrix-org/zip/11935-room-list-decoration
...
Room list reflects encryption state
2020-01-24 11:14:53 +00:00
Michael Telatynski
0078c2f099
Merge pull request #3914 from matrix-org/t3chguy/userinfo_scroll
...
Make the entire User Info scrollable, sticky close button
2020-01-24 10:22:17 +00:00
David Baker
50b05551ba
Merge pull request #3916 from matrix-org/dbkr/security_dialog_noheader
...
Remove riot logo from the security setup screens
2020-01-24 09:50:25 +00:00
David Baker
5319ee4572
Remove riot logo from the security setup screens
...
With a little faff to make the rounded borders consistent again
2020-01-23 18:14:08 +00:00
Michael Telatynski
237a0ed071
Make the entire User Info scrollable, sticky close button
2020-01-23 16:09:32 +00:00
Travis Ralston
a566c74e39
Merge pull request #3905 from matrix-org/travis/user-lists-final
...
Fix scrollable area and padding in user lists dialog
2020-01-23 09:04:40 -07:00
Michael Telatynski
26aa4bb4f3
Merge pull request #3909 from matrix-org/t3chguy/invite_reject_ignore
...
Add Reject & Ignore user button to invites view
2020-01-23 14:59:19 +00:00
Zoe
e9dccd1460
moving icons exactly one pixel to the right and one pixel down
2020-01-23 14:44:57 +00:00
Michael Telatynski
662b34c8db
Update MessageComposer placeholder and e2e icon size
2020-01-23 14:38:39 +00:00
Michael Telatynski
30bfd4046d
improve spacing of buttons on RoomPreviewBar
2020-01-23 12:27:25 +00:00
David Baker
10db79bb93
Merge remote-tracking branch 'origin/develop' into dbkr/bootstrap_visuals_1
2020-01-23 11:05:21 +00:00
David Baker
442b8be459
Merge pull request #3897 from matrix-org/dbkr/bootstrap_from_key_backup_ui
...
Implement some parts of new cross signing bootstrap UI
2020-01-23 11:04:49 +00:00
Zoe
d68db74efe
Room list reflects encryption state
2020-01-23 10:46:05 +00:00
Travis Ralston
054ebb9458
Fix scrollable area and padding in user lists dialog
2020-01-22 21:07:29 -07:00
David Baker
78654cc693
Updated visuals for cross-signing bootstrap
...
* Use Fields rather than plain inputs
* Update padding & alignment to match designs
* Add Skip buttons
* Update copy as per designs
Part of https://github.com/vector-im/riot-web/issues/11902
Based on https://github.com/matrix-org/matrix-react-sdk/pull/3897
2020-01-22 18:08:39 +00:00
Michael Telatynski
33b5d42c06
Be consistent about our settings svg, free the other one
2020-01-22 15:34:17 +00:00
David Baker
e98269822c
Add icon to bootstrap dialogs
2020-01-22 11:44:47 +00:00
Half-Shot
b2fc4a1c4d
Style bridge settings tab according to design
...
Signed-off-by: Half-Shot <will@half-shot.uk>
2020-01-21 18:41:43 +00:00
Zoe
0809d7dcba
Merge pull request #3875 from matrix-org/zip/11880-message-shields
...
Verify individual messages via cross-signing
2020-01-21 18:11:36 +00:00
Michael Telatynski
587ff6ad75
Merge pull request #3844 from matrix-org/t3chguy/roving
...
Implement Roving Tab Index and Room List as TreeView
2020-01-21 17:36:30 +00:00
Zoe
ec714283ca
Merge pull request #3888 from matrix-org/zip/11833-overlay-shields
...
Move room header shields over the avatar for the room
2020-01-21 16:56:09 +00:00
Christopher
ccd3234873
Moved read receipts to the bottom of the EventTile.
2020-01-21 16:14:01 +00:00
J. Ryan Stinnett
790d2c1472
Fix toast icon to prevent clipping
...
This fixes the bottom and right edges of the toast icon, which were getting
clipped away.
Fixes https://github.com/vector-im/riot-web/issues/11915
2020-01-21 15:30:03 +00:00
Zoe
c8a2f6a5a0
Move room header shields over the avatar for the room
...
Currently this is calibrated like the lil' DM icon is
2020-01-21 13:33:16 +00:00
Michael Telatynski
397e116efb
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/roving
2020-01-20 20:48:11 +00:00
Zoe
befd4e1f5a
shout more for unknown devices, but keep the tooltip
2020-01-20 17:25:08 +00:00
Zoe
12c4e45387
User verified but device deleted isn't a useful state
2020-01-20 17:15:38 +00:00
Zoe
f77eb07849
Verify individual messages via cross-signing
...
Fixes #11880
2020-01-20 15:16:41 +00:00
Travis Ralston
21f8130ebe
Prevent the invite dialog from jumping around when elements change
...
Part of https://github.com/vector-im/riot-web/issues/11201
2020-01-17 17:12:35 -07:00
David Baker
9e43abaf3a
Toasts for new, unverified sessions
...
Fixes https://github.com/vector-im/riot-web/issues/11218
2020-01-17 11:43:35 +00:00
Travis Ralston
7da9e0582f
Rename DMInviteDialog to be a generic Invite Dialog
2020-01-16 13:42:34 -07:00
Travis Ralston
372861c9df
Merge branch 'develop' into travis/ftue/user-lists/5.3-go-button
2020-01-16 13:36:59 -07:00
Michael Telatynski
e6ab18c9ba
Merge branches 'develop' and 't3chguy/roving' of github.com:matrix-org/matrix-react-sdk into t3chguy/roving
...
Conflicts:
src/components/views/rooms/RoomList.js
2020-01-16 00:31:43 +00:00
J. Ryan Stinnett
27ee90cad5
Add post-login complete security flow
...
This adds a step after login to complete security for your new session. At the
moment, the only verification method is entering your SSSS passphrase, but nicer
paths will be added soon.
This new step only appears when crypto is available and the account has
cross-signing enabled in SSSS.
Fixes https://github.com/vector-im/riot-web/issues/11214
2020-01-15 21:53:36 +00:00
Travis Ralston
7bfb3686cd
Merge pull request #3839 from matrix-org/travis/sourcemaps
...
Fix sourcemaps by refactoring the build system
2020-01-15 10:11:33 -07:00
Travis Ralston
443744733d
Move DM creation logic into DMInviteDialog
...
Fixes https://github.com/vector-im/riot-web/issues/11645
The copy hasn't been reviewed by anyone and could probably use some work.
2020-01-14 23:32:00 -07:00
Michael Telatynski
5252cf4c45
Implement roving tab index context based magic thing and demo on LeftPanel
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-15 02:44:22 +00:00
Travis Ralston
5fd27a10bb
Merge branch 'develop' into travis/sourcemaps
2020-01-13 11:19:41 -07:00
Zoe
a56bf5398d
lint
2020-01-13 14:54:39 +00:00
Zoe
e43174c636
Show padlock in room headers for invite-only rooms
...
Fixes #11832
2020-01-13 14:49:23 +00:00
Zoe
edd08c279c
Merge pull request #3821 from matrix-org/zip/11226-padlock-icons
...
Display a padlock icon beside invite-only rooms (excluding DMs) in the room list
2020-01-13 12:20:32 +00:00
Zoe
5551b207c1
Actually, this task was about join rules, not encryption ones. Oops.
2020-01-10 16:33:08 +00:00