1d5dfda3d4 
					 
					
						
						
							
							Merge pull request  #643  from yiskah/patch-7  
						
						... 
						
						
						
						Add target="_blank" to github link under getting started 
						
						
					 
					
						2017-02-17 21:13:47 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6a6d8f60c4 
					 
					
						
						
							
							Add target="_blank" to github link  
						
						... 
						
						
						
						This makes so clicking the link to the github opens in a new tab or windows.
I just keep getting frustrated clicking the link to github and then losing my place in my home timeline >_> that's all 
						
						
					 
					
						2017-02-17 14:50:50 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2940deb51d 
					 
					
						
						
							
							Merge pull request  #640  from mcat-ee/master  
						
						... 
						
						
						
						Added SMTP_FROM_ADDRESS to heroku deploy config 
						
						
					 
					
						2017-02-17 13:09:21 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ca57f17d3d 
					 
					
						
						
							
							French translation update  
						
						
						
						
					 
					
						2017-02-17 10:27:00 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8a93ae4f18 
					 
					
						
						
							
							Added SMTP_FROM_ADDRESS to heroku deploy config  
						
						... 
						
						
						
						Allows the user to set the address mastodon emails are maraked as being sent from 
						
						
					 
					
						2017-02-17 14:45:31 +10:30 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a1e96ae94f 
					 
					
						
						
							
							Add foreign key to prevent reblogs of non-existent (after race conditions) statuses from happening  
						
						... 
						
						
						
						Fix issue with detailed status view not supporting unreblogging/unfavouriting 
						
						
					 
					
						2017-02-17 02:33:10 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5ddad41245 
					 
					
						
						
							
							Do not display non-Status stream entries anymore  
						
						
						
						
					 
					
						2017-02-17 02:20:52 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						dbd80465c8 
					 
					
						
						
							
							Fix small styling issues  
						
						
						
						
					 
					
						2017-02-17 02:05:15 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f2931af61e 
					 
					
						
						
							
							Quick fix for avatars with the same URL not being perceived as updated and in need of re-download  
						
						
						
						
					 
					
						2017-02-17 01:50:01 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8b16f81882 
					 
					
						
						
							
							Close dropdown when clicking items  
						
						
						
						
					 
					
						2017-02-17 01:44:06 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0cbf3a146f 
					 
					
						
						
							
							Speed up/optimize loading of statuses, context and cards by not re-fetching what is already loaded  
						
						
						
						
					 
					
						2017-02-17 01:34:37 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9c88d1b99e 
					 
					
						
						
							
							Speed up capistrano deployments  
						
						
						
						
					 
					
						2017-02-16 02:34:21 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						24ba7c9762 
					 
					
						
						
							
							Adding index overview for reports in admin UI  
						
						
						
						
					 
					
						2017-02-16 02:28:10 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f722aa8c75 
					 
					
						
						
							
							Fix Salmon issue  
						
						
						
						
					 
					
						2017-02-16 01:59:34 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ff49649130 
					 
					
						
						
							
							Expose Link headers via CORS  
						
						
						
						
					 
					
						2017-02-15 23:26:17 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5426f06ac2 
					 
					
						
						
							
							Fix admin UI for accounts somewhat  
						
						
						
						
					 
					
						2017-02-15 00:22:58 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0a2427f79b 
					 
					
						
						
							
							Fix   #634  - Only include innermost-level statuses in report UI  
						
						... 
						
						
						
						Fix  #635  - Include the initially-reported status in report UI even if it's not
among the user's most recent statuses 
					
						2017-02-15 00:01:52 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e571a01853 
					 
					
						
						
							
							Fix outdated info  
						
						
						
						
					 
					
						2017-02-14 21:33:31 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3b81baaaaf 
					 
					
						
						
							
							Adding POST /api/v1/reports API, and a UI for submitting reports  
						
						
						
						
					 
					
						2017-02-14 20:59:26 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						40a4053732 
					 
					
						
						
							
							Disable PuSH for blocked domains  
						
						
						
						
					 
					
						2017-02-14 04:01:37 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						94b61bdcf6 
					 
					
						
						
							
							Merge pull request  #632  from mcat-ee/patch-1  
						
						... 
						
						
						
						Fixed the URL 
						
						
					 
					
						2017-02-14 03:20:44 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						68dba5f2eb 
					 
					
						
						
							
							Fixed the URL  
						
						... 
						
						
						
						Heroku uses the referrer URL to point at the repo that should be deployed; from this page that includes part of a path that breaks the deployment (specifically /blob/master/docs/Running-Mastodon/Heroku-guide.md).
