Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								6599b27b2b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into mastodon-site-api  
							
							
							
						 
						
							2017-03-15 22:55:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								453d65e6da 
								
							 
						 
						
							
							
								
								Obfuscate filenames better, double rate limits  
							
							
							
						 
						
							2017-03-14 15:59:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								250beb1971 
								
							 
						 
						
							
							
								
								Revert earlier fix due to new bug reports  
							
							
							
						 
						
							2017-03-06 02:25:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								dea8e95d14 
								
							 
						 
						
							
							
								
								Performance improvement for profiles  
							
							
							
						 
						
							2017-03-06 01:50:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								42b6d5aca5 
								
							 
						 
						
							
							
								
								Increase max bitrate of converted webms, slightly optimized counter queries  
							
							... 
							
							
							
							(Because postgres can tell that count(*) needs no extra checks, but
counting a specific column requires them) 
							
						 
						
							2017-03-05 23:43:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d1e1f26878 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								0cb5a2a0a7 
								
							 
						 
						
							
							
								
								Add digest e-mails  
							
							
							
						 
						
							2017-03-04 00:00:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kit Redgrave 
								
							 
						 
						
							
							
							
							
								
							
							
								4554ccd5d0 
								
							 
						 
						
							
							
								
								Mute button progress so far. WIP, doesn't entirely work correctly.  
							
							
							
						 
						
							2017-03-01 22:31:21 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Kibigo 
								
							 
						 
						
							
							
							
							
								
							
							
								b39356835b 
								
							 
						 
						
							
							
								
								Adds site metadata access to the API  
							
							
							
						 
						
							2017-02-27 04:06:25 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a741049a77 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								ff8a080d40 
								
							 
						 
						
							
							
								
								Add validation of media attachments, clean up mastodon-own exception classes  
							
							
							
						 
						
							2017-02-26 23:23:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								128dcdf68a 
								
							 
						 
						
							
							
								
								Merge branch 'fix_462' of  https://github.com/rmhasan/mastodon  into rmhasan-fix_462  
							
							
							
						 
						
							2017-02-26 23:09:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5157e25aab 
								
							 
						 
						
							
							
								
								Add tuning documentation, add <content> tags back to most salmons,  
							
							... 
							
							
							
							make status pagination headers generation more lax about next page
existing 
							
						 
						
							2017-02-25 03:34:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rakib Hasan 
								
							 
						 
						
							
							
							
							
								
							
							
								2e10c9861e 
								
							 
						 
						
							
							
								
								Removed try clause from create action in status controller  
							
							... 
							
							
							
							Using catch statement in api_controller.rb to catch NotPermitted
Exception, and render error message 
							
						 
						
							2017-02-19 08:29:56 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rakib Hasan 
								
							 
						 
						
							
							
							
							
								
							
							
								008c95b3b9 
								
							 
						 
						
							
							
								
								revisted fix for  #462  
							
							... 
							
							
							
							Moved validation to services/post_status_service.rb 
							
						 
						
							2017-02-19 08:28:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rakib Hasan 
								
							 
						 
						
							
							
							
							
								
							
							
								11dc0a1cbc 
								
							 
						 
						
							
							
								
								Fix for issue  #462  
							
							... 
							
							
							
							Modified uploadCompose action to send media ids of attached
