Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							ccb8ac8573 
							
						 
					 
					
						
						
							
							Make the streaming API also handle websockets (because trying to get the browser EventSource interface to  
						
						... 
						
						
						
						work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead
of ActionCable like before. This means that if you are upgrading, you should set that up beforehand. 
						
						
					 
					
						2017-02-04 00:34:31 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							d9ca46b464 
							
						 
					 
					
						
						
							
							Cleaning up format of broadcast real-time messages, removing  
						
						... 
						
						
						
						redis-backed "mentions" timeline as redundant (given notifications) 
						
						
					 
					
						2017-02-02 00:03:31 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							1da0ce5c7c 
							
						 
					 
					
						
						
							
							Looks like log level :debug is required for activerecord times to be tracked  
						
						
						
						
					 
					
						2017-02-01 12:13:16 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							65402d9c09 
							
						 
					 
					
						
						
							
							Fix activerecord logging in production  
						
						
						
						
					 
					
						2017-02-01 11:34:50 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							c2fbd144cf 
							
						 
					 
					
						
						
							
							Add "open in web" link to detailed public status pages  
						
						
						
						
					 
					
						2017-01-30 23:01:37 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							a2a85e8549 
							
						 
					 
					
						
						
							
							Add capistrano to development environment  
						
						
						
						
					 
					
						2017-01-30 20:03:17 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							3f075c7794 
							
						 
					 
					
						
						
							
							API for apps to register for push notifications  
						
						
						
						
					 
					
						2017-01-29 01:30:32 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							23b997ae55 
							
						 
					 
					
						
						
							
							Split 2FA login into two prompts  
						
						
						
						
					 
					
						2017-01-28 20:43:38 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							f4bc9620a9 
							
						 
					 
					
						
						
							
							Update settings to re-use admin layout, one big navigation tree, improve settings forms  
						
						
						
						
					 
					
						2017-01-28 03:56:10 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							76e970c856 
							
						 
					 
					
						
						
							
							Do not automatically login after password reset, as it would circumvent two-factor auth (if enabled)  
						
						... 
						
						
						
						Do not require e-mail address changes to be re-confirmed, it's only trouble for no real benefit 
						
						
					 
					
						2017-01-27 20:35:16 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							ba192f12e3 
							
						 
					 
					
						
						
							
							Added optional two-factor authentication  
						
						
						
						
					 
					
						2017-01-27 20:35:16 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							f6a5977f0b 
							
						 
					 
					
						
						
							
							Fix key names in statsd  
						
						
						
						
					 
					
						2017-01-26 19:46:52 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							d567f21d4f 
							
						 
					 
					
						
						
							
							Improve StatsD instrumentation  
						
						
						
						
					 
					
						2017-01-26 19:08:05 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							7329fbd8a4 
							
						 
					 
					
						
						
							
							Fix up timeout, improve contrast on "show more", add responsive style  
						
						... 
						
						
						
						for extremely wide monitors 
						
						
					 
					
						2017-01-26 18:48:56 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							cc5c1e5feb 
							
						 
					 
					
						
						
							
							Removed accidental n+1 query from notifications, updated some deps,  
						
						... 
						
						
						
						improved how "show more" link looks 
						
						
					 
					
						2017-01-26 14:52:07 +01:00 
						 
				 
			
				
					
						
							
							
								Effy Elden 
							
						 
					 
					
						
						
						
						
							
						
						
							07b9a10d4d 
							
						 
					 
					
						
						
							
							Add redirect for /admin => /admin/settings  
						
						
						
						
					 
					
						2017-01-26 18:59:35 +11:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							999cde94a6 
							
						 
					 
					
						
						
							
							Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text  
						
						... 
						
						
						
						Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" />
Clean up schema file from accidental development migrations 
						
						
					 
					
						2017-01-25 01:29:16 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							956da43e19 
							
						 
					 
					
						
						
							
							Fix error  
						
						
						
						
					 
					
						2017-01-22 23:07:31 +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 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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							f0de621e76 
							
						 
					 
					
						
						
							
							Fix   #463  - Fetch and display previews of URLs using OpenGraph tags  
						
						
						
						
					 
					
						2017-01-20 01:00:14 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							f051c2e813 
							
						 
					 
					
						
						
							
							Fix statsd null backend not being initialized properly  
						
						
						
						
					 
					
						2017-01-19 09:37:07 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							306eb6e9c9 
							
						 
					 
					
						
						
							
							Add optional StatsD performance tracking  
						
						
						
						
					 
					
						2017-01-18 23:44:29 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							fcb5a85cdd 
							
						 
					 
					
						
						
							
							Add sounds for notifications. Boop by @jk@mastodon.social  
						
						
						
						
					 
					
						2017-01-17 20:09:03 +01:00 
						 
				 
			
				
					
						
							
							
								Effy Elden 
							
						 
					 
					
						
						
						
						
							
						
						
							ab4f5f5da5 
							
						 
					 
					
						
						
							
							Add Heroku deployment support  
						
						
						
						
					 
					
						2017-01-17 22:00:03 +11:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							16f9490d33 
							
						 
					 
					
						
						
							
							Merge pull request  #476  from ineffyble/fix-paperclip-s3-acl  
						
						... 
						
						
						
						Fix S3 default settings 
						
						
					 
					
						2017-01-15 14:29:47 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Effy Elden 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Effy Elden 
							
						 
					 
					
						
						
						
						
							
						
						
							e45fed58cb 
							
						 
					 
					
						
						
							
							Add a textual 'Back to Mastodon' link in footer of settings pages  
						
						
						
						
					 
					
						2017-01-15 11:03:35 +11:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							c01dd089ff 
							
						 
					 
					
						
						
							
							Adding about/more page with extended information that can be set up by an admin  
						
						
						
						
					 
					
						2017-01-13 20:16:38 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							e25170f960 
							
						 
					 
					
						
						
							
							Add extended about page stub  
						
						
						
						
					 
					
						2017-01-13 03:24:41 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							4292cf60ae 
							
						 
					 
					
						
						
							
							Fix env variable name  
						
						
						
						
					 
					
						2017-01-10 22:01:13 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							75f80bef10 
							
						 
					 
					
						
						
							
							Persist UI settings, add missing localizations for German  
						
						
						
						
					 
					
						2017-01-09 14:00:55 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							2e71bb031b 
							
						 
					 
					
						
						
							
							Fix Paperclip timeout setting. Fix bug introduced in  #437  
						
						
						
						
					 
					
						2017-01-08 19:12:54 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							7ddec6e7c3 
							
						 
					 
					
						
						
							
							Add read timeout to paperclip when it's downloading remote images  
						
						
						
						
					 
					
						2017-01-07 15:43:56 +01:00 
						 
				 
			
				
					
						
							
							
								Jessica Stokes 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							2b0b7ff1b8 
							
						 
					 
					
						
						
							
							Fix   #385  - /web now loads a page  
						
						
						
						
					 
					
						2017-01-04 15:35:36 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							8f47f6a7ec 
							
						 
					 
					
						
						
							
							Adding remote follow button  
						
						
						
						
					 
					
						2017-01-01 19:54:34 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							a302e56f9a 
							
						 
					 
					
						
						
							
							Add API for retrieving favourites  
						
						
						
						
					 
					
						2016-12-29 20:33:26 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							49834a6e7f 
							
						 
					 
					
						
						
							
							Add API for retrieving blocked accounts  
						
						
						
						
					 
					
						2016-12-29 20:12:32 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							d7dc84439c 
							
						 
					 
					
						
						
							
							Add ability to use remote follow function on other sites  
						
						
						
						
					 
					
						2016-12-29 16:54:54 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							eca6110fc4 
							
						 
					 
					
						
						
							
							Add preferences for follow request notification e-mails  
						
						
						
						
					 
					
						2016-12-26 22:04:16 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							3689c119f0 
							
						 
					 
					
						
						
							
							Replacing follow requests in the settings area with in-UI column  
						
						
						
						
					 
					
						2016-12-26 21:33:51 +01:00