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  
				
					
						
							
							
								 
						
							
							
								ca1e5bb3ae 
								
							
								 
							
						 
						
							
							
								
								Comment disabled rules  
							
							
							
						 
						
							2019-07-11 09:30:01 +01:00  
				
					
						
							
							
								 
						
							
							
								38d6953bf6 
								
							
								 
							
						 
						
							
							
								
								Manually fix remaining stylelint issues  
							
							
							
						 
						
							2019-07-10 16:56:40 +01:00  
				
					
						
							
							
								 
						
							
							
								dd2079bffc 
								
							
								 
							
						 
						
							
							
								
								Auto-fix stylelint issues  
							
							... 
							
							
							
							These `stylelint` issues were autofixed by the tool itself and look sane to me. 
							
						 
						
							2019-07-10 16:56:40 +01:00  
				
					
						
							
							
								 
						
							
							
								54aaabac74 
								
							
								 
							
						 
						
							
							
								
								Initial support for ToS dialogs for IS/IM  
							
							... 
							
							
							
							as per MSC2140 
							
						 
						
							2019-07-09 18:51:56 +01:00  
				
					
						
							
							
								 
						
							
							
								7b869f2824 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3182  from matrix-org/travis/soft-logout-rehydrate  
							
							... 
							
							
							
							Ask for the user's password to rehydrate their soft logged out session 
							
						 
						
							2019-07-09 11:31:51 -06:00  
				
					
						
							
							
								 
						
							
							
								7a482461dd 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3180  from matrix-org/bwindels/history-actions  
							
							... 
							
							
							
							Edit history actions 
							
						 
						
							2019-07-08 08:19:27 +00:00  
				
					
						
							
							
								 
						
							
							
								eb0e1eade4 
								
							
								 
							
						 
						
							
							
								
								Clamp reaction content width to at most 100px  
							
							... 
							
							
							
							Part of https://github.com/vector-im/riot-web/issues/10256  
							
						 
						
							2019-07-05 16:18:16 +01:00  
				
					
						
							
							
								 
						
							
							
								93872e6fa5 
								
							
								 
							
						 
						
							
							
								
								Ask for the user's password to rehydrate their soft logged out session  
							
							... 
							
							
							
							Fixes https://github.com/vector-im/riot-web/issues/10236 
The changes to the MatrixClientPeg (assign/start) are to permit the SoftLogout page to access the MatrixClientPeg reliably. This is why assign() is called by Lifecycle as an alternative to start().
Minimal design work has been done here. The majority is deferred to https://github.com/vector-im/riot-web/issues/10262  
							
						 
						
							2019-07-04 16:51:16 -06:00  
				
					
						
							
							
								 
						
							
							
								375976575b 
								
							
								 
							
						 
						
							
							
								
								add redact button  
							
							
							
						 
						
							2019-07-04 11:07:22 +02:00  
				
					
						
							
							
								 
						
							
							
								344cc079c5 
								
							
								 
							
						 
						
							
							
								
								show /relations error in edit history dialog  
							
							
							
						 
						
							2019-07-03 12:16:58 +02:00  
				
					
						
							
							
								 
						
							
							
								353f5a205c 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3170  from matrix-org/bwindels/handle-associated-failures  
							
							... 
							
							
							
							Handle associated event send failures 
							
						 
						
							2019-07-03 09:02:58 +00:00  
				
					
						
							
							
								 
						
							
							
								cf8eeedcc7 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3169  from matrix-org/jryans/reactions-tooltip-tweaks  
							
							... 
							
							
							
							Improve interactive tooltip hover behaviour 
							
						 
						
							2019-07-02 18:28:09 +01:00  
				
					
						
							
							
								 
						
							
							
								fc3c4fccc2 
								
							
								 
							
						 
						
							
							
								
								set background on highlighted messages  
							
							
							
						 
						
							2019-07-02 18:31:11 +02:00  
				
					
						
							
							
								 
						
							
							
								7fc1288614 
								
							
								 
							
						 
						
							
							
								
								Fix login type selector border  
							
							... 
							
							
							
							This fixes a regression in the login type selector's border and placement.
Fixes https://github.com/vector-im/riot-web/issues/10223  
							
						 
						
							2019-07-02 15:09:51 +01:00  
				
					
						
							
							
								 
						
							
							
								dd94bf799d 
								
							
								 
							
						 
						
							
							
								
								Improve interactive tooltip hover behaviour  
							
							... 
							
							
							
							This gives the interactive tooltip a more natural hover behaviour by removing
