71286b5610 
								
							
								 
							
						 
						
							
							
								
								restore reply_to_event action  
							
							
							
						 
						
							2019-08-22 13:33:20 +01:00  
				
					
						
							
							
								 
						
							
							
								d4ca087abe 
								
							
								 
							
						 
						
							
							
								
								fix styling issues  
							
							... 
							
							
							
							- grow/shrink between min and max height correctly
 - don't grow wider than available space
 - some space between editor and buttons 
							
						 
						
							2019-08-22 13:33:20 +01:00  
				
					
						
							
							
								 
						
							
							
								33c6945fc4 
								
							
								 
							
						 
						
							
							
								
								align autocomplete at top of composer  
							
							
							
						 
						
							2019-08-22 13:33:20 +01:00  
				
					
						
							
							
								 
						
							
							
								64e83a8111 
								
							
								 
							
						 
						
							
							
								
								font-size  
							
							
							
						 
						
							2019-08-22 13:33:20 +01:00  
				
					
						
							
							
								 
						
							
							
								f9992a1fc6 
								
							
								 
							
						 
						
							
							
								
								implement editor placeholder  
							
							
							
						 
						
							2019-08-22 13:33:20 +01:00  
				
					
						
							
							
								 
						
							
							
								cfbd2e9cc8 
								
							
								 
							
						 
						
							
							
								
								support basic sending with new main composer  
							
							... 
							
							
							
							this removes all formatting options, as the new editor doesn't
have any. 
							
						 
						
							2019-08-22 13:33:20 +01:00  
				
					
						
							
							
								 
						
							
							
								92d7263046 
								
							
								 
							
						 
						
							
							
								
								move editor padding to edit specific style file  
							
							... 
							
							
							
							as it will be different for the main composer 
							
						 
						
							2019-08-22 13:33:20 +01:00  
				
					
						
							
							
								 
						
							
							
								505846ce53 
								
							
								 
							
						 
						
							
							
								
								split up css, update class names  
							
							
							
						 
						
							2019-08-22 13:33:20 +01:00  
				
					
						
							
							
								 
						
							
							
								04bb2ed322 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3327  from matrix-org/travis/discover-terms  
							
							... 
							
							
							
							Handle terms agreement in Discovery section of user settings 
							
						 
						
							2019-08-21 10:14:45 -06:00  
				
					
						
							
							
								 
						
							
							
								0b2331440b 
								
							
								 
							
						 
						
							
							
								
								Newlines mean everything  
							
							
							
						 
						
							2019-08-20 13:24:51 -06:00  
				
					
						
							
							
								 
						
							
							
								f55a40001c 
								
							
								 
							
						 
						
							
							
								
								Touch up settings: alignment, spacing, error states  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/10554 
