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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							5c4c046132 
							
						 
					 
					
						
						
							
							Finish up moving colors from JSX to Sass ( #584 ,  #348 )  
						
						
						
						
					 
					
						2017-02-10 22:58:29 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							73e388e0d8 
							
						 
					 
					
						
						
							
							Merge pull request  #617  from halcy/style-changes  
						
						... 
						
						
						
						Style changes 
						
						
					 
					
						2017-02-10 19:10:15 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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 Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							8a081ce588 
							
						 
					 
					
						
						
							
							Fix wrong prediction of whether toot will apear on public timeline in UI  
						
						
						
						
					 
					
						2017-02-07 00:40:35 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							ac035108aa 
							
						 
					 
					
						
						
							
							Add "clear notifications" button, exclude posts from people who have blocked *you* from public/hashtag timelines  
						
						
						
						
					 
					
						2017-02-07 00:06:40 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							c8252759df 
							
						 
					 
					
						
						
							
							Add streaming API channels for local-only statuses  
						
						
						
						
					 
					
						2017-02-06 23:46:14 +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 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							0af3401553 
							
						 
					 
					
						
						
							
							Don't allow people to follow people they blocked without unblocking first  
						
						
						
						
					 
					
						2017-02-05 21:04:22 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							c5a08eb56e 
							
						 
					 
					
						
						
							
							Add link to blocked users to getting started page  
						
						
						
						
					 
					
						2017-02-05 19:22:05 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							920ba5fc4e 
							
						 
					 
					
						
						
							
							Fix   #61  - Add list of blocked users to the UI; clean up failed push notifications API  
						
						... 
						
						
						
						Try to fix Travis CI setup 
						
						
					 
					
						2017-02-05 19:18:11 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							87830f99e7 
							
						 
					 
					
						
						
							
							Fix   #552  - Replace image links with image icons in status text in the UI  
						
						
						
						
					 
					
						2017-02-05 15:25:55 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							ff2da21d3c 
							
						 
					 
					
						
						
							
							Fix content warning margin  
						
						
						
						
					 
					
						2017-02-05 14:50:58 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							b5bf807a34 
							
						 
					 
					
						
						
							
							Remove react-dnd as it was interfering with text selection. Move content  
						
						... 
						
						
						
						warning mentions preview into area where actual content would be 
						
						
					 
					
						2017-02-05 04:11:14 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							fb6aa7ad5c 
							
						 
					 
					
						
						
							
							Add tracking of delay to streaming API  
						
						
						
						
					 
					
						2017-02-05 03:19:04 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							6cdcac1396 
							
						 
					 
					
						
						
							
							Fix   #598  - arrow keys to navigate media;  fix   #481  - non-exact matches no longer  
						
						... 
						
						
						
						overshadow requirement for remote-lookup 
						
						
					 
					
						2017-02-05 03:01:23 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							44fad0160f 
							
						 
					 
					
						
						
							
							Add next/previous navigation in modal for media attachments  
						
						
						
						
					 
					
						2017-02-05 02:48:11 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							21972bb398 
							
						 
					 
					
						
						
							
							No replies filter on home timeline no longer hides self-replies  
						
						
						
						
					 
					
						2017-02-05 02:02:46 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							dbb7e5a644 
							
						 
					 
					
						
						
							
							Getting started on draggable columns  
						
						
						
						
					 
					
						2017-02-05 01:58:25 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							a012e4c7ff 
							
						 
					 
					
						
						
							
							Fix column settings not being scrollable on short screens  
						
						
						
						
					 
					
						2017-02-05 01:27:31 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							af007f2def 
							
						 
					 
					
						
						
							
							Display mentions prepended to the content warning  
						
						
						
						
					 
					
						2017-02-05 01:19:27 +01:00 
						 
				 
			
				
					
						
							
							
								hoodie 
							
						 
					 
					
						
						
						
						
							
						
						
							d4d3a10c25 
							
						 
					 
					
						
						
							
							untested!! spoiler hotfix for replies  
						
						... 
						
						
						
						untested, my vagrant is bugged again, submitted at gargron's request 
						
						
					 
					
						2017-02-04 17:33:46 -05:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							ccb8ac8573 
							
						 
					 
					
						
						
							
							Make the streaming API also handle websockets (because trying to get the browser EventSource interface to  
						
						... 
						
						
						
						work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead
of ActionCable like before. This means that if you are upgrading, you should set that up beforehand. 
						
						
					 
					
						2017-02-04 00:34:31 +01:00 
						 
				 
			
				
					
						
							
							
								hoodie 
							
						 
					 
					
						
						
						
						
							
						
						
							ac3f5a8316 
							
						 
					 
					
						
						
							
							easier comprehension of toot settings and properties ( #595 )  
						
						... 
						
						
						
						sounds complex, but really it just reorganizes the posting options and
adds a seperator line 
						
						
					 
					
						2017-02-03 15:54:23 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							1ee4a17f37 
							
						 
					 
					
						
						
							
							Add logging and filtering to the node.js streaming API  
						
						
						
						
					 
					
						2017-02-02 13:56:14 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							17ae7d132c 
							
						 
					 
					
						
						
							
							Prevent potential issue with public/hashtag statuses arriving after  
						
						... 
						
						
						
						they have been loaded and favourited/reblogged from another source
Since the status JSON returned from public/hashtag streams does not
contain favourited/reblogged attributes, merging them should not
override existing ones. 
						
						
					 
					
						2017-02-02 00:49:25 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							bf60f2898d 
							
						 
					 
					
						
						
							
							Fix   #529  - Make hashtag timelines show conversations, fix hashtag loading in the UI  
						
						
						
						
					 
					
						2017-01-31 22:35:38 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							8ef79d8dc9 
							
						 
					 
					
						
						
							
							Revert to animating avatars by default  
						
						
						
						
					 
					
						2017-01-31 19:16:35 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							52d68be157 
							
						 
					 
					
						
						
							
							Fix CORS issue on avatars resampling  
						
						
						
						
					 
					
						2017-01-31 19:06:13 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							86b3cb5120 
							
						 
					 
					
						
						
							
							Fix not reloading account/fetching relationship on newly independent components  
						
						
						
						
					 
					
						2017-01-30 22:35:36 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							f21e7d6ac0 
							
						 
					 
					
						
						
							
							Make profile header scroll along with contents. AccountTimeline, Followers and Following are no longer  
						
						... 
						
						
						
						nested inside a common parent (<Account>), instead they all embed <HeaderContainer /> 
						
						
					 
					
						2017-01-30 21:44:11 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							404d2050d3 
							
						 
					 
					
						
						
							
							Add explicit "load more" link to the bottom of StatusList and notifications  
						
						
						
						
					 
					
						2017-01-30 18:07:17 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							02cd2e42b2 
							
						 
					 
					
						
						
							
							Improve avatar resampling of non-animated canvas  
						
						
						
						
					 
					
						2017-01-30 15:43:48 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							9bde804ba2 
							
						 
					 
					
						
						
							
							Resolve confusion between ColumnBackButton and the slim version that  
						
						... 
						
						
						
						the public timeline has been using 
						
						
					 
					
						2017-01-30 15:22:04 +01:00 
						 
				 
			
				
					
						
							
							
								Billie Thompson 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b1571b1e1d 
							
						 
					 
					
						
						
							
							Add missing back button to "Follow Requests"  
						
						... 
						
						
						
						Currently we have the problem where the follow request button is missing
from the Follow request tab. This means that when you visit that tab you
either have to press the back button in the browser or re-enter the home
page, which breaks the app flow.
This will resolve that issue by adding a new back button to that tab,
in the same way that the public timeline, and favourites have. 
						
						
					 
					
						2017-01-29 18:53:51 +00:00 
						 
				 
			
				
					
						
							
							
								Misty De Meo 
							
						 
					 
					
						
						
						
						
							
						
						
							a30e669df2 
							
						 
					 
					
						
						
							
							Fix avatar scaling on high-DPI displays ( #573 )  
						
						
						
						
					 
					
						2017-01-29 14:26:50 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							04bce0cdf2 
							
						 
					 
					
						
						
							
							Clean up  
						
						
						
						
					 
					
						2017-01-27 20:38:35 +01:00