7b4ad61bea 
								
							
								 
							
						 
						
							
							
								
								post-merge fix  
							
							
							
						 
						
							2019-12-16 16:23:35 +00:00  
				
					
						
							
							
								 
						
							
							
								6f5ac780fa 
								
							
								 
							
						 
						
							
							
								
								Use new image.svg placeholder for AvatarSetting in Rooms  
							
							
							
						 
						
							2019-12-16 16:19:43 +00:00  
				
					
						
							
							
								 
						
							
							
								5ab98e9899 
								
							
								 
							
						 
						
							
							
								
								open ImageView when clicking on a set avatar  
							
							
							
						 
						
							2019-12-16 15:21:05 +00:00  
				
					
						
							
							
								 
						
							
							
								9fa2680dc6 
								
							
								 
							
						 
						
							
							
								
								Implement new design for uploading/removing avatars  
							
							
							
						 
						
							2019-12-16 14:58:12 +00:00  
				
					
						
							
							
								 
						
							
							
								be914c7b0c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3728  from matrix-org/jryans/verify-users  
							
							... 
							
							
							
							Verify users when cross-signing enabled 
							
						 
						
							2019-12-16 10:12:46 +00:00  
				
					
						
							
							
								 
						
							
							
								2df72bfde2 
								
							
								 
							
						 
						
							
							
								
								Update room / user decoration for cross-signing  
							
							
							
						 
						
							2019-12-13 17:57:26 +00:00  
				
					
						
							
							
								 
						
							
							
								17a42cd287 
								
							
								 
							
						 
						
							
							
								
								Make LInkPreviewWidget close button Keyboard & SR Accessible  
							
							
							
						 
						
							2019-12-13 14:02:50 +00:00  
				
					
						
							
							
								 
						
							
							
								fae819dfe5 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup  
							
							
							
						 
						
							2019-12-11 10:05:20 +00:00  
				
					
						
							
							
								 
						
							
							
								f079c2fdd2 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3709  from matrix-org/t3chguy/what-input  
							
							... 
							
							
							
							Add what-input to allow different scoping to focus-visible for MAB a11y 
							
						 
						
							2019-12-09 13:45:59 +00:00  
				
					
						
							
							
								 
						
							
							
								4be8b87869 
								
							
								 
							
						 
						
							
							
								
								Add what-input to allow different scoping to focus-visible for MessageActionBar keyboard a11y  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-12-07 13:07:52 +00:00  
				
					
						
							
							
								 
						
							
							
								86e52d1ef3 
								
							
								 
							
						 
						
							
							
								
								Mark the This/All Rooms scope buttons as radios for a11y  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-12-07 12:45:28 +00:00  
				
					
						
							
							
								 
						
							
							
								9f1c2cd3e1 
								
							
								 
							
						 
						
							
							
								
								Add dialogs for creating and accessing secret storage  
							
							... 
							
							
							
							This adds dialogs for creating and accessing secret storage via a passphrase or
recovery key. These flows are adapted from the ones used for key backup. 
							
						 
						
							2019-12-05 15:34:07 +00:00  
				
					
						
							
							
								 
						
							
							
								2a8853dd82 
								
							
								 
							
						 
						
							
							
								
								Remove duplicate dialog CSS  
							
							
							
						 
						
							2019-12-04 17:24:49 +00:00  
				
					
						
							
							
								 
						
							
							
								be6da03348 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3611  from matrix-org/t3chguy/context_menus  
							
							... 
							
							
							
							ARIA compliant context menus 
							
						 
						
							2019-12-04 17:17:47 +00:00  
				
					
						
							
							
								 
						
							
							
								bc52db5423 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3697  from matrix-org/travis/e2e-icons  
							
							... 
							
							
							
							Match e2e icons on events to expectations 
							
						 
						
							2019-12-04 10:33:47 +00:00  
				
					
						
							
							
								 
						
							
							
								33044d713e 
								
							
								 
							
						 
						
							
							
								
								Match e2e icons on events to expectations  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/11547 
Steps taken:
* Convert `E2ePadlock` to a class-style component so the hover state can be tracked (tooltips).
* Convert the image mask to a background image to keep the `!` in the shield.
* Update copy. 
							
						 
						
							2019-12-03 22:41:22 -07:00  
				
					
						
							
							
								 
						
							
							
								e47752ff8d 
								
							
								 
							
						 
						
							
							
								
								Match room upgrade warning to the new design  
							
							... 
							
							
							
							See https://github.com/matrix-org/matrix-react-sdk/pull/3684#issuecomment-560514872  
							
						 
						
							2019-12-02 17:21:53 -07:00  
				
					
						
							
							
								 
						
							
							
								c6e56d98b3 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup  
							
							
							
						 
						
							2019-11-29 11:31:23 +00:00  
				
					
						
							
							
								 
						
							
							
								c103fe4273 
								
							
								 
							
						 
						
							
							
								
								Add cross-signing diagnostic panel  
							
							... 
							
							
							
							This is not part of any designs, so it may be short-lived, but it's quite handy
