8a880a3d46 
					 
					
						
						
							
							Make blocks create entries and unfollows instantly, but do the clean up  
						
						 
						
						... 
						
						
						
						in the background instead. Should fix delay where blocked person
can interact with blocker for a short time before background job
gets processed 
						
						
					 
					
						2017-01-24 21:40:41 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						326c75b35b 
					 
					
						
						
							
							Merge pull request  #521  from mistydemeo/fix_invisible_css  
						
						 
						
						... 
						
						
						
						Fix `invisible` CSS class 
						
						
					 
					
						2017-01-24 21:26:18 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						adda642c63 
					 
					
						
						
							
							Fix invisible CSS class  
						
						 
						
						
						
						
					 
					
						2017-01-24 11:49:31 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e47b8e778b 
					 
					
						
						
							
							Fix links in toots opening the toot at first  
						
						 
						
						
						
						
					 
					
						2017-01-24 18:51:09 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						80cefd5b3c 
					 
					
						
						
							
							Fix   #204 ,  fix   #515  - URL truncating is now a style so copypasting is not  
						
						 
						
						... 
						
						
						
						affected, replaced onClick handler with onMouseUp/Down to detect text
selection not trigger onClick handler then 
						
						
					 
					
						2017-01-24 17:05:44 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b06a375ee4 
					 
					
						
						
							
							Merge branch 'blackle-boostspin'  
						
						 
						
						
						
						
					 
					
						2017-01-24 14:28:54 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						4f3264d291 
					 
					
						
						
							
							Merge branch 'master' into boostspin  
						
						 
						
						
						
						
					 
					
						2017-01-24 14:27:13 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						4a146a0d18 
					 
					
						
						
							
							Make boost animation an SVG that uses SCSS colours  
						
						 
						
						
						
						
					 
					
						2017-01-24 07:48:13 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						21c209636d 
					 
					
						
						
							
							Set isLoading false on timelines when request fails  
						
						 
						
						
						
						
					 
					
						2017-01-24 13:04:12 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1f5792c834 
					 
					
						
						
							
							API now respects ?limit param as long as it's within 2x default limit  
						
						 
						
						
						
						
					 
					
						2017-01-24 04:22:10 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d9022884c6 
					 
					
						
						
							
							Smarter infinite scroll  
						
						 
						
						
						
						
					 
					
						2017-01-24 04:12:10 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						bf0f6eb62d 
					 
					
						
						
							
							Implement a click-to-view spoiler system  
						
						 
						
						
						
						
					 
					
						2017-01-23 21:07:40 -05:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1761d3f9c3 
					 
					
						
						
							
							Fix mistake  
						
						 
						
						
						
						
					 
					
						2017-01-23 22:18:08 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d00189b55a 
					 
					
						
						
							
							Domains with reject_media? set to true won't download avatars either  
						
						 
						
						
						
						
					 
					
						2017-01-23 21:55:29 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8aab692034 
					 
					
						
						
							
							Less re-rendering  
						
						 
						
						
						
						
					 
					
						2017-01-23 21:40:48 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						434cf8237e 
					 
					
						
						
							
							Optional domain block attribute that prevents media attachments from being downloaded  
						
						 
						
						
						
						
					 
					
						2017-01-23 21:36:08 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						cca82bf0a2 
					 
					
						
						
							
							Move merging/unmerging of timelines into background. Move blocking into  
						
						 
						
						... 
						
						
						
						background as well since it's a computationally expensive 
						
						
					 
					
						2017-01-23 21:29:34 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f392030ab8 
					 
					
						
						
							
							Add /api/v1/notifications/clear, non-existing link cards for statuses will  
						
						 
						
						... 
						
						
						
						now return empty hash instead of throwing a 404 error. When following,
merge into timeline will filter statuses 
						
						
					 
					
						2017-01-23 21:09:27 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f2e08ff568 
					 
					
						
						
							
							Remove unneeded block check  
						
						 
						
						
						
						
					 
					
						2017-01-23 17:40:23 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6d98a73180 
					 
					
						
						
							
							Domain blocks now have varying severity - auto-suspend vs auto-silence  
						
						 
						
						
						
						
					 
					
						2017-01-23 17:38:38 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ef2b924679 
					 
					
						
						
							
							Forgot to commit  
						
						 
						
						
						
						
					 
					
						2017-01-23 17:18:41 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f855d645b2 
					 
					
						
						
							
							Move all hex colors in SASS to variables and all variations to darken/lighten  
						
						 
						
						
						
						
					 
					
						2017-01-23 16:01:46 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d4d56b8af0 
					 
					
						
						
							
							Fix   #365 , 1/2 of  #408  - replace rails_autolink with URI.regexp, run link_hashtags on simplified_format  
						
						 
						
						
						
						
					 
					
						2017-01-23 14:45:09 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						aa9c51a34c 
					 
					
						
						
							
							Fix a couple unhandled exceptions  
						
						 
						
						
						
						
					 
					
						2017-01-23 13:56:57 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						a1894786cf 
					 
					
						
						
							
							Potentially fix notifications issue  
						
						 
						
						
						
						
					 
					
						2017-01-23 13:43:14 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7c015ece45 
					 
					
						
						
							
							Fix oembed controller test  
						
						 
						
						
						
						
					 
					
						2017-01-23 13:36:17 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6062680dd4 
					 
					
						
						
							
							Merge pull request  #513  from mistydemeo/fix_textarea_selection_clicking  
						
						 
						
						... 
						
						
						
						Textarea: fix clicking on name suggestions 
						
						
					 
					
						2017-01-23 11:34:36 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						33fd8a7d95 
					 
					
						
						
							
							Textarea: fix clicking on name suggestions  
						
						 
						
						... 
						
						
						
						This was broken in c3e9ba6a , which added an onBlur to hide the
