ea0fafc4e9 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/olympics  
							
							
							
						 
						
							2020-01-29 22:55:02 +00:00  
				
					
						
							
							
								 
						
							
							
								afecaa1662 
								
							
								 
							
						 
						
							
							
								
								fix left margins in UserInfo  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-29 22:54:56 +00:00  
				
					
						
							
							
								 
						
							
							
								d17a2ff80c 
								
							
								 
							
						 
						
							
							
								
								clean up unused CSS rules  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-01-29 22:54:45 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								6d47f9620f 
								
							
								 
							
						 
						
							
							
								
								Adjust icons with in person with design  
							
							
							
						 
						
							2020-01-29 14:28:19 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								b24c7f3a04 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3967  from matrix-org/t3chguy/cs_verification_decoration  
							
							... 
							
							
							
							Right Panel Verification improvements 
							
						 
						
							2020-01-29 09:46:24 +00:00  
				
					
						
							
							
								 
						
							
							
								61d0021c8e 
								
							
								 
							
						 
						
							
							
								
								Fix styling special case for DialogButtons  
							
							
							
						 
						
							2020-01-29 07:58:43 +00:00  
				
					
						
							
							
								 
						
							
							
								2fbda42374 
								
							
								 
							
						 
						
							
							
								
								Fix buttons in right panel verif  
							
							
							
						 
						
							2020-01-29 07:53:06 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								2fb6e73794 
								
							
								 
							
						 
						
							
							
								
								speed up user info verification css transitions by 2x  
							
							
							
						 
						
							2020-01-28 23:43:27 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								bfaa9d56fb 
								
							
								 
							
						 
						
							
							
								
								prefixes  
							
							
							
						 
						
							2020-01-28 16:05:27 +00:00  
				
					
						
							
							
								 
						
							
							
								ff532dd684 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty  
							
							
							
						 
						
							2020-01-28 16:01:50 +00:00  
				
					
						
							
							
								 
						
							
							
								85bcad0ea0 
								
							
								 
							
						 
						
							
							
								
								Styling for Nad  
							
							
							
						 
						
							2020-01-28 14:46:22 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								7c0a461cbb 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty  
							
							
							
						 
						
							2020-01-28 11:22:02 +00:00  
				
					
						
							
							
								 
						
							
							
								785277d4b8 
								
							
								 
							
						 
						
							
							
								
								Review bits for travis  
							
							
							
						 
						
							2020-01-28 11:17:51 +00:00  
				
					
						
							
							
								 
						
							
							
								657457c14b 
								
							
								 
							
						 
						
							
							
								
								Apply remainder of ux  
							
							
							
						 
						
							2020-01-28 11:13:09 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								ca5d4d88a2 
								
							
								 
							
						 
						
							
							
								
								Style the QR code  
							
							
							
						 
						
							2020-01-27 17:17:05 +00:00  
				
					
						
							
							
								 
						
							
							
								e2dd2bd950 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'poljar/seshat-ui-pr' into develop  
							
							
							
						 
						
							2020-01-27 17:18:17 +01:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								7e0ab2f0a3 
								
							
								 
							
						 
						
							
							
								
								DisableEventIndexDialog: Turn the cancel button red.  
							
							
							
						 
						
							2020-01-27 15:28:43 +01:00  
				
					
						
							
							
								 
						
							
							
								c0d1298c4f 
								
							
								 
							
						 
						
							
							
								
								Factor out into BridgeTile  
							
							
							
						 
						
							2020-01-27 14:05:22 +00:00  
				
					
						
							
							
								 
						
							
							
								c9a0e93a74 
								
							
								 
							
						 
						
							
							
								
								tidy up borders  
							
							
							
						 
						
							2020-01-27 11:14:32 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								2021498755 
								
							
								 
							
						 
						
							
							
								
								Update profile avatar letter size  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/12042  
							
						 
						
							2020-01-24 17:31:04 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								7a5e172b88 
								
							
								 
							
						 
						
							
							
								
								Apply a huge part of the decorations and copy  
							
							
							
						 
						
							2020-01-24 16:16:46 +00:00  
				
					
						
							
							
								 
						
							
							
								098d097922 
								
							
								 
							
						 
						
							
							
								
								Re-enable stylelint on CI  
							
							
							
						 
						
							2020-01-24 14:03:31 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								210616c737 
								
							
								 
							
						 
						
							
							
								
								Phase 1, split out UserInfo into a generic Pane, use for EncInfo  
							
							
							
						 
						
							2020-01-24 11:45:39 +00:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								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