blackle 
							
						 
					 
					
						
						
						
						
							
						
						
							bf0f6eb62d 
							
						 
					 
					
						
						
							
							Implement a click-to-view spoiler system  
						
						
						
						
					 
					
						2017-01-23 21:07:40 -05:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							1761d3f9c3 
							
						 
					 
					
						
						
							
							Fix mistake  
						
						
						
						
					 
					
						2017-01-23 22:18:08 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							d00189b55a 
							
						 
					 
					
						
						
							
							Domains with reject_media? set to true won't download avatars either  
						
						
						
						
					 
					
						2017-01-23 21:55:29 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							8aab692034 
							
						 
					 
					
						
						
							
							Less re-rendering  
						
						
						
						
					 
					
						2017-01-23 21:40:48 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							434cf8237e 
							
						 
					 
					
						
						
							
							Optional domain block attribute that prevents media attachments from being downloaded  
						
						
						
						
					 
					
						2017-01-23 21:36:08 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							f2e08ff568 
							
						 
					 
					
						
						
							
							Remove unneeded block check  
						
						
						
						
					 
					
						2017-01-23 17:40:23 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							6d98a73180 
							
						 
					 
					
						
						
							
							Domain blocks now have varying severity - auto-suspend vs auto-silence  
						
						
						
						
					 
					
						2017-01-23 17:38:38 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							ef2b924679 
							
						 
					 
					
						
						
							
							Forgot to commit  
						
						
						
						
					 
					
						2017-01-23 17:18:41 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							f855d645b2 
							
						 
					 
					
						
						
							
							Move all hex colors in SASS to variables and all variations to darken/lighten  
						
						
						
						
					 
					
						2017-01-23 16:01:46 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							aa9c51a34c 
							
						 
					 
					
						
						
							
							Fix a couple unhandled exceptions  
						
						
						
						
					 
					
						2017-01-23 13:56:57 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							a1894786cf 
							
						 
					 
					
						
						
							
							Potentially fix notifications issue  
						
						
						
						
					 
					
						2017-01-23 13:43:14 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							7c015ece45 
							
						 
					 
					
						
						
							
							Fix oembed controller test  
						
						
						
						
					 
					
						2017-01-23 13:36:17 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Misty De Meo 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							1953e3b6ed 
							
						 
					 
					
						
						
							
							Fix inflection  
						
						
						
						
					 
					
						2017-01-22 23:08:51 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							956da43e19 
							
						 
					 
					
						
						
							
							Fix error  
						
						
						
						
					 
					
						2017-01-22 23:07:31 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							cea9fb31fe 
							
						 
					 
					
						
						
							
							Mitigate inconsistent notifications  
						
						
						
						
					 
					
						2017-01-22 21:50:17 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							61aee0006e 
							
						 
					 
					
						
						
							
							Override Rack::Request to use the same trusted proxy settings as Rails  
						
						
						
						
					 
					
						2017-01-22 21:01:28 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							67befe5463 
							
						 
					 
					
						
						
							
							Allow to specify trusted proxies through env  
						
						
						
						
					 
					
						2017-01-22 20:35:49 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Effy Elden 
							
						 
					 
					
						
						
						
						
							
						
						
							f3cac0b93b 
							
						 
					 
					
						
						
							
							Update README.md to match new documentation (missed from previous commit)  
						
						
						
						
					 
					
						2017-01-23 00:11:09 +11:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							10fe63d4db 
							
						 
					 
					
						
						
							
							Merge pull request  #508  from ineffyble/docs/developer-docs-additions  
						
						... 
						
						
						
						Documentation tweaks 
						
						
					 
					
						2017-01-22 11:43:07 +01:00 
						 
				 
			
				
					
						
							
							
								Effy Elden 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							536cde4e99 
							
						 
					 
					
						
						
							
							Rename main docs page so it renders in github  
						
						
						
						
					 
					
						2017-01-21 22:54:49 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							2baf0fabb4 
							
						 
					 
					
						
						
							
							Improve API docs formatting  
						
						
						
						
					 
					
						2017-01-21 22:53:02 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							e92a1cf436 
							
						 
					 
					
						
						
							
							Add wiki contents to docs/ instead  
						
						
						
						
					 
					
						2017-01-21 22:51:02 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							500278eb4c 
							
						 
					 
					
						
						
							
							Merge branch 'ineffyble-fix/error-pages'  
						
						
						
						
					 
					
						2017-01-21 22:31:19 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							f036c6440b 
							
						 
					 
					
						
						
							
							Merge branch 'ineffyble-master'  
						
						
						
						
					 
					
						2017-01-21 22:19:27 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							e028406db4 
							
						 
					 
					
						
						
							
							Fix code style  
						
						
						
						
					 
					
						2017-01-21 22:19:13 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							d72dd38c13 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/ineffyble/mastodon  into ineffyble-master  
						
						
						
						
					 
					
						2017-01-21 22:15:22 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							3a4b5961be 
							
						 
					 
					
						
						
							
							Method to fetch a single notification  
						
						
						
						
					 
					
						2017-01-21 22:14:13 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Effy Elden 
							
						 
					 
					
						
						
						
						
							
						
						
							77746240aa 
							
						 
					 
					
						
						
							
							Change missing.png header to 1x1 transparent PNG  
						
						
						
						
					 
					
						2017-01-22 06:42:42 +11:00 
						 
				 
			
				
					
						
							
							
								Effy Elden 
							
						 
					 
					
						
						
						
						
							
						
						
							106dd1a484 
							
						 
					 
					
						
						
							
							Add a default missing.png header image -  fixes   #492  
						
						
						
						
					 
					
						2017-01-22 05:19:31 +11:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							6b666db112 
							
						 
					 
					
						
						
							
							Merge pull request  #505  from ineffyble/fix/issue-503  
						
						... 
						
						
						
						Call uniq on the string version of mb_chars tags - fixes  #503  
						
						
					 
					
						2017-01-21 12:37:51 +01:00 
						 
				 
			
				
					
						
							
							
								Effy Elden 
							
						 
					 
					
						
						
						
						
							
						
						
							8f21f5522f 
							
						 
					 
					
						
						
							
							Call uniq on the string version of mb_chars tags  
						
						
						
						
					 
					
						2017-01-21 21:02:42 +11:00 
						 
				 
			
				
					
						
							
							
								Effy Elden 
							
						 
					 
					
						
						
						
						
							
						
						
							5fef55c11a 
							
						 
					 
					
						
						
							
							Set remote dev environments to use letter_opener_web, add default .env.vagrant variables  
						
						
						
						
					 
					
						2017-01-21 20:22:49 +11:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							1aae0cfc2c 
							
						 
					 
					
						
						
							
							Fix   #475  - add space after autocomplete  
						
						
						
						
					 
					
						2017-01-20 21:39:41 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							9bd3b11cfb 
							
						 
					 
					
						
						
							
							Instead of refusing to create accounts, domain blocks auto-suspend new accounts from that domain  
						
						
						
						
					 
					
						2017-01-20 20:14:02 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							05abd977c1 
							
						 
					 
					
						
						
							
							Fix preview cards layout, do preview card crawling for remote statuses  
						
						
						
						
					 
					
						2017-01-20 18:31:49 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							f4e28785f1 
							
						 
					 
					
						
						
							
							Merge pull request  #502  from blackle/vistoggle  
						
						... 
						
						
						
						Show visibility toggle on videos, show regardless of sensitivity 
						
						
					 
					
						2017-01-20 13:27:20 +01:00 
						 
				 
			
				
					
						
							
							
								blackle 
							
						 
					 
					
						
						
						
						
							
						
						
							7f63edd820 
							
						 
					 
					
						
						
							
							Show visibility toggle on videos, show regardless of sensitivity  
						
						
						
						
					 
					
						2017-01-19 21:24:30 -05:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							c8e4b9c663 
							
						 
					 
					
						
						
							
							No loading bars for cards, no failure if it 404s (that's expected)  
						
						
						
						
					 
					
						2017-01-20 01:07:53 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							f0de621e76 
							
						 
					 
					
						
						
							
							Fix   #463  - Fetch and display previews of URLs using OpenGraph tags  
						
						
						
						
					 
					
						2017-01-20 01:00:14 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							8d0284f8d9 
							
						 
					 
					
						
						
							
							Hide more non-essential loading bars  
						
						
						
						
					 
					
						2017-01-19 11:23:24 +01:00