74291e8c2d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4370  from matrix-org/t3chguy/clear_event_line  
							
							... 
							
							
							
							Fix image thumbnail width when read receipts are hidden 
							
						 
						
							2020-04-09 20:57:12 +01:00  
				
					
						
							
							
								 
						
							
							
								a9a253f27f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4362  from matrix-org/t3chguy/private_room_e2ee  
							
							... 
							
							
							
							Add toggle for e2ee when creating private room 
							
						 
						
							2020-04-09 17:22:58 +01:00  
				
					
						
							
							
								 
						
							
							
								60808ef6d2 
								
							
								 
							
						 
						
							
							
								
								apply clear:both to fix automatic margins for continuation events  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-09 13:36:53 +01:00  
				
					
						
							
							
								 
						
							
							
								ffecf03b2a 
								
							
								 
							
						 
						
							
							
								
								Update margins to improve grouping  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-08 14:48:50 +01:00  
				
					
						
							
							
								 
						
							
							
								4041c030a5 
								
							
								 
							
						 
						
							
							
								
								Apply changes from Figma  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-08 14:44:34 +01:00  
				
					
						
							
							
								 
						
							
							
								eec28ce38a 
								
							
								 
							
						 
						
							
							
								
								Update styling and copy to match Figma  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-08 13:47:15 +01:00  
				
					
						
							
							
								 
						
							
							
								ada860f163 
								
							
								 
							
						 
						
							
							
								
								Add toggle for e2ee when creating private room in x-signing world  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-08 10:50:22 +01:00  
				
					
						
							
							
								 
						
							
							
								712e6e8c49 
								
							
								 
							
						 
						
							
							
								
								Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-07 19:03:12 +01:00  
				
					
						
							
							
								 
						
							
							
								3e4e7953ed 
								
							
								 
							
						 
						
							
							
								
								word-break: break-word;  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-07 13:40:25 +01:00  
				
					
						
							
							
								 
						
							
							
								b5e6f8b8c1 
								
							
								 
							
						 
						
							
							
								
								Iterate PR  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-07 13:34:10 +01:00  
				
					
						
							
							
								 
						
							
							
								faab35738f 
								
							
								 
							
						 
						
							
							
								
								Add new default home page fallback  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-07 10:48:56 +01:00  
				
					
						
							
							
								 
						
							
							
								fe401ce4da 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into t3chguy/xsigning/fix_userinfo_e2eicon  
							
							
							
						 
						
							2020-04-03 18:38:30 +01:00  
				
					
						
							
							
								 
						
							
							
								adead76882 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into bwindels/selfverifux  
							
							
							
						 
						
							2020-04-03 17:53:07 +02:00  
				
					
						
							
							
								 
						
							
							
								2cf55fb2a0 
								
							
								 
							
						 
						
							
							
								
								adjust start options styling  
							
							
							
						 
						
							2020-04-03 17:32:09 +02:00  
				
					
						
							
							
								 
						
							
							
								c15fa2ba0c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4334  from matrix-org/bwindels/qr-reciprocate  
							
							... 
							
							
							
							QR code reciprocation 
							
						 
						
							2020-04-03 12:28:41 +00:00  
				
					
						
							
							
								 
						
							
							
								3ed457ea7d 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4305  from JorikSchellekens/joriks/font-scaling  
							
							... 
							
							
							
							Make all 'font-size's and 'line-height's rem 
							
						 
						
							2020-04-02 17:40:39 +01:00  
				
					
						
							
							
								 
						
							
							
								fffd5a4a5e 
								
							
								 
							
						 
						
							
							
								
								fix stylelint  
							
							
							
						 
						
							2020-04-02 16:46:29 +02:00  
				
					
						
							
							
								 
						
							
							
								0307361fa2 
								
							
								 
							
						 
						
							
							
								
								more polish for self-verification  
							
							
							
						 
						
							2020-04-02 16:42:39 +02:00  
				
					
						
							
							
								 
						
							
							
								202ad9f98a 
								
							
								 
							
						 
						
							
							
								
								Remove sort and include new scss file in components  
							
							
							
						 
						
							2020-04-02 13:42:59 +01:00  
				
					
						
							
							
								 
						
							
							
								df1a8b288b 
								
							
								 
							
						 
						
							
							
								
								Change copyright  
							
							
							
						 
						
							2020-04-02 13:35:12 +01:00  
				
					
						
							
							
								 
						
							
							
								31ca52dede 
								
							
								 
							
						 
						
							
							
								
								fix stylelint  
							
							
							
						 
						
							2020-04-02 13:44:19 +02:00  
				
					
						
							
							
								 
						
							
							
								1f65cfb7f6 
								
							
								 
							
						 
						
							
							
								
								polish design and disable buttons after click  
							
							
							
						 
						
							2020-04-02 13:44:19 +02:00  
				
					
						
							
							
								 
						
							
							
								ccf6c9efdc 
								
							
								 
							
						 
						
							
							
								
								fixup: more i18n  
							
							
							
						 
						
							2020-04-02 13:44:19 +02:00  
				
					
						
							
							
								 
						
							
							
								6db51cf9aa 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4321  from matrix-org/t3chguy/room_settings_notif_icon  
							
							... 
							
							
							
							Fix Room Settings Dialog Notifications tab icon 
							
						 
						
							2020-04-02 09:50:57 +01:00  
				
					
						
							
							
								 
						
							
							
								faa4f54c97 
								
							
								 
							
						 
						
							
							
								
								Only apply padding to standard textual buttons (kind buttons)  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-02 00:12:48 +01:00  
				
					
						
							
							
								 
						
							
							
								544bd09667 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4320  from matrix-org/t3chguy/user_info_buttons  
							
							... 
							
							
							
							Fix UserInfo e2e buttons to match Figma 
							
						 
						
							2020-04-01 17:47:05 +01:00  
				
					
						
							
							
								 
						
							
							
								094d006928 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4292  from matrix-org/travis/sso-uia  
							
							... 
							
							
							
							Support SSO for interactive authentication 
							
						 
						
							2020-04-01 10:27:24 -06:00  
				
					
						
							
							
								 
						
							
							
								430a9ef948 
								
							
								 
							
						 
						
							
							
								
								tweak e2e icon margins  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-01 15:09:19 +01:00  
				
					
						
							
							
								 
						
							
							
								6293684218 
								
							
								 
							
						 
						
							
							
								
								Fix Room Settings Dialog Notifications tab icon  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-01 12:57:28 +01:00  
				
					
						
							
							
								 
						
							
							
								759de88b43 
								
							
								 
							
						 
						
							
							
								
								match padding too  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-01 12:25:48 +01:00  
				
					
						
							
							
								 
						
							
							
								4a4a13ac75 
								
							
								 
							
						 
						
							
							
								
								Fix UserInfo e2e buttons to match Figma  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-04-01 12:21:18 +01:00  
				
					
						
							
							
								 
						
							
							
								eb901441cd 
								
							
								 
							
						 
						
							
							
								
								Fix alignment of e2e icon in userinfo and expose full displayname in title  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-03-31 16:14:18 +01:00  
				
					
						
							
							
								 
						
							
							
								e2685b1cf0 
								
							
								 
							
						 
						
							
							
								
								Licensing info  
							
							
							
						 
						
							2020-03-31 15:29:40 +01:00  
				
					
						
							
							
								 
						
							
							
								6cf9166c4a 
								
							
								 
							
						 
						
							
							
								
								Use variables for the rem values.  
							
							... 
							
							
							
							It's become obvious that these random floating points everywhere
