Matt Jankowski 
							
						 
					 
					
						
						
						
						
							
						
						
							3a9eb81a80 
							
						 
					 
					
						
						
							
							Admin accounts controller cleanup ( #1664 )  
						
						... 
						
						
						
						* Remove unused account_params method in admin/accounts controller
* Introduce AccountFilter to find accounts
* Use AccountFilter in admin/accounts controller
* Use more restful routes admin silence and suspension area
* Add admin/silences and admin/suspensions controllers 
						
						
					 
					
						2017-04-13 13:04:23 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
						
						
							
						
						
							7f0a865b05 
							
						 
					 
					
						
						
							
							Allow import/export of mutes list ( #1541 )  
						
						... 
						
						
						
						* Allow export of mutes list
* Allow importing of mutes list
* Refactor to use Settings::Exports::BaseController and DRY up exports code 
						
						
					 
					
						2017-04-12 18:20:44 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
						
						
							
						
						
							b352a8e5d4 
							
						 
					 
					
						
						
							
							Default to json type for webfinger requests ( #1583 )  
						
						
						
						
					 
					
						2017-04-12 16:03:37 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
						
						
							
						
						
							3ddd936b03 
							
						 
					 
					
						
						
							
							Refactor exports controller ( #1567 )  
						
						... 
						
						
						
						* Add basic coverage for settings/exports controller
* Remove unused @account variable from settings/exports controller
* Add coverage for download export actions
* Remove deprecated `render :text` in favor of `send_data` for csv downloads
* Add model to handle exports
* Use Export class in settings/exports controller
* Simplify settings/exports controller methods
* Move settings/export to more restful routes 
						
						
					 
					
						2017-04-11 22:00:43 +02:00 
						 
				 
			
				
					
						
							
							
								David Celis 
							
						 
					 
					
						
						
						
						
							
						
						
							d4fe6cd2bf 
							
						 
					 
					
						
						
							
							Allow users to update their Account in the API ( #1179 )  
						
						... 
						
						
						
						* Allow users to update their Account in the API
It would be nice for API clients to be able to allow users to update
their accounts without having to wrap Mastodon in a web view. This patch
adds an API endpoint to let users submit a PATCH for their account.
Signed-off-by: David Celis <me@davidcel.is>
* Add /api/v1/accounts/update_credentials to the API docs
Signed-off-by: David Celis <me@davidcel.is> 
						
						
					 
					
						2017-04-09 18:33:40 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
						
						
							
						
						
							e5282e4ec0 
							
						 
					 
					
						
						
							
							Clean up about page ( #1282 )  
						
						... 
						
						
						
						* Add InstancePresenter to expose site details
* Clean up about controller, use instance presenter 
						
						
					 
					
						2017-04-09 14:47:25 +02:00 
						 
				 
			
				
					
						
							
							
								Matt Jankowski 
							
						 
					 
					
						
						
						
						
							
						
						
							71706f21c2 
							
						 
					 
					
						
						
							
							Ignore implied formats for catch all route requests ( #1340 )  
						
						... 
						
						
						
						A request to `/test` would show the custom 404 page, but a request to
`/test.test` would return a 404 with an empty body.
This change ignores the format on incoming catch all route requests, so that the
html 404 page is returned on these requests. 
						
						
					 
					
						2017-04-09 14:39:41 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							9acdb166e8 
							
						 
					 
					
						
						
							
							Fix   #795 ,  fix   #704 ,  fix   #835  - 2FA requires confirmation to be enabled ( #1278 )  
						
						... 
						
						
						
						* Fix  #795 , fix  #704 , fix  #835  - 2FA requires confirmation to be enabled
TOTP secret is not shown again after 2FA is enabled
* Clean up 
						
						
					 
					
						2017-04-08 22:20:08 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							e3a3422a65 
							
						 
					 
					
						
						
							
							Allow setting of default language through config  
						
						... 
						
						
						
						Setting of locale in controller extracted to Localized concern,
the doorkeeper authorized applications controller moved under
custom namespace with inclusion of Localized, which resolves the
"it sometimes appears in a different random language" bug 
						
						
					 
					
						2017-04-07 12:40:26 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							b7c1b12367 
							
						 
					 
					
						
						
							
							Make default admin UI page reports. Add admin UI for creating a domain block  
						
						
						
						
					 
					
						2017-04-03 18:55:06 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							e8875c6046 
							
						 
					 
					
						
						
							
							Import feature for following/blocking lists (addresses  #62 ,  #177 ,  #201 ,  #454 )  
						
						
						
						
					 
					
						2017-03-30 19:42:33 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							d6ed2eb512 
							
						 
					 
					
						
						
							
							Prettier account and stream entry URLs  
						
						
						
						
					 
					
						2017-03-22 19:55:14 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							05cf086766 
							
						 
					 
					
						
						
							
							New API method: /api/v1/search  
						
						... 
						
						
						
						Returns accounts, statuses, hashtags arrays 
						
						
					 
					
						2017-03-22 02:32:27 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							56d998cbdb 
							
						 
					 
					
						
						
							
							Export follow/block lists as CSV  
						
						
						
						
					 
					
						2017-03-19 20:29:41 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							6be7bde243 
							
						 
					 
					
						
						
							
							Fix   #525  - Add instance information API  
						
						
						
						
					 
					
						2017-03-15 23:12:48 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							e245115f47 
							
						 
					 
					
						
						
							
							Merge branch 'master' into mastodon-site-api  
						
						
						
						
					 
					
						2017-03-15 22:55:22 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							5f4e402204 
							
						 
					 
					
						
						
							
							Improved /api/v1/accounts/:id/statuses with new params: only_media, exclude_replies  
						
						... 
						
						
						
						Redirect /:username to /users/:username
Redirect /:username/:id to /users/:username/updates/:id
Updated API documentation and sponsors 
						
						
					 
					
						2017-03-05 17:27:17 +01:00 
						 
				 
			
				
					
						
							
							
								Kit Redgrave 
							
						 
					 
					
						
						
						
						
							
						
						
							442fdbfc53 
							
						 
					 
					
						
						
							
							Mute button progress so far. WIP, doesn't entirely work correctly.  
						
						
						
						
					 
					
						2017-03-01 22:31:21 -06:00 
						 
				 
			
				
					
						
							
							
								Kibigo 
							
						 
					 
					
						
						
						
						
							
						
						
							620f70e42c 
							
						 
					 
					
						
						
							
							Adds site metadata access to the API  
						
						
						
						
					 
					
						2017-02-27 04:06:25 -08:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							175a9b9caa 
							
						 
					 
					
						
						
							
							Fix   #104  - Style OAuth authorized applications page  
						
						... 
						
						
						
						Add ability to search accounts by display name 
						
						
					 
					
						2017-02-27 00:15:00 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							8132cf8153 
							
						 
					 
					
						
						
							
							Add GET /api/v1/accounts/:id/statuses/media that returns only statuses with media attachments  
						
						... 
						
						
						
						Make replies default to privacy settings of the status being replied to 
						
						
					 
					
						2017-02-17 01:30:24 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							d0f087db2d 
							
						 
					 
					
						
						
							
							Add UI to view report details, remove reported statuses, quick links to resolve/silence/suspend from report  
						
						
						
						
					 
					
						2017-02-17 00:42:52 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							24ba7c9762 
							
						 
					 
					
						
						
							
							Adding index overview for reports in admin UI  
						
						
						
						
					 
					
						2017-02-16 02:28:10 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							5426f06ac2 
							
						 
					 
					
						
						
							
							Fix admin UI for accounts somewhat  
						
						
						
						
					 
					
						2017-02-15 00:22:58 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							3b81baaaaf 
							
						 
					 
					
						
						
							
							Adding POST /api/v1/reports API, and a UI for submitting reports  
						
						
						
						
					 
					
						2017-02-14 20:59:26 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							0518492158 
							
						 
					 
					
						
						
							
							Stop trying to shoehorn all Salmon updates into the poor database-connected  
						
						... 
						
						
						
						StreamEntry model. Simply render Salmon slaps as they are needed 
						
						
					 
					
						2017-02-12 01:19:14 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							77e13c2bc9 
							
						 
					 
					
						
						
							
							Removing failed push notification API, make context loads use cache  
						
						
						
						
					 
					
						2017-02-05 17:51:44 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							3f075c7794 
							
						 
					 
					
						
						
							
							API for apps to register for push notifications  
						
						
						
						
					 
					
						2017-01-29 01:30:32 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							ba192f12e3 
							
						 
					 
					
						
						
							
							Added optional two-factor authentication  
						
						
						
						
					 
					
						2017-01-27 20:35:16 +01:00 
						 
				 
			
				
					
						
							
							
								Effy Elden 
							
						 
					 
					
						
						
						
						
							
						
						
							07b9a10d4d 
							
						 
					 
					
						
						
							
							Add redirect for /admin => /admin/settings  
						
						
						
						
					 
					
						2017-01-26 18:59:35 +11: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							75f80bef10 
							
						 
					 
					
						
						
							
							Persist UI settings, add missing localizations for German  
						
						
						
						
					 
					
						2017-01-09 14:00:55 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							3689c119f0 
							
						 
					 
					
						
						
							
							Replacing follow requests in the settings area with in-UI column  
						
						
						
						
					 
					
						2016-12-26 21:33:51 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							004382e4d0 
							
						 
					 
					
						
						
							
							Adding follow requests API  
						
						
						
						
					 
					
						2016-12-26 19:30:45 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							b302b9202b 
							
						 
					 
					
						
						
							
							Add page for authorizing/rejecting follow requests  
						
						
						
						
					 
					
						2016-12-23 00:04:52 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							aed25932b5 
							
						 
					 
					
						
						
							
							Add OEmbed iframe HTML, convert emojis on public pages, increase size of attachment thumbnails  
						
						
						
						
					 
					
						2016-12-18 15:20:39 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							76ec907993 
							
						 
					 
					
						
						
							
							Improved admin UI  
						
						
						
						
					 
					
						2016-12-13 13:42:10 +01:00