Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2173889c48 
								
							 
						 
						
							
							
								
								Merge branch 'blackle-boostspin'  
							
							
							
						 
						
							2017-01-24 14:28:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								1df5242352 
								
							 
						 
						
							
							
								
								Merge branch 'master' into boostspin  
							
							
							
						 
						
							2017-01-24 14:27:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									blackle 
								
							 
						 
						
							
							
							
							
								
							
							
								cc579e1b61 
								
							 
						 
						
							
							
								
								Make boost animation an SVG that uses SCSS colours  
							
							
							
						 
						
							2017-01-24 07:48:13 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								604c654f8d 
								
							 
						 
						
							
							
								
								Set isLoading false on timelines when request fails  
							
							
							
						 
						
							2017-01-24 13:04:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b4ec84067a 
								
							 
						 
						
							
							
								
								API now respects ?limit param as long as it's within 2x default limit  
							
							
							
						 
						
							2017-01-24 04:22:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								271569fffb 
								
							 
						 
						
							
							
								
								Smarter infinite scroll  
							
							
							
						 
						
							2017-01-24 04:12:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									blackle 
								
							 
						 
						
							
							
							
							
								
							
							
								e25fc71c2c 
								
							 
						 
						
							
							
								
								Implement a click-to-view spoiler system  
							
							
							
						 
						
							2017-01-23 21:07:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b1322bf315 
								
							 
						 
						
							
							
								
								Fix mistake  
							
							
							
						 
						
							2017-01-23 22:18:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9650e27b7b 
								
							 
						 
						
							
							
								
								Domains with reject_media? set to true won't download avatars either  
							
							
							
						 
						
							2017-01-23 21:55:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3bd02ca121 
								
							 
						 
						
							
							
								
								Less re-rendering  
							
							
							
						 
						
							2017-01-23 21:40:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3710d18889 
								
							 
						 
						
							
							
								
								Optional domain block attribute that prevents media attachments from being downloaded  
							
							
							
						 
						
							2017-01-23 21:36:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								98660a76d9 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								4d39cc7bf9 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								e55bad5740 
								
							 
						 
						
							
							
								
								Remove unneeded block check  
							
							
							
						 
						
							2017-01-23 17:40:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								77a76d5171 
								
							 
						 
						
							
							
								
								Domain blocks now have varying severity - auto-suspend vs auto-silence  
							
							
							
						 
						
							2017-01-23 17:38:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a77a081c63 
								
							 
						 
						
							
							
								
								Forgot to commit  
							
							
							
						 
						
							2017-01-23 17:18:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								68f96b1d8c 
								
							 
						 
						
							
							
								
								Move all hex colors in SASS to variables and all variations to darken/lighten  
							
							
							
						 
						
							2017-01-23 16:01:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								28e65027b2 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								55d6cd41e6 
								
							 
						 
						
							
							
								
								Fix a couple unhandled exceptions  
							
							
							
						 
						
							2017-01-23 13:56:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4cbca05197 
								
							 
						 
						
							
							
								
								Potentially fix notifications issue  
							
							
							
						 
						
							2017-01-23 13:43:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a75cada495 
								
							 
						 
						
							
							
								
								Fix oembed controller test  
							
							
							
						 
						
							2017-01-23 13:36:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								ac89d969c6 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								b7fb5b2b7e 
								
							 
						 
						
							
							
								
								Textarea: fix clicking on name suggestions  
							
							... 
							
							
							
							This was broken in 4afc1386 
							
						 
						
							2017-01-22 22:57:58 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								20cb576da1 
								
							 
						 
						
							
							
								
								Fix inflection  
							
							
							
						 
						
							2017-01-22 23:08:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								f80c55b591 
								
							 
						 
						
							
							
								
								Fix error  
							
							
							
						 
						
							2017-01-22 23:07:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								9a2a6b476b 
								
							 
						 
						
							
							
								
								Mitigate inconsistent notifications  
							
							
							
						 
						
							2017-01-22 21:50:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e161d2acdc 
								
							 
						 
						
							
							
								
								Override Rack::Request to use the same trusted proxy settings as Rails  
							
							
							
						 
						
							2017-01-22 21:01:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ef376b0bfd 
								
							 
						 
						
							
							
								
								Allow to specify trusted proxies through env  
							
							
							
						 
						
							2017-01-22 20:35:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								13db91a0c1 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								3055b5af69 
								
							 
						 
						
							
							
								
								Update README.md to match new documentation (missed from previous commit)  
							
							
							
						 
						
							2017-01-23 00:11:09 +11:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								d9b56c87a1 
								
							 
						 
						
							
							
								
								Merge pull request  #508  from ineffyble/docs/developer-docs-additions  
							
							... 
							
							
							
							Documentation tweaks 
							
						 
						
							2017-01-22 11:43:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
							
							
								
							
							
								65748b7623 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								446cce198b 
								
							 
						 
						
							
							
								
								Rename main docs page so it renders in github  
							
							
							
						 
						
							2017-01-21 22:54:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7769fb6a5a 
								
							 
						 
						
							
							
								
								Improve API docs formatting  
							
							
							
						 
						
							2017-01-21 22:53:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								954f82410c 
								
							 
						 
						
							
							
								
								Add wiki contents to docs/ instead  
							
							
							
						 
						
							2017-01-21 22:51:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e01d255039 
								
							 
						 
						
							
							
								
								Merge branch 'ineffyble-fix/error-pages'  
							
							
							
						 
						
							2017-01-21 22:31:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2c29cc400e 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								280348f1e0 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								6c54bfc9f7 
								
							 
						 
						
							
							
								
								Merge branch 'ineffyble-master'  
							
							
							
						 
						
							2017-01-21 22:19:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7344c75a27 
								
							 
						 
						
							
							
								
								Fix code style  
							
							
							
						 
						
							2017-01-21 22:19:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3916a753d2 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/ineffyble/mastodon  into ineffyble-master  
							
							
							
						 
						
							2017-01-21 22:15:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f4836b9077 
								
							 
						 
						
							
							
								
								Method to fetch a single notification  
							
							
							
						 
						
							2017-01-21 22:14:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								9ed28b1081 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								4dd4664b10 
								
							 
						 
						
							
							
								
								Change missing.png header to 1x1 transparent PNG  
							
							
							
						 
						
							2017-01-22 06:42:42 +11:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
							
							
								
							
							
								d6d5a05e02 
								
							 
						 
						
							
							
								
								Add a default missing.png header image -  fixes   #492  
							
							
							
						 
						
							2017-01-22 05:19:31 +11:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								11cbbab564 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								26cfebf434 
								
							 
						 
						
							
							
								
								Call uniq on the string version of mb_chars tags  
							
							
							
						 
						
							2017-01-21 21:02:42 +11:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
							
							
								
							
							
								432cc1d3c1 
								
							 
						 
						
							
							
								
								Set remote dev environments to use letter_opener_web, add default .env.vagrant variables  
							
							
							
						 
						
							2017-01-21 20:22:49 +11:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								bfe579499b 
								
							 
						 
						
							
							
								
								Fix   #475  - add space after autocomplete  
							
							
							
						 
						
							2017-01-20 21:39:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d8d22cfa6f 
								
							 
						 
						
							
							
								
								Instead of refusing to create accounts, domain blocks auto-suspend new accounts from that domain  
							
							
							
						 
						
							2017-01-20 20:14:02 +01:00