are unwieldy. Now they're all in one place with some fairly logical
variable names which will help out in design->implementation phase. 
							
						 
						
							2020-03-31 15:26:23 +01:00  
				
					
						
							
							
								 
						
							
							
								9e8a401dc8 
								
							
								 
							
						 
						
							
							
								
								Fix EventListSummary when RR rendering is disabled  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2020-03-31 12:29:58 +01:00  
				
					
						
							
							
								 
						
							
							
								8bc86deaaa 
								
							
								 
							
						 
						
							
							
								
								Appease the style linter  
							
							
							
						 
						
							2020-03-30 20:23:34 -06:00  
				
					
						
							
							
								 
						
							
							
								ffa75ef48c 
								
							
								 
							
						 
						
							
							
								
								Wire up all the dialog parts for SSO, using device deletion as a POC  
							
							
							
						 
						
							2020-03-30 20:03:46 -06:00  
				
					
						
							
							
								 
						
							
							
								da34e6241d 
								
							
								 
							
						 
						
							
							
								
								Make all 'font-size's and 'line-height's rem  
							
							... 
							
							
							
							Font size of the whole app would ideally be controlled by a single
value. This value is currently hard coded using the :root CSS selector.
It is the intention to make this value configurable within riot. In the
interim all font-sizes have been converted to rem by the simple process
of regex. Replacing px values with their equivalent rem values assuming
a font size of 15px and then rounded to three decimal places, which was
the base at the time of this transformation.
I'm expecting another commit cleaning up rem values but I thought it
best to leave that to review.
This commit doesn't address any scaling issues. I thought it better to
land this unwieldy, mechanical, invisible change before the others
otherwise the pr would be impossible to review thoroughly. 
							
						 
						
							2020-03-30 18:23:46 +01:00  
				
					
						
							
							
								 
						
							
							
								b5688ac2b6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4254  from ThobyV/fix-css/_TagPanel.scss/mx_TagTile_context_button  
							
							... 
							
							
							
							Fix view community link icon contrast 
							
						 
						
							2020-03-30 11:20:49 -06:00  
				
					
						
							
							
								 
						
							
							
								eff9db4273 
								
							
								 
							
						 
						
							
							
								
								bring back global style rules for thin scrollbars (also FF now!)  
							
							
							
						 
						
							2020-03-30 12:41:05 +02:00  
				
					
						
							
							
								 
						
							
							
								2278a724aa 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4283  from matrix-org/bwindels/cancelverifypanel  
							
							... 
							
							
							
							Add cancel button to verification panel 
							
						 
						
							2020-03-27 10:20:02 +00:00  
				
					
						
							
							
								 
						
							
							
								a2737899c1 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #4276  from matrix-org/bwindels/transparentscrollbars  
							
							... 
							
							
							
							Fix: allow scrolling while window is not focused & remove scrollbar hack 
							
						 
						
							2020-03-27 10:16:53 +00:00  
				
					
						
							
							
								 
						
							
							
								4f3842d75e 
								
							
								 
							
						 
						
							
							
								
								pick color similar to chevron for cancel X button  
							
							
							
						 
						
							2020-03-26 16:58:17 +01:00  
				
					
						
							
							
								 
						
							
							
								9b54d15fcd 
								
							
								 
							
						 
						
							
							
								
								add cancel button to verification panel  
							
							
							
						 
						
							2020-03-26 16:53:46 +01:00  
				
					
						
							
							
								 
						
							
							
								aed85a2183 
								
							
								 
							
						 
						
							
							
								
								fix style lint  
							
							
							
						 
						
							2020-03-26 11:17:35 +01:00  
				
					
						
							
							
								 
						
							
							
								2186023e43 
								
							
								 
							
						 
						
							
							
								
								css adjustments because mx_AutoHideScrollBar_offset was removed  
							
							
							
						 
						
							2020-03-26 11:17:35 +01:00  
				
					
						
							
							
								 
						
							
							
								0436507574 
								
							
								 
							
						 
						
							
							
								
								use transparent scrollbars on not hover to emulate scrolbar on hover  
							
							... 
							
							
							
							allows us to get rid of the margin-right hack as well 
							
						 
						
							2020-03-26 11:17:35 +01:00  
				
					
						
							
							
								 
						
							
							
								327b3c860b 
								
							
								 
							
						 
						
							
							
								
								Adding the files would help  
							
							
							
						 
						
							2020-03-25 18:47:57 +00:00  
				
					
						
							
							
								 
						
							
							
								25e7bde7bc 
								
							
								 
							
						 
						
							
							
								
								Add a flag to control whether cross-signing signatures are trusted  
							
							... 
							
							
							
							Fixes: https://github.com/vector-im/riot-web/issues/12616  
							
						 
						
							2020-03-25 18:38:12 +00:00  
				
					
						
							
							
								 
						
							
							
								d0afd65652 
								
							
								 
							
						 
						
							
							
								
								fix view community link icon contrast  
							
							... 
							
							
							
							Signed-off-by: thobyv-kismat <vivee18@gmail.com> 
							
						 
						
							2020-03-21 10:12:55 +01:00