suggestions when the textarea loses focus. Unfortunately, this fired
even when the textarea lost focus to its own suggestions box, and that
meant that onSuggestionClick is never called.
Setting a short window in which onSuggestionClick can still happen
before hiding the suggestion area ensures that clicking still works,
while still hiding the suggestions if the user clicks on something else. 
						
						
					 
					
						2017-01-22 22:57:58 -08:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1953e3b6ed 
					 
					
						
						
							
							Fix inflection  
						
						 
						
						
						
						
					 
					
						2017-01-22 23:08:51 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						956da43e19 
					 
					
						
						
							
							Fix error  
						
						 
						
						
						
						
					 
					
						2017-01-22 23:07:31 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						cea9fb31fe 
					 
					
						
						
							
							Mitigate inconsistent notifications  
						
						 
						
						
						
						
					 
					
						2017-01-22 21:50:17 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						61aee0006e 
					 
					
						
						
							
							Override Rack::Request to use the same trusted proxy settings as Rails  
						
						 
						
						
						
						
					 
					
						2017-01-22 21:01:28 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						67befe5463 
					 
					
						
						
							
							Allow to specify trusted proxies through env  
						
						 
						
						
						
						
					 
					
						2017-01-22 20:35:49 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c66718afff 
					 
					
						
						
							
							Merge pull request  #509  from ineffyble/docs/developer-docs-additions  
						
						 
						
						... 
						
						
						
						Update README.md to match new documentation (missed from previous commit) 
						
						
					 
					
						2017-01-22 17:07:39 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f3cac0b93b 
					 
					
						
						
							
							Update README.md to match new documentation (missed from previous commit)  
						
						 
						
						
						
						
					 
					
						2017-01-23 00:11:09 +11:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						10fe63d4db 
					 
					
						
						
							
							Merge pull request  #508  from ineffyble/docs/developer-docs-additions  
						
						 
						
						... 
						
						
						
						Documentation tweaks 
						
						
					 
					
						2017-01-22 11:43:07 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						92a98f73aa 
					 
					
						
						
							
							Add separate sections for Heroku and Vagrant deployments. Add guide for instance administration. Move 'Contribution guide' to 'Development guide'.  
						
						 
						
						
						
						
					 
					
						2017-01-22 19:50:40 +11:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						536cde4e99 
					 
					
						
						
							
							Rename main docs page so it renders in github  
						
						 
						
						
						
						
					 
					
						2017-01-21 22:54:49 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2baf0fabb4 
					 
					
						
						
							
							Improve API docs formatting  
						
						 
						
						
						
						
					 
					
						2017-01-21 22:53:02 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e92a1cf436 
					 
					
						
						
							
							Add wiki contents to docs/ instead  
						
						 
						
						
						
						
					 
					
						2017-01-21 22:51:02 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						500278eb4c 
					 
					
						
						
							
							Merge branch 'ineffyble-fix/error-pages'  
						
						 
						
						
						
						
					 
					
						2017-01-21 22:31:19 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e22a56183a 
					 
					
						
						
							
							Improve error page layouting. 500 page has to stay static because it's  
						
						 
						
						... 
						
						
						
						used from nginx when Rails fails. 
						
						
					 
					
						2017-01-21 22:30:47 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b4a4eb73ae 
					 
					
						
						
							
							Merge branch 'fix/error-pages' of  https://github.com/ineffyble/mastodon  into ineffyble-fix/error-pages  
						
						 
						
						
						
						
					 
					
						2017-01-21 22:20:01 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f036c6440b 
					 
					
						
						
							
							Merge branch 'ineffyble-master'  
						
						 
						
						
						
						
					 
					
						2017-01-21 22:19:27 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e028406db4 
					 
					
						
						
							
							Fix code style  
						
						 
						
						
						
						
					 
					
						2017-01-21 22:19:13 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d72dd38c13 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/ineffyble/mastodon  into ineffyble-master  
						
						 
						
						
						
						
					 
					
						2017-01-21 22:15:22 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						3a4b5961be 
					 
					
						
						
							
							Method to fetch a single notification  
						
						 
						
						
						
						
					 
					
						2017-01-21 22:14:13 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						deedf133d3 
					 
					
						
						
							
							Merge pull request  #506  from ineffyble/fix/issue-492-add-missing-header-image  
						
						 
						
						... 
						
						
						
						Add a default missing.png header image - fixes  #492  
						
						
					 
					
						2017-01-21 20:56:11 +01:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						77746240aa 
					 
					
						
						
							
							Change missing.png header to 1x1 transparent PNG  
						
						 
						
						
						
						
					 
					
						2017-01-22 06:42:42 +11:00  
					
					
						 
						
						
							
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						106dd1a484 
					 
					
						
						
							
							Add a default missing.png header image -  fixes   #492  
						
						 
						
						
						
						
					 
					
						2017-01-22 05:19:31 +11:00