I've replaced the vanilla address with one that includes a specific reference to the root of the repo 
						
						
					 
					
						2017-02-14 12:46:18 +10:30 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f3ce9322b0 
					 
					
						
						
							
							Fix   #631  - Docker-deployed streaming API wasn't launched with the right environment  
						
						
						
						
					 
					
						2017-02-13 23:10:11 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						63886bdc59 
					 
					
						
						
							
							Fix   #587  - Display TOTP secret next to QR code  
						
						
						
						
					 
					
						2017-02-13 20:56:03 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bae7cf8cce 
					 
					
						
						
							
							Merge pull request  #630  from yiskah/patch-6  
						
						... 
						
						
						
						Add memetastic.space to instance list 
						
						
					 
					
						2017-02-13 20:42:40 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						fae1799646 
					 
					
						
						
							
							Add rake task for making someone into an admin  
						
						
						
						
					 
					
						2017-02-13 20:42:02 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						138d21aea8 
					 
					
						
						
							
							Update service timeout setting from 15s to 90s  
						
						
						
						
					 
					
						2017-02-13 20:42:02 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7a99699e2d 
					 
					
						
						
							
							Add memetastic.space  
						
						... 
						
						
						
						It's uh, it's an instance now. 
						
						
					 
					
						2017-02-13 14:37:58 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ed9ae70487 
					 
					
						
						
							
							Merge pull request  #629  from halcy/patch-1  
						
						... 
						
						
						
						Add https://icosahedron.website/  
						
						
					 
					
						2017-02-13 18:43:58 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						77df3785f1 
					 
					
						
						
							
							Merge branch 'yiskah-patch-5'  
						
						
						
						
					 
					
						2017-02-13 18:38:31 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ec521e6bfc 
					 
					
						
						
							
							Add remote mentions warning when composing a private status  
						
						
						
						
					 
					
						2017-02-13 18:38:00 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						73210a93df 
					 
					
						
						
							
							Add  https://icosahedron.website/  
						
						
						
						
					 
					
						2017-02-13 17:25:21 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2ab7bd13e2 
					 
					
						
						
							
							Merge branch 'patch-5' of  https://github.com/yiskah/mastodon  into yiskah-patch-5  
						
						
						
						
					 
					
						2017-02-13 17:22:40 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						677e95031e 
					 
					
						
						
							
							Clean up collapsible components  
						
						
						
						
					 
					
						2017-02-13 17:20:18 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2d8a4c4390 
					 
					
						
						
							
							Add "next" link to Atom feeds  
						
						
						
						
					 
					
						2017-02-13 15:38:45 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						63b3cb37db 
					 
					
						
						
							
							Merge pull request  #627  from halcy/style-fixes  
						
						... 
						
						
						
						Activity stream background should use $color5 
						
						
					 
					
						2017-02-13 15:16:15 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e4a7e8222e 
					 
					
						
						
							
							Activity stream background should use $color5  
						
						
						
						
					 
					
						2017-02-13 12:31:52 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8e08ae5bb9 
					 
					
						
						
							
							Add IDs to salmon slaps even if they are transient. Add title, too, mostly  
						
						... 
						
						
						
						in case of debugging incoming salmons. Add <thr:in-reply-to /> to favourite
salmons because it seems to be required by GS. 
						
						
					 
					
						2017-02-13 13:30:33 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						df63461ff0 
					 
					
						
						
							
							Add handler for salmons of undoing favourites  
						
						
						
						
					 
					
						2017-02-12 19:50:18 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						720ff55262 
					 
					
						
						
							
							Adding more unit tests. Fixing Salmon slaps XML  
						
						
						
						
					 
					
						2017-02-12 17:30:15 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						446267d1bf 
					 
					
						
						
							
							Deduplicate delete salmons (send only one per mentioned-account domain)  
						
						
						
						
					 
					
						2017-02-12 17:30:15 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						78b3b52663 
					 
					
						
						
							
							Merge pull request  #625  from ineffyble/patch-1  
						
						... 
						
						
						
						Remove toot.zone 
						
						
					 
					
						2017-02-12 13:27:40 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0eee63f074 
					 
					
						
						
							
							Remove toot.zone  
						
						... 
						
						
						
						toot.zone is being discontinued 
						
						
					 
					
						2017-02-12 14:51:53 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						db814543c0 
					 
					
						
						
							
							Take out private toot distribution out of PuSH again  
						
						
						
						
					 
					
						2017-02-12 01:31:04 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						968fae2603 
					 
					
						
						
							
							Add privacy disclaimer  
						
						... 
						
						
						
						I haven't had a chance to test this, because I don't currently have a fully functioning computer I can set up a dev-environment on, but this *should* make it so when a user toggles a post to be private, a disclaimer appears clarifying what "private" really means. 
						
						
					 
					
						2017-02-11 17:42:19 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3893ff1604 
					 
					
						
						
							
							Add privacy disclaimer  
						
						... 
						
						
						
						Add variable for text of privacy disclaimer 
						
						
					 
					
						2017-02-11 16:47:01 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						94d2182717 
					 
					
						
						
							
							Resolve issue with rendering authorize/reject Salmon slaps  
						
						
						
						
					 
					
						2017-02-11 19:42:05 +01:00