956da43e19 
								
							 
						 
						
							
							
								
								Fix error  
							
							
							
						 
						
							2017-01-22 23:07:31 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								5fef55c11a 
								
							 
						 
						
							
							
								
								Set remote dev environments to use letter_opener_web, add default .env.vagrant variables  
							
							
							
						 
						
							2017-01-21 20:22:49 +11:00  
				
					
						
							
							
								 
						
							
								f0de621e76 
								
							 
						 
						
							
							
								
								Fix   #463  - Fetch and display previews of URLs using OpenGraph tags  
							
							
							
						 
						
							2017-01-20 01:00:14 +01:00  
				
					
						
							
							
								 
						
							
								f051c2e813 
								
							 
						 
						
							
							
								
								Fix statsd null backend not being initialized properly  
							
							
							
						 
						
							2017-01-19 09:37:07 +01:00  
				
					
						
							
							
								 
						
							
								306eb6e9c9 
								
							 
						 
						
							
							
								
								Add optional StatsD performance tracking  
							
							
							
						 
						
							2017-01-18 23:44:29 +01:00  
				
					
						
							
							
								 
						
							
								fcb5a85cdd 
								
							 
						 
						
							
							
								
								Add sounds for notifications. Boop by @jk@mastodon.social  
							
							
							
						 
						
							2017-01-17 20:09:03 +01:00  
				
					
						
							
							
								 
						
							
								ab4f5f5da5 
								
							 
						 
						
							
							
								
								Add Heroku deployment support  
							
							
							
						 
						
							2017-01-17 22:00:03 +11:00  
				
					
						
							
							
								 
						
							
								16f9490d33 
								
							 
						 
						
							
							
								
								Merge pull request  #476  from ineffyble/fix-paperclip-s3-acl  
							
							... 
							
							
							
							Fix S3 default settings 
							
						 
						
							2017-01-15 14:29:47 +01:00  
				
					
						
							
							
								 
						
							
								e9737c2235 
								
							 
						 
						
							
							
								
								Fix tests, add applications to eager loading/cache for statuses, fix  
							
							... 
							
							
							
							application website validation, don't link to app website if website isn't set,
also comment out animated boost icon from #464  until it's consistent with non-animated version 
							
						 
						
							2017-01-15 14:01:33 +01:00  
				
					
						
							
							
								 
						
							
								a097dd489b 
								
							 
						 
						
							
							
								
								Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read'  
							
							
							
						 
						
							2017-01-15 20:58:46 +11:00  
				
					
						
							
							
								 
						
							
								e45fed58cb 
								
							 
						 
						
							
							
								
								Add a textual 'Back to Mastodon' link in footer of settings pages  
							
							
							
						 
						
							2017-01-15 11:03:35 +11:00  
				
					
						
							
							
								 
						
							
								c01dd089ff 
								
							 
						 
						
							
							
								
								Adding about/more page with extended information that can be set up by an admin  
							
							
							
						 
						
							2017-01-13 20:16:38 +01:00  
				
					
						
							
							
								 
						
							
								e25170f960 
								
							 
						 
						
							
							
								
								Add extended about page stub  
							
							
							
						 
						
							2017-01-13 03:24:41 +01:00  
				
					
						
							
							
								 
						
							
								b11fdc3ae3 
								
							 
						 
						
							
							
								
								Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings  
							
							... 
							
							
							
							with YAML-defined defaults. Add admin page for editing global settings. Add "site_description"
setting that would show as a paragraph on the frontpage 
							
						 
						
							2017-01-12 20:46:24 +01:00  
				
					
						
							
							
								 
						
							
								4292cf60ae 
								
							 
						 
						
							
							
								
								Fix env variable name  
							
							
							
						 
						
							2017-01-10 22:01:13 +01:00  
				
					
						
							
							
								 
						
							
								75f80bef10 
								
							 
						 
						
							
							
								
								Persist UI settings, add missing localizations for German  
							
							
							
						 
						
							2017-01-09 14:00:55 +01:00  
				
					
						
							
							
								 
						
							
								2e71bb031b 
								
							 
						 
						
							
							
								
								Fix Paperclip timeout setting. Fix bug introduced in  #437  
							
							
							
						 
						
							2017-01-08 19:12:54 +01:00  
				
					
						
							
							
								 
						
							
								7ddec6e7c3 
								
							 
						 
						
							
							
								
								Add read timeout to paperclip when it's downloading remote images  
							
							
							
						 
						
							2017-01-07 15:43:56 +01:00  
				
					
						
							
							
								 
						
							
								bb033c1d37 
								
							 
						 
						
							
							
								
								"Reblog" -> "boost" in more places  
							
							... 
							
							
							
							A couple of places were using "reblog" rather than "boost" - this updates them to match the web UI 
							
						 
						
							2017-01-04 18:00:50 -08:00  
				
					
						
							
							
								 
						
							
								2b0b7ff1b8 
								
							 
						 
						
							
							
								
								Fix   #385  - /web now loads a page  
							
							
							
						 
						
							2017-01-04 15:35:36 +01:00  
				
					
						
							
							
								 
						
							
								8f47f6a7ec 
								
							 
						 
						
							
							
								
								Adding remote follow button  
							
							
							
						 
						
							2017-01-01 19:54:34 +01:00  
				
					
						
							
							
								 
						
							
								a302e56f9a 
								
							 
						 
						
							
							
								
								Add API for retrieving favourites  
							
							
							
						 
						
							2016-12-29 20:33:26 +01:00  
				
					
						
							
							
								 
						
							
								49834a6e7f 
								
							 
						 
						
							
							
								
								Add API for retrieving blocked accounts  
							
							
							
						 
						
							2016-12-29 20:12:32 +01:00  
				
					
						
							
							
								 
						
							
								d7dc84439c 
								
							 
						 
						
							
							
								
								Add ability to use remote follow function on other sites  
							
							
							
						 
						
							2016-12-29 16:54:54 +01:00  
				
					
						
							
							
								 
						
							
								eca6110fc4 
								
							 
						 
						
							
							
								
								Add preferences for follow request notification e-mails  
							
							
							
						 
						
							2016-12-26 22:04:16 +01:00  
				
					
						
							
							
								 
						
							
								2146ac91a0 
								
							 
						 
						
							
							
								
								Follow requests send e-mail notifications, but are excluded from notifications API  
							
							... 
							
							
							
							Better initial state for unlisted/nsfw toggles 
							
						 
						
							2016-12-26 21:52:03 +01:00  
				
					
						
							
							
								 
						
							
								3689c119f0 
								
							 
						 
						
							
							
								
								Replacing follow requests in the settings area with in-UI column  
							
							
							
						 
						
							2016-12-26 21:33:51 +01:00  
				
					
						
							
							
								 
						
							
								004382e4d0 
								
							 
						 
						
							
							
								
								Adding follow requests API  
							
							
							
						 
						
							2016-12-26 19:30:45 +01:00  
				
					
						
							
							
								 
						
							
								b302b9202b 
								
							 
						 
						
							
							
								
								Add page for authorizing/rejecting follow requests  
							
							
							
						 
						
							2016-12-23 00:04:52 +01:00  
				
					
						
							
							
								 
						
							
								3c841c7306 
								
							 
						 
						
							
							
								
								Adjust wording  
							
							
							
						 
						
							2016-12-22 23:24:46 +01:00  
				
					
						
							
							
								 
						
							
								05b13c38b5 
								
							 
						 
						
							
							
								
								Re-enable Webfinger for locked accounts but don't handle "follow" events  
							
							... 
							
							
							
							coming in via Salmon.