for diagnosing issues with cross-signing at least while the feature is in
development. 
							
						 
						
							2019-11-29 11:29:08 +00:00  
				
					
						
							
							
								 
						
							
							
								6d69ec17d9 
								
							
								 
							
						 
						
							
							
								
								Merge branches 'develop' and 't3chguy/context_menus' of github.com:matrix-org/matrix-react-sdk into t3chguy/context_menus  
							
							... 
							
							
							
							 Conflicts:
	src/components/views/context_menus/RoomTileContextMenu.js 
							
						 
						
							2019-11-28 16:25:59 +00:00  
				
					
						
							
							
								 
						
							
							
								f020929345 
								
							
								 
							
						 
						
							
							
								
								Add an option to invite users to upgraded private rooms  
							
							... 
							
							
							
							The option doesn't show up on public room upgrades. 
							
						 
						
							2019-11-27 20:29:11 -07:00  
				
					
						
							
							
								 
						
							
							
								dd7b08ec25 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3674  from matrix-org/dbkr/read_marker_css_transition  
							
							... 
							
							
							
							Change read markers to use CSS transitions 
							
						 
						
							2019-11-27 09:18:53 +00:00  
				
					
						
							
							
								 
						
							
							
								bb7cc20b1a 
								
							
								 
							
						 
						
							
							
								
								fix font smoothing to match figma  
							
							... 
							
							
							
							as per https://github.com/vector-im/riot-web/issues/11425 
with apologies to https://usabilitypost.com/2012/11/05/stop-fixing-font-smoothing/  :/ 
							
						 
						
							2019-11-27 00:45:49 +00:00  
				
					
						
							
							
								 
						
							
							
								a2e3f64963 
								
							
								 
							
						 
						
							
							
								
								Change read markers to use CSS transitions  
							
							... 
							
							
							
							Removes one of the two places we use Velocity, so we're one step
closer to getting rid of it for good.
Should therefore fix the fact that Velocity is leaking data entries
and therefore <hr> elements.
Hopefully also makes the logic in getEventTiles incrementally simpler,
if still somwewhat byzantine. 
							
						 
						
							2019-11-26 19:06:02 +00:00  
				
					
						
							
							
								 
						
							
							
								4a684d01a4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3661  from matrix-org/bwindels/verif-toasts  
							
							... 
							
							
							
							Show incoming verification requests in in-app notifications 
							
						 
						
							2019-11-22 16:39:18 +00:00  
				
					
						
							
							
								 
						
							
							
								8ce1ed4726 
								
							
								 
							
						 
						
							
							
								
								moar lint  
							
							
							
						 
						
							2019-11-22 16:36:22 +01:00  
				
					
						
							
							
								 
						
							
							
								309633181d 
								
							
								 
							
						 
						
							
							
								
								use FormButton in verification request tile too and dedupe styles  
							
							
							
						 
						
							2019-11-22 16:32:50 +01:00  
				
					
						
							
							
								 
						
							
							
								66cc68bae4 
								
							
								 
							
						 
						
							
							
								
								add new-styled button  
							
							... 
							
							
							
							might merge it later on with accessible button 
							
						 
						
							2019-11-22 16:04:51 +01:00  
				
					
						
							
							
								 
						
							
							
								e86d2b616e 
								
							
								 
							
						 
						
							
							
								
								add ToastContainer  
							
							
							
						 
						
							2019-11-22 16:04:51 +01:00  
				
					
						
							
							
								 
						
							
							
								e77cf2b87e 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3653  from matrix-org/bwindels/fixe2eicons  
							
							... 
							
							
							
							Fix e2e icons 
							
						 
						
							2019-11-21 19:01:17 +00:00  
				
					
						
							
							
								 
						
							
							
								72f0401589 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into jryans/4s-new-key-backup  
							
							
							
						 
						
							2019-11-21 10:22:13 -07:00  
				
					
						
							
							
								 
						
							
							
								f75e45a715 
								
							
								 
							
						 
						
							
							
								
								reduce margin on e2e icon in room header  
							
							
							
						 
						
							2019-11-21 18:17:55 +01:00  
				
					
						
							
							
								 
						
							
							
								854f27df3f 
								
							
								 
							
						 
						
							
							
								
								remove obsolete style from message composer for e2e icon as it's now the default size for the e2e iconn  
							
							
							
						 
						
							2019-11-21 18:16:10 +01:00  
				
					
						
							
							
								 
						
							
							
								cb0e6ca5d2 
								
							
								 
							
						 
						
							
							
								
								dont make e2e icons themable, as they have multiple colors  
							
							
							
						 
						
							2019-11-21 18:13:01 +01:00  
				
					
						
							
							
								 
						
							
							
								6597e0bd42 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3646  from matrix-org/travis/integration-manager-opt  
							
							... 
							
							
							
							Add an option to disable the use of integration managers for provisioning 
							
						 
						
							2019-11-21 08:10:56 -07:00  
				
					
						
							
							
								 
						
							
							
								81c9bdd9f3 
								
							
								 
							
						 
						
							
							
								
								It's called an "Integration Manager" (singular)  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/11256 
