Rakib Hasan 
								
							 
						 
						
							
							
							
							
								
							
							
								6d2301988f 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								5ddad41245 
								
							 
						 
						
							
							
								
								Do not display non-Status stream entries anymore  
							
							
							
						 
						
							2017-02-17 02:20:52 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								63886bdc59 
								
							 
						 
						
							
							
								
								Fix   #587  - Display TOTP secret next to QR code  
							
							
							
						 
						
							2017-02-13 20:56:03 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								149887a0ff 
								
							 
						 
						
							
							
								
								Make follow requests federate  
							
							
							
						 
						
							2017-02-11 02:58:00 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								d96e031dfc 
								
							 
						 
						
							
							
								
								Fix   #611  - Layout setting in registrations controller  
							
							
							
						 
						
							2017-02-08 03:04:29 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								9d5fb49cd8 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								714e41d472 
								
							 
						 
						
							
							
								
								Fix preferences save  
							
							
							
						 
						
							2017-02-07 00:23:38 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								347a153b3d 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								94e213c6c1 
								
							 
						 
						
							
							
								
								Reuse existing controller and route  
							
							
							
						 
						
							2017-02-06 01:19:26 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								eee8afb0b7 
								
							 
						 
						
							
							
								
								Remove bios from blocked users list, filter out broken entries from API response  
							
							
							
						 
						
							2017-02-05 19:39:00 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								77e13c2bc9 
								
							 
						 
						
							
							
								
								Removing failed push notification API, make context loads use cache  
							
							
							
						 
						
							2017-02-05 17:51:44 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Evan Minto 
								
							 
						 
						
							
							
							
							
								
							
							
								8bd8ea7c04 
								
							 
						 
						
							
							
								
								Remove unnecessary leftover code  
							
							
							
						 
						
							2017-02-04 14:49:24 -08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Evan Minto 
								
							 
						 
						
							
							
							
							
								
							
							
								e2fbf8bc74 
								
							 
						 
						
							
							
								
								Add an account endpoint for ActivityPub and link to it on HTML profile pages  
							
							
							
						 
						
							2017-02-04 14:46:23 -08: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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								ba192f12e3 
								
							 
						 
						
							
							
								
								Added optional two-factor authentication  
							
							
							
						 
						
							2017-01-27 20:35:16 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								905c829179 
								
							 
						 
						
							
							
								
								Improve infinite scroll on notifications  
							
							
							
						 
						
							2017-01-26 04:30:40 +01: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 
								
							 
						 
						
							
							
							
							
								
							
							
								f8da0dd490 
								
							 
						 
						
							
							
								
								Merge branch 'master' into master  
							
							
							
						 
						
							2017-01-24 21:56:06 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8a880a3d46 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								1f5792c834 
								
							 
						 
						
							
							
								
								API now respects ?limit param as long as it's within 2x default limit  
							
							
							
						 
						
							2017-01-24 04:22:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									blackle 
								
							 
						 
						
							
							
							
							
								
							
							
								bf0f6eb62d 
								
							 
						 
						
							
							
								
								Implement a click-to-view spoiler system  
							
							
							
						 
						
							2017-01-23 21:07:40 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								cca82bf0a2 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								aa9c51a34c 
								
							 
						 
						
							
							
								
								Fix a couple unhandled exceptions  
							
							
							
						 
						
							2017-01-23 13:56:57 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a1894786cf 
								
							 
						 
						
							
							
								
								Potentially fix notifications issue  
							
							
							
						 
						
							2017-01-23 13:43:14 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								1953e3b6ed 
								
							 
						 
						
							
							
								
								Fix inflection  
							
							
							
						 
						
							2017-01-22 23:08:51 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e22a56183a 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								b4a4eb73ae 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								3a4b5961be 
								
							 
						 
						
							
							
								
								Method to fetch a single notification  
							
							
							
						 
						
							2017-01-21 22:14:13 +01: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 
								
							 
						 
						
							
							
							
							
								
							
							
								98560b232a 
								
							 
						 
						
							
							
								
								Don't show loading bar when re-loading already loaded status. Don't even try to fetch ancestors from DB when in_reply_to_id is nil  
							
							
							
						 
						
							2017-01-19 11:06:06 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7d53ee73f3 
								
							 
						 
						
							
							
								
								Fix   #238  - Add "favourites" column  
							
							
							
						 
						
							2017-01-16 13:28:25 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
							
							
								
							
							
								ed41f9f0b1 
								
							 
						 
						
							
							
								
								Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether  
							
							
							
						 
						
							2017-01-15 10:30:23 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
							
							
								
							
							
								d6bc0e8db4 
								
							 
						 
						
							
							
								
								Add tracking of OAuth app that posted a status, extend OAuth apps to have optional website field, add application details to API, show application name and website on detailed status views.  Resolves   #11  
							
							
							
						 
						
							2017-01-15 08:58:50 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								2939e9898b 
								
							 
						 
						
							
							
								
								Extend rails-settings-cached to merge db-saved hash values with defaults  
							
							
							
						 
						
							2017-01-13 02:42:22 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								312c51b5c8 
								
							 
						 
						
							
							
								
								Home column filters  
							
							
							
						 
						
							2017-01-10 17:25:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								75f80bef10 
								
							 
						 
						
							
							
								
								Persist UI settings, add missing localizations for German  
							
							
							
						 
						
							2017-01-09 14:00:55 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7b9f8766e8 
								
							 
						 
						
							
							
								
								Fix   #416  - Generate random unique 14-byte (19 characters) shortcodes  
							
							... 
							
							
							
							for local attachments, use them in URLs. Check status privacy
before redirecting to actual file. 
							
						 
						
							2017-01-06 00:29:12 +01:00