Currently no way to prevent remote follows, but they will only receive public
and unlisted posts 
							
						 
						
							2016-12-22 23:17:57 +01:00  
				
					
						
							
							
								 
						
							
								b891a81008 
								
							 
						 
						
							
							
								
								Follow call on locked account creates follow request instead  
							
							... 
							
							
							
							Reflect "requested" relationship in API and UI
Reflect inability of private posts to be reblogged in the UI
Disable Webfinger for locked accounts 
							
						 
						
							2016-12-22 23:03:57 +01:00  
				
					
						
							
							
								 
						
							
								2d2154ba75 
								
							 
						 
						
							
							
								
								Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users  
							
							
							
						 
						
							2016-12-22 21:34:19 +01:00  
				
					
						
							
							
								 
						
							
								6d71044c85 
								
							 
						 
						
							
							
								
								Don't use rack timeout in any but production environments  
							
							
							
						 
						
							2016-12-21 19:10:40 +01:00  
				
					
						
							
							
								 
						
							
								e09d3a2c66 
								
							 
						 
						
							
							
								
								Fix   #249  - use window.location hack to let people login from sandboxed iOS homescreen  
							
							
							
						 
						
							2016-12-21 00:13:13 +01:00  
				
					
						
							
							
								 
						
							
								6b67b55cee 
								
							 
						 
						
							
							
								
								Merge pull request  #356  from victorhck/master  
							
							... 
							
							
							
							added two missings spanish  translations 
							
						 
						
							2016-12-18 21:22:46 +01:00  
				
					
						
							
							
								 
						
							
								5ae1b39ec9 
								
							 
						 
						
							
							
								
								Adjusting public display of statuses to look similar to logged-in UI,  
							
							... 
							
							
							
							fix  #361  with rich OEmbed display via iframe, fix  #237  by hiding sensitive
content behind a spoiler on public pages 
						
							2016-12-18 19:47:11 +01:00  
				
					
						
							
							
								 
						
							
								aed25932b5 
								
							 
						 
						
							
							
								
								Add OEmbed iframe HTML, convert emojis on public pages, increase size of attachment thumbnails  
							
							
							
						 
						
							2016-12-18 15:20:39 +01:00  
				
					
						
							
							
								 
						
							
								6de079a5af 
								
							 
						 
						
							
							
								
								Removing external hub completely,  fix   #333  fixing digit-only hashtags,  
							
							... 
							
							
							
							removing web app capability from non-webapp pages 
							
						 
						
							2016-12-18 12:24:37 +01:00  
				
					
						
							
							
								 
						
							
								f5c8d64b6d 
								
							 
						 
						
							
							
								
								added to missings spanish  translations  
							
							
							
						 
						
							2016-12-14 18:43:00 +01:00  
				
					
						
							
							
								 
						
							
								76ec907993 
								
							 
						 
						
							
							
								
								Improved admin UI  
							
							
							
						 
						
							2016-12-13 13:42:10 +01:00  
				
					
						
							
							
								 
						
							
								0c491ea928 
								
							 
						 
						
							
							
								
								Fix translations  
							
							
							
						 
						
							2016-12-09 11:52:09 +01:00  
				
					
						
							
							
								 
						
							
								d2ab41aea4 
								
							 
						 
						
							
							
								
								Declare Ukrainian  
							
							... 
							
							
							
							Closes : #345  
						
							2016-12-08 18:57:58 +02:00  
				
					
						
							
							
								 
						
							
								2c6c912076 
								
							 
						 
						
							
							
								
								Fix some translation errors.  
							
							
							
						 
						
							2016-12-07 21:13:57 +02:00  
				
					
						
							
							
								 
						
							
								d85c566960 
								
							 
						 
						
							
							
								
								Final steps for Ukrainian translation  
							
							
							
						 
						
							2016-12-07 20:39:22 +02:00