the full screen div behind it. This allows the target button to keep its hover
state, for example.
This also removes the click to close behaviour, which was too easy to trigger
accidentally.
Fixes https://github.com/vector-im/riot-web/issues/10179 
Fixes https://github.com/vector-im/riot-web/issues/10222 
Fixes https://github.com/vector-im/riot-web/issues/10225  
							
						 
						
							2019-07-01 18:00:59 +01:00  
				
					
						
							
							
								 
						
							
							
								1af8da4a4a 
								
							
								 
							
						 
						
							
							
								
								change lozenge color of unsent redacted events to red  
							
							... 
							
							
							
							use css vars so we don't have to repeat the whole lozenge style 
							
						 
						
							2019-07-01 11:06:55 +02:00  
				
					
						
							
							
								 
						
							
							
								49b89217a3 
								
							
								 
							
						 
						
							
							
								
								MemberInfo wrap Device Name/ID  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-06-30 19:21:19 +01:00  
				
					
						
							
							
								 
						
							
							
								33425240f6 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3152  from matrix-org/jryans/reactions-show-all  
							
							... 
							
							
							
							Limit reactions row on initial display 
							
						 
						
							2019-06-28 15:12:48 +01:00  
				
					
						
							
							
								 
						
							
							
								9be40a27fc 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3154  from matrix-org/travis/syntax-error  
							
							... 
							
							
							
							Flexboxify generic error page 
							
						 
						
							2019-06-27 14:09:57 -06:00  
				
					
						
							
							
								 
						
							
							
								7e8eda33fc 
								
							
								 
							
						 
						
							
							
								
								Flexboxify generic error page  
							
							
							
						 
						
							2019-06-27 12:10:58 -06:00  
				
					
						
							
							
								 
						
							
							
								804a0c8507 
								
							
								 
							
						 
						
							
							
								
								Fix weird scrollbar when devtools is in a narrow browser  
							
							... 
							
							
							
							Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> 
							
						 
						
							2019-06-27 18:56:22 +01:00  
				
					
						
							
							
								 
						
							
							
								7f2ab39609 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3142  from matrix-org/travis/preview-loading  
							
							... 
							
							
							
							Show a loading state for slow peeks 
							
						 
						
							2019-06-27 09:24:25 -06:00  
				
					
						
							
							
								 
						
							
							
								59b4a3398d 
								
							
								 
							
						 
						
							
							
								
								Limit reactions row on initial display  
							
							... 
							
							
							
							This limits the reactions row below messages to initially show at most 8 keys.
For those messages with more than that, a "Show all" option appears to reveal
all the keys.
Fixes https://github.com/vector-im/riot-web/issues/9570  
							
						 
						
							2019-06-27 13:17:23 +01:00  
				
					
						
							
							
								 
						
							
							
								e287362a8b 
								
							
								 
							
						 
						
							
							
								
								Reaction buttons should use pointer cursor  
							
							
							
						 
						
							2019-06-27 11:19:36 +01:00  
				
					
						
							
							
								 
						
							
							
								15d286ed93 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3144  from matrix-org/bwindels/edit-history  
							
							... 
							
							
							
							Edit history dialog 
							
						 
						
							2019-06-26 14:38:53 +00:00  
				
					
						
							
							
								 
						
							
							
								31b2592995 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3143  from MazeChaZer/fix-community-scrollbar  
							
							... 
							
							
							
							Fix the scrollbar in the community bar 
							
						 
						
							2019-06-26 14:34:15 +01:00  
				
					
						
							
							
								 
						
							
							
								92c2a119c9 
								
							
								 
							
						 
						
							
							
								
								Remove top margin of community panel container  
							
							... 
							
							
							
							This is a simpler fix for the scrollbar problem than changing the definition
for height, which was my previous attempt at solving this problem.
Additionally, the top and bottom margins are now consistent.
Signed-off-by: Jonas Schürmann <jonasschuermann@aol.de> 
							
						 
						
							2019-06-26 15:27:52 +02:00  
				
					
						
							
							
								 
						
							
							
								8359094847 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3145  from matrix-org/bwindels/edit-focus-border  
							
							... 
							
							
							
							Add focus border to edit composer 
							
						 
						
							2019-06-26 13:16:59 +00:00  
				
					
						
							
							
								 
						
							
							
								8d85967824 
								
									
								
							
								 
							
						 
						
							
							
								
								Merge pull request  #3139  from matrix-org/travis/upgrades-final  
							
							... 
							
							
							
							Fix room upgrade warning being chopped off and a spelling mistake 
							
						 
						
							2019-06-26 07:12:39 -06:00  
				
					
						
							
							
								 
						
							
							
								2e3a6b3c0b 
								
							
								 
							
						 
						
							
							
								
								set 50% transparent accent color as editor focus border  
							
							
							
						 
						
							2019-06-26 14:40:33 +02:00  
				
					
						
							
							
								 
						
							
							
								d20b765e27 
								
							
								 
							
						 
						
							
							
								
								rename $accent-color-50pct to $accent-color-darker  
							
							... 
							
							
							
							we'll use $accent-color-50pct for 50% transparent accent color 
							
						 
						
							2019-06-26 14:34:26 +02:00  
				
					
						
							
							
								 
						
							
							
								498db2597d 
								
							
								 
							
						 
						
							
							
								
								show hand on hovering (edited) marker  
							
							
							
						 
						
							2019-06-26 12:15:13 +02:00  
				
					
						
							
							
								 
						
							
							
								ddae4de7bd 
								
							
								 
							
						 
						
							
							
								
								cleanup: RoomDirectory doesn't use gemini anymore  
							
							
							
						 
						
							2019-06-26 11:59:56 +02:00  
				
					
						
							
							
								 
						
							
							
								fffdfde8ba 
								
							
								 
							
						 
						
							
							
								
								center dialog title  
							
							
							
						 
						
							2019-06-26 11:59:56 +02:00  
				
					
						
							
							
								 
						
							
							
								ee03a0f31d 
								
							
								 
							
						 
						
							
							
								
								recycle EventTile css to make history items look mostly similar  
							
							
							
						 
						
							2019-06-26 11:59:56 +02:00  
				
					
						
							
							
								 
						
							
							
								8c9a6ddf96 
								
							
								 
							
						 
						
							
							
								
								support edits pagination in a ScrollPanel  
							
							
							
						 
						
							2019-06-26 11:59:56 +02:00  
				
					
						
							
							
								 
						
							
							
								beb003b2d6 
								
							
								 
							
						 
						
							
							
								
								some preliminary styling  
							
							
							
						 
						
							2019-06-26 11:59:56 +02:00  
				
					
						
							
							
								 
						
							
							
								c9aa7efe54 
								
							
								 
							
						 
						
							
							
								
								don't require EventTile for default timestamp style  
							
							
							
						 
						
							2019-06-26 11:59:56 +02:00