media when sending a request. Modified create method in MediaController
to check if when posting a video, there are no other media attached
to the status by looking at the media ids sent from the uploadCompose
action. 
							
						 
						
							2017-02-19 08:28:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3d291bcc55 
								
							 
						 
						
							
							
								
								Do not display non-Status stream entries anymore  
							
							
							
						 
						
							2017-02-17 02:20:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7f9d6d0160 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								0613d66df8 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								6917e53fe0 
								
							 
						 
						
							
							
								
								Adding index overview for reports in admin UI  
							
							
							
						 
						
							2017-02-16 02:28:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								513a78d67b 
								
							 
						 
						
							
							
								
								Fix admin UI for accounts somewhat  
							
							
							
						 
						
							2017-02-15 00:22:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2cc31b3194 
								
							 
						 
						
							
							
								
								Adding POST /api/v1/reports API, and a UI for submitting reports  
							
							
							
						 
						
							2017-02-14 20:59:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a83dc927d8 
								
							 
						 
						
							
							
								
								Fix   #587  - Display TOTP secret next to QR code  
							
							
							
						 
						
							2017-02-13 20:56:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f9f8f52fe9 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								59c8c2b28a 
								
							 
						 
						
							
							
								
								Make follow requests federate  
							
							
							
						 
						
							2017-02-11 02:58:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								92a90de2af 
								
							 
						 
						
							
							
								
								Fix   #611  - Layout setting in registrations controller  
							
							
							
						 
						
							2017-02-08 03:04:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								7037774d6e 
								
							 
						 
						
							
							
								
								Merge pull request  #603  from evanminto/activitypub-account  
							
							... 
							
							
							
							Expose ActivityStreams 2.0 representation of accounts 
							
						 
						
							2017-02-07 02:08:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								af82038b98 
								
							 
						 
						
							
							
								
								Fix preferences save  
							
							
							
						 
						
							2017-02-07 00:23:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b1f2683ecc 
								
							 
						 
						
							
							
								
								Add API modifiers to limit returned toots from public/hashtag timelines  
							
							... 
							
							
							
							to only those from local users; Add link to "extended information" to
getting started in the UI; Add defaults for posting privacy; Change
how publish button looks depending on posting privacy chosen 
							
						 
						
							2017-02-06 23:16:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Evan Minto 
								
							 
						 
						
							
							
							
							
								
							
							
								db7affbf5b 
								
							 
						 
						
							
							
								
								Reuse existing controller and route  
							
							
							
						 
						
							2017-02-06 01:19:26 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e4a55302d2 
								
							 
						 
						
							
							
								
								Remove bios from blocked users list, filter out broken entries from API response  
							
							
							
						 
						
							2017-02-05 19:39:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2f126b1225 
								
							 
						 
						
							
							
								
								Removing failed push notification API, make context loads use cache  
							
							
							
						 
						
							2017-02-05 17:51:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Evan Minto 
								
							 
						 
						
							
							
							
							
								
							
							
								e02bfd0aa2 
								
							 
						 
						
							
							
								
								Remove unnecessary leftover code  
							
							
							
						 
						
							2017-02-04 14:49:24 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Evan Minto 
								
							 
						 
						
							
							
							
							
								
							
							
								b56d24ed71 
								
							 
						 
						
							
							
								
								Add an account endpoint for ActivityPub and link to it on HTML profile pages  
							
							
							
						 
						
							2017-02-04 14:46:23 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								727d236fcc 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								9327d05bf7 
								
							 
						 
						
							
							
								
								API for apps to register for push notifications  
							
							
							
						 
						
							2017-01-29 01:30:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c58da52e9f 
								
							 
						 
						
							
							
								
								Split 2FA login into two prompts  
							
							
							
						 
						
							2017-01-28 20:43:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								557de8e24c 
								
							 
						 
						
							
							
								
								Update settings to re-use admin layout, one big navigation tree, improve settings forms  
							
							
							
						 
						
							2017-01-28 03:56:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9b8670c939 
								
							 
						 
						
							
							
								
								Added optional two-factor authentication  
							
							
							
						 
						
							2017-01-27 20:35:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2efefb380b 
								
							 
						 
						
							
							
								
								Improve infinite scroll on notifications  
							
							
							
						 
						
							2017-01-26 04:30:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								959e064186 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								c7778752e3 
								
							 
						 
						
							
							
								
								Merge branch 'master' into master  
							
							
							
						 
						
							2017-01-24 21:56:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ea8b548ee9 
								
							 
						 
						
							
							
								
								Make blocks create entries and unfollows instantly, but do the clean up  
							
							... 
							
							
							
							in the background instead. Should fix delay where blocked person
can interact with blocker for a short time before background job
gets processed 
							
						 
						
							2017-01-24 21:40:41 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									blackle 
								
							 
						 
						
							
							
							
							
								
							
							
								e25fc71c2c 
								
							 
						 
						
							
							
								
								Implement a click-to-view spoiler system  
							
							
							
						 
						
							2017-01-23 21:07:40 -05: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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								20cb576da1 
								
							 
						 
						
							
							
								
								Fix inflection  
							
							
							
						 
						
							2017-01-22 23:08:51 +01:00