This was finally annoying me enough to fix it. 
							
						 
						
							2019-11-20 20:14:25 -07:00  
				
					
						
							
							
								 
						
							
							
								3391cc0d90 
								
							
								 
							
						 
						
							
							
								
								Add the toggle switch for provisioning  
							
							
							
						 
						
							2019-11-20 20:05:32 -07:00  
				
					
						
							
							
								 
						
							
							
								b0eb54541c 
								
							
								 
							
						 
						
							
							
								
								Rip out options to change your integration manager  
							
							... 
							
							
							
							We are not supporting this due to the complexity involved in switching integration managers. We still support custom ones under the hood, just not to the common user. A later sprint on integrations will consider re-adding the option alongside fixing the various bugs out there. 
							
						 
						
							2019-11-20 19:50:13 -07:00  
				
					
						
							
							
								 
						
							
							
								66c51704cc 
								
							
								 
							
						 
						
							
							
								
								Fix indentation  
							
							
							
						 
						
							2019-11-20 19:21:10 -07:00  
				
					
						
							
							
								 
						
							
							
								fd12eb28e7 
								
							
								 
							
						 
						
							
							
								
								Move many widget options to a context menu  
							
							... 
							
							
							
							Part of https://github.com/vector-im/riot-web/issues/11262  
							
						 
						
							2019-11-20 19:17:42 -07:00  
				
					
						
							
							
								 
						
							
							
								f6394b1251 
								
							
								 
							
						 
						
							
							
								
								Remove stray colour correction on composer e2e icon  
							
							... 
							
							
							
							We want it to match the room header 
							
						 
						
							2019-11-20 11:03:53 -07:00  
				
					
						
							
							
								 
						
							
							
								93e4de9861 
								
							
								 
							
						 
						
							
							
								
								Fix positioning and sizing of e2e icon in the composer  
							
							... 
							
							
							
							This also removes the special case class for the composer because the input is now aligned regardless of icon. 
							
						 
						
							2019-11-20 11:00:39 -07:00  
				
					
						
							
							
								 
						
							
							
								9dea848927 
								
							
								 
							
						 
						
							
							
								
								Use div around buttons to fix React warning  
							
							
							
						 
						
							2019-11-19 16:28:49 +00:00  
				
					
						
							
							
								 
						
							
							
								f9b5678b06 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3631  from matrix-org/bwindels/userinfo-css-fixes  
							
							... 
							
							
							
							Fix some styling regressions in member panel 
							
						 
						
							2019-11-19 13:24:06 +00:00  
				
					
						
							
							
								 
						
							
							
								5f7b0fef33 
								
							
								 
							
						 
						
							
							
								
								scale (new) icons to fit available size  
							
							... 
							
							
							
							fixes https://github.com/vector-im/riot-web/issues/11399  
							
						 
						
							2019-11-19 12:55:28 +01:00  
				
					
						
							
							
								 
						
							
							
								39939de04f 
								
							
								 
							
						 
						
							
							
								
								remove white background on ! and  ✅  so it looks better on dark theme  
							
							
							
						 
						
							2019-11-19 12:51:46 +01:00  
				
					
						
							
							
								 
						
							
							
								de15965c4a 
								
							
								 
							
						 
						
							
							
								
								improve device list layout  
							
							
							
						 
						
							2019-11-19 12:51:37 +01:00  
				
					
						
							
							
								 
						
							
							
								92292003c8 
								
							
								 
							
						 
						
							
							
								
								make shield on verification request scale correctly  
							
							... 
							
							
							
							by not overriding `mask-size` using `mask` for `mask-image` 
							
						 
						
							2019-11-19 12:51:02 +01:00  
				
					
						
							
							
								 
						
							
							
								6b726a8e13 
								
							
								 
							
						 
						
							
							
								
								Implement the bulk of the new widget permission prompt design  
							
							... 
							
							
							
							Part 1 of https://github.com/vector-im/riot-web/issues/11262 
This is all the visual changes - the actual wiring of the UI to the right places is for another PR (though this PR still works independently).
The help icon is known to be weird here - it's a bug in the svg we have. The tooltip also goes right instead of up because making the tooltip go up is not easy work for this PR - maybe a future one if we *really* want it to go up. 
							
						 
						
							2019-11-15 14:26:16 -07:00  
				
					
						
							
							
								 
						
							
							
								0f39a9f72d 
								
							
								 
							
						 
						
							
							
								
								fix pr feedback  
							
							
							
						 
						
							2019-11-15 17:29:38 +01:00