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
							
						 
						
							 
							
							
							
								
							
								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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
							
								
							
								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