Issues fixed:
* Fields were not ~30px from the avatar (too much right margin)
* Tooltips overflowed the dialog on some resolutions
* SetIdServer didn't have an error state for making the field red
* Spacing between sections in Discovery was wrong (fixed by just removing the problematic n+2 selector - it didn't help anything) 
							
						 
						
							2019-08-20 13:20:07 -06:00  
				
					
						
							
							
								 
						
							
							
								f5da870040 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3326  from matrix-org/dbkr/device_name_public  
							
							... 
							
							
							
							Clarify that device names are publicly visible 
							
						 
						
							2019-08-20 09:29:45 +01:00  
				
					
						
							
							
								 
						
							
							
								3181829532 
								
							
								 
							
						 
						
							
							
								
								Use new InlineTermsAgreement component on IS Discovery section  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/10522  
							
						 
						
							2019-08-19 23:00:05 -06:00  
				
					
						
							
							
								 
						
							
							
								417de0cac7 
								
							
								 
							
						 
						
							
							
								
								Add an inline terms agreement component  
							
							... 
							
							
							
							Handles agreement of terms in an inline way. 
							
						 
						
							2019-08-19 22:59:33 -06:00  
				
					
						
							
							
								 
						
							
							
								f7083ac332 
								
							
								 
							
						 
						
							
							
								
								Clarify that device names are publicly visible  
							
							... 
							
							
							
							And also a bunch of other UI fixes in the devices table:
 * It's the devices table, don't need 'device' in all the headers
 * Not really necessary to label checkboxes with 'select'
 * Stop table from moving down when the delete button appears
Fixes https://github.com/vector-im/riot-web/issues/10216  
							
						 
						
							2019-08-19 18:09:37 +01:00  
				
					
						
							
							
								 
						
							
							
								8a7b43fd1a 
								
							
								 
							
						 
						
							
							
								
								Tweak Settings padding / margin slightly  
							
							... 
							
							
							
							This makes a few small tweaks to Settings padding and margin, but more is still
needed. I am told that https://github.com/vector-im/riot-web/issues/10554  will
soon take a holistic view on the problem, so this is a more conservation
temporary change. 
							
						 
						
							2019-08-19 15:45:04 +01:00  
				
					
						
							
							
								 
						
							
							
								7cc27beb44 
								
							
								 
							
						 
						
							
							
								
								Remove custom font size for IM URL  
							
							... 
							
							
							
							As best as I can tell, the designs call for the IM URL to be the same size as
other subheadings. The font size in Zeplin doesn't match what is currently used
in Settings, so this likely caused confusion. 
							
						 
						
							2019-08-19 14:34:22 +01:00  
				
					
						
							
							
								 
						
							
							
								02a4121401 
								
							
								 
							
						 
						
							
							
								
								Mixin for field width  
							
							
							
						 
						
							2019-08-14 08:55:49 -06:00  
				
					
						
							
							
								 
						
							
							
								beb6ec4327 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/integs/account_set  
							
							
							
						 
						
							2019-08-14 08:45:01 -06:00  
				
					
						
							
							
								 
						
							
							
								d4bbed31d5 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'develop' into travis/integs/account_set  
							
							
							
						 
						
							2019-08-13 09:03:50 -06:00  
				
					
						
							
							
								 
						
							
							
								050766e7bb 
								
							
								 
							
						 
						
							
							
								
								selector ordering  
							
							
							
						 
						
							2019-08-13 15:19:39 +01:00  
				
					
						
							
							
								 
						
							
							
								e07c22a78d 
								
							
								 
							
						 
						
							
							
								
								Make mixin for fields in settings that need to be the same width  
							
							... 
							
							
							
							and make that width narrower so we can fit a tooltip in the left
hand side (they were a little too wide anyway for the kind of data
being entered, even on a narrow window). 
							
						 
						
							2019-08-13 12:53:14 +01:00  
				
					
						
							
							
								 
						
							
							
								c732ae3aa9 
								
									
								
							
								 
							
						 
						
							
							
								
								Correct license header  
							
							... 
							
							
							
							Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com> 
							
						 
						
							2019-08-13 10:46:42 +01:00  
				
					
						
							
							
								 
						
							
							
								03d735f4ed 
								
							
								 
							
						 
						
							
							
								
								Support changing your integration manager in the UI  
							
							... 
							
							
							
							Part of https://github.com/vector-im/riot-web/issues/10161  
							
						 
						
							2019-08-12 15:40:50 -06:00  
				
					
						
							
							
								 
						
							
							
								438eba1c46 
								
							
								 
							
						 
						
							
							
								
								Fix alignment of add email/phone number inputs in settings  
							
							
							
						 
						
							2019-08-12 14:14:17 -06:00  
				
					
						
							
							
								 
						
							
							
								bf9caa7fd8 
								
							
								 
							
						 
						
							
							
								
								add the rest of the files  
							
							
							
						 
						
							2019-08-12 11:51:44 +01:00  
				
					
						
							
							
								 
						
							
							
								c76514fceb 
								
							
								 
							
						 
						
							
							
								
								Add UI in settings to change ID Server  
							
							... 
							
							
							
							Just changes the current ID server being used
To come in subsequent PRs:
 * Store this in account data
 * Check for terms or support the proper UI for accepting terms when setting
 * Support disconnecting
Part 1 of https://github.com/vector-im/riot-web/issues/10094 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1013  
							
						 
						
							2019-08-09 18:07:58 +01:00  
				
					
						
							
							
								 
						
							
							
								c2f81a00c4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3288  from matrix-org/jryans/user-settings-toggle-3pid  
							
							... 
							
							
							
							Add controls for toggling discovery in user settings 
							
						 
						
							2019-08-08 17:48:17 +01:00  
				
					
						
							
							
								 
						
							
							
								178d6605c4 
								
							
								 
							
						 
						
							
							
								
								Add controls for toggling discovery in user settings  
							
							... 
							
							
							
							This adds controls for each 3PID to allow the user to choose whether it's bound
on the IS.
Fixes https://github.com/vector-im/riot-web/issues/10159  
							
						 
						
							2019-08-08 11:35:35 +01:00  
				
					
						
							
							
								 
						
							
							
								610baff09a 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #2668  from azuenko/develop  
							
							... 
							
							
							
							Fix waste of space of collapsed left panel 
							
						 
						
							2019-08-06 13:54:04 -06:00  
				
					
						
							
							
								 
						
							
							
								f6dbeef204 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3257  from matrix-org/t3chguy/slashcommands_help  
							
							... 
							
							
							
							Add help slash command 
							
						 
						
							2019-08-06 18:50:49 +01:00  
				
					
						
							
							
								 
						
							
							
								1e8b304b3c 
								
							
								 
							
						 
						
							
							
								
								Remove /tint completely and dedup copyright  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-06 18:08:17 +01:00  
				
					
						
							
							
								 
						
							
							
								ae834f8d05 
								
							
								 
							
						 
						
							
							
								
								Split out SlashCommandHelpDialog, group by category and style it  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-08-06 18:03:38 +01:00  
				
					
						
							
							
								 
						
							
							
								aa0a2a579e 
								
							
								 
							
						 
						
							
							
								
								Add copyright headers  
							
							
							
						 
						
							2019-08-06 12:43:30 +01:00  
				
					
						
							
							
								 
						
							
							
								a3eb45e0b9 
								
							
								 
							
						 
						
							
							
								
								Fix waste of space of collapsed left panel  
							
							... 
							
							
							
							Signed-off-by: Anton Zuenko <anton@zuenko.ru> 
							
						 
						
							2019-08-05 18:03:20 +02:00  
				
					
						
							
							
								 
						
							
							
								11f2b4320d 
								
							
								 
							
						 
						
							
							
								
								Update existing 3PID management UX  
							
							... 
							
							
							
							This tweaks the appearance of the existing 3PID management UX to use a different
style for the remove button. This styling will more closely match the soon to be
added 3PID discovery settings.
Part of https://github.com/vector-im/riot-web/issues/10159  
							
						 
						
							2019-08-05 16:34:04 +01:00  
				
					
						
							
							
								 
						
							
							
								701103aad7 
								
							
								 
							
						 
						
							
							
								
								Fix dialog button border colours  
							
							... 
							
							
							
							This corrects dialog button borders to match other buttons by removing the green
border from disabled and danger states.
Fixes https://github.com/vector-im/riot-web/issues/10310  
							
						 
						
							2019-08-01 12:47:23 +01:00  
				
					
						
							
							
								 
						
							
							
								c093b6ed9c 
								
							
								 
							
						 
						
							
							
								
								strikethrough & underline deletions & insertions  
							
							
							
						 
						
							2019-07-31 14:44:48 +02:00  
				
					
						
							
							
								 
						
							
							
								7296fb8fd3 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3243  from matrix-org/jryans/app-perm-url  
							
							... 
							
							
							
							Keep widget URL in permission screen to one line 
							
						 
						
							2019-07-25 11:38:24 +01:00  
				
					
						
							
							
								 
						
							
							
								a5ac50f90f 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3242  from matrix-org/jryans/terms-modal  
							
							... 
							
							
							
							Avoid visual glitch when terms appear for Integration Manager 
							
						 
						
							2019-07-24 14:27:43 +01:00  
				
					
						
							
							
								 
						
							
							
								ac31b4b8f4 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3244  from matrix-org/bwindels/diffhtmledits  
							
							... 
							
							
							
							Show diff for formatted messages in the edit history 
							
						 
						
							2019-07-24 09:59:23 +00:00  
				
					
						
							
							
								 
						
							
							
								3753e5261d 
								
							
								 
							
						 
						
							
							
								
								Implement diffing html messages in the edit history  
							
							
							
						 
						
							2019-07-24 11:28:56 +02:00  
				
					
						
							
							
								 
						
							
							
								2d4264c39d 
								
							
								 
							
						 
						
							
							
								
								Keep widget URL in permission screen to one line  
							
							... 
							
							
							
							This keeps the widget URL to one line max, so that the allow button will always
be visible. The full URL can be viewed by hovering.
Fixes https://github.com/vector-im/riot-web/issues/10402  
							
						 
						
							2019-07-23 18:06:37 +01:00  
				
					
						
							
							
								 
						
							
							
								39d5aa7cf4 
								
							
								 
							
						 
						
							
							
								
								Avoid visual glitch when terms appear for IM  
							
							... 
							
							
							
							This avoids a visual glitch where the Integration Manager portal would briefly
appear, but then be replaced by a smaller Terms dialog when there's something to
agree to.
To resolve this minimal code churn, this cheats a bit and customises the size of
the terms dialog to match the IM portal modal when terms are shown for IM
purposes.
Fixes https://github.com/vector-im/riot-web/issues/10386  
							
						 
						
							2019-07-23 15:11:38 +01:00  
				
					
						
							
							
								 
						
							
							
								2eb8a8879b 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3199  from matrix-org/dbkr/terms  
							
							... 
							
							
							
							ToS for ISes/IMs: prompt on use screen 
							
						 
						
							2019-07-23 10:32:11 +01:00  
				
					
						
							
							
								 
						
							
							
								f305d8ac08 
								
							
								 
							
						 
						
							
							
								
								Basic diff visualisation for plain text edits  
							
							
							
						 
						
							2019-07-19 16:09:23 +02:00  
				
					
						
							
							
								 
						
							
							
								fc8cdc5661 
								
							
								 
							
						 
						
							
							
								
								Improve interactive tooltip safe mousing area  
							
							... 
							
							
							
							This adds a more complex trapezoidal safe area between the button that triggers
the tooltip and the tooltip itself. It should be easier to move from the button
into the tooltip without accidentally closing it.
Fixes https://github.com/vector-im/riot-web/issues/10185  
							
						 
						
							2019-07-17 14:11:27 +01:00  
				
					
						
							
							
								 
						
							
							
								58a75949c3 
								
							
								 
							
						 
						
							
							
								
								Add a previous event safe area around action bar  
							
							... 
							
							
							
							This adds a previous event safe area so that you can't accidentally hover the
previous event while trying to mouse into the action bar or from the react
button to its tooltip.
Part of https://github.com/vector-im/riot-web/issues/10185 
Fixes https://github.com/vector-im/riot-web/issues/9650  
							
						 
						
							2019-07-17 10:10:08 +01:00  
				
					
						
							
							
								 
						
							
							
								5ab958cc9f 
								
							
								 
							
						 
						
							
							
								
								Fix field styling regression  
							
							... 
							
							
							
							The extra comma in the selectors caused this rule set to be ignored.
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3200 
Fixes https://github.com/vector-im/riot-web/issues/10311  
							
						 
						
							2019-07-11 13:14:20 +01:00  
				
					
						
							
							
								 
						
							
							
								9b3848d083 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3200  from matrix-org/jryans/stylelint-all-files  
							
							... 
							
							
							
							Run stylelint on all SCSS files 
							
						 
						
							2019-07-11 09:38:18 +01:00