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 
								
							 
						 
						
							
							
							
							
								
							
							
								f722aa8c75 
								
							 
						 
						
							
							
								
								Fix Salmon issue  
							
							
							
						 
						
							2017-02-16 01:59:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5426f06ac2 
								
							 
						 
						
							
							
								
								Fix admin UI for accounts somewhat  
							
							
							
						 
						
							2017-02-15 00:22:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								40a4053732 
								
							 
						 
						
							
							
								
								Disable PuSH for blocked domains  
							
							
							
						 
						
							2017-02-14 04:01:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								63886bdc59 
								
							 
						 
						
							
							
								
								Fix   #587  - Display TOTP secret next to QR code  
							
							
							
						 
						
							2017-02-13 20:56:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ec521e6bfc 
								
							 
						 
						
							
							
								
								Add remote mentions warning when composing a private status  
							
							
							
						 
						
							2017-02-13 18:38:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2ab7bd13e2 
								
							 
						 
						
							
							
								
								Merge branch 'patch-5' of  https://github.com/yiskah/mastodon  into yiskah-patch-5  
							
							
							
						 
						
							2017-02-13 17:22:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								677e95031e 
								
							 
						 
						
							
							
								
								Clean up collapsible components  
							
							
							
						 
						
							2017-02-13 17:20:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2d8a4c4390 
								
							 
						 
						
							
							
								
								Add "next" link to Atom feeds  
							
							
							
						 
						
							2017-02-13 15:38:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								63b3cb37db 
								
							 
						 
						
							
							
								
								Merge pull request  #627  from halcy/style-fixes  
							
							... 
							
							
							
							Activity stream background should use $color5 
							
						 
						
							2017-02-13 15:16:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Your Name 
								
							 
						 
						
							
							
							
							
								
							
							
								e4a7e8222e 
								
							 
						 
						
							
							
								
								Activity stream background should use $color5  
							
							
							
						 
						
							2017-02-13 12:31:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								df63461ff0 
								
							 
						 
						
							
							
								
								Add handler for salmons of undoing favourites  
							
							
							
						 
						
							2017-02-12 19:50:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								720ff55262 
								
							 
						 
						
							
							
								
								Adding more unit tests. Fixing Salmon slaps XML  
							
							
							
						 
						
							2017-02-12 17:30:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								446267d1bf 
								
							 
						 
						
							
							
								
								Deduplicate delete salmons (send only one per mentioned-account domain)  
							
							
							
						 
						
							2017-02-12 17:30:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								db814543c0 
								
							 
						 
						
							
							
								
								Take out private toot distribution out of PuSH again  
							
							
							
						 
						
							2017-02-12 01:31:04 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									shel 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									shel 
								
							 
						 
						
							
							
							
							
								
							
							
								3893ff1604 
								
							 
						 
						
							
							
								
								Add privacy disclaimer  
							
							... 
							
							
							
							Add variable for text of privacy disclaimer 
							
						 
						
							2017-02-11 16:47:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								94d2182717 
								
							 
						 
						
							
							
								
								Resolve issue with rendering authorize/reject Salmon slaps  
							
							
							
						 
						
							2017-02-11 19:42:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								31c633e528 
								
							 
						 
						
							
							
								
								Fix Status.permitted_for scope query  
							
							
							
						 
						
							2017-02-11 19:16:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								50660d54e8 
								
							 
						 
						
							
							
								
								Fix semantics of follow requests another slaps  
							
							
							
						 
						
							2017-02-11 17:13:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								446aad4ce2 
								
							 
						 
						
							
							
								
								Make PuSH only distribute to subscriptions that match follower domains  
							
							... 
							
							
							
							Allow PuSH to distribute private toots with that condition 
							
						 
						
							2017-02-11 15:41:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								dc851c922e 
								
							 
						 
						
							
							
								
								Mentions in private statuses allow mentioned people to see them  
							
							
							
						 
						
							2017-02-11 15:10:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								00b5731ecb 
								
							 
						 
						
							
							
								
								After FollowService, re-fetch remote account asynchronously, do nothing  
							
							... 
							
							
							
							if account lock info was up to date, otherwise re-do the FollowService
with now updated information 
							
						 
						
							2017-02-11 14:25:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e610555e10 
								
							 
						 
						
							
							
								
								Fix processing of incoming authorizations/rejections  
							
							
							
						 
						
							2017-02-11 13:55:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								514fdfa268 
								
							 
						 
						
							
							
								
								Don't PuSH-resubscribe if already subscribed  
							
							
							
						 
						
							2017-02-11 13:48:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								149887a0ff 
								
							 
						 
						
							
							
								
								Make follow requests federate  
							
							
							
						 
						
							2017-02-11 02:58:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d551e43a9b 
								
							 
						 
						
							
							
								
								Improve public tag page  
							
							
							
						 
						
							2017-02-10 23:21:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8cca6bc58c 
								
							 
						 
						
							
							
								
								Fix spoiler link color in muted context  
							
							
							
						 
						
							2017-02-10 23:01:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5c4c046132 
								
							 
						 
						
							
							
								
								Finish up moving colors from JSX to Sass ( #584 ,  #348 )  
							
							
							
						 
						
							2017-02-10 22:58:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d2619e0b53 
								
							 
						 
						
							
							
								
								Site title is now a setting  
							
							
							
						 
						
							2017-02-10 22:37:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								874fffb7dc 
								
							 
						 
						
							
							
								
								Merge branch 'master' into patch-3  
							
							
							
						 
						
							2017-02-10 19:15:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								73e388e0d8 
								
							 
						 
						
							
							
								
								Merge pull request  #617  from halcy/style-changes  
							
							... 
							
							
							
							Style changes 
							
						 
						
							2017-02-10 19:10:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shel 
								
							 
						 
						
							
							
							
							
								
							
							
								3f1f3d0827 
								
							 
						 
						
							
							
								
								Add link to other instances list  
							
							... 
							
							
							
							This should help federation 
							
						 
						
							2017-02-10 13:06:38 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lorenz Diener 
								
							 
						 
						
							
							
							
							
								
							
							
								cbb962fd77 
								
							 
						 
						
							
							
								
								Move more colours to scss  
							
							
							
						 
						
							2017-02-10 16:30:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lorenz Diener 
								
							 
						 
						
							
							
							
							
								
							
							
								c9f42a7b85 
								
							 
						 
						
							
							
								
								Move more inline colours to scss  
							
							
							
						 
						
							2017-02-10 15:35:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								0afed995ce 
								
							 
						 
						
							
							
								
								Fix the fix  
							
							
							
						 
						
							2017-02-09 21:22:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6331ed16e5 
								
							 
						 
						
							
							
								
								Fix   #614  - extra reply-boolean on statuses to account for cases when replied-to  
							
							... 
							
							
							
							status is not in the system at time of distribution; fix  #607  - reset privacy
settings to defaults when cancelling replies 
							
						 
						
							2017-02-09 20:25:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c424df5192 
								
							 
						 
						
							
							
								
								Progress on moving color styles to Sass  
							
							
							
						 
						
							2017-02-09 01:20:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								942a2e7d68 
								
							 
						 
						
							
							
								
								Fix reblogs not having content warnings forwarded  
							
							
							
						 
						
							2017-02-08 18:05:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								d96e031dfc 
								
							 
						 
						
							
							
								
								Fix   #611  - Layout setting in registrations controller  
							
							
							
						 
						
							2017-02-08 03:04:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Isabelle Knott 
								
							 
						 
						
							
							
							
							
								
							
							
								1d273e4430 
								
							 
						 
						
							
							
								
								Change blocked users icon to fa-ban in getting started view ( #608 )  
							
							
							
						 
						
							2017-02-07 23:48:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								02e91a96dd 
								
							 
						 
						
							
							
								
								Make streaming API use one pattern-matching redis pubsub connection  
							
							... 
							
							
							
							Refresh timelines when streaming API reconnects in the UI 
							
						 
						
							2017-02-07 14:39:08 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Evan Minto 
								
							 
						 
						
							
							
							
							
								
							
							
								28cbb6dc21 
								
							 
						 
						
							
							
								
								Add AS2 format to RABL files  
							
							
							
						 
						
							2017-02-06 17:00:55 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8a081ce588 
								
							 
						 
						
							
							
								
								Fix wrong prediction of whether toot will apear on public timeline in UI  
							
							
							
						 
						
							2017-02-07 00:40:35 +01:00