Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							ce273c08cd 
							
						 
					 
					
						
						
							
							Merge branch 'hoodiek-master'  
						
						
						
						
					 
					
						2017-02-05 01:29:00 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							8c0bc1309f 
							
						 
					 
					
						
						
							
							Add CORS to the streaming API  
						
						
						
						
					 
					
						2017-02-03 18:27:42 +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 
						 
				 
			
				
					
						
							
							
								James 
							
						 
					 
					
						
						
						
						
							
						
						
							7b7a356aed 
							
						 
					 
					
						
						
							
							fix extraneous text in 2fa readme ( #592 )  
						
						
						
						
					 
					
						2017-02-03 00:10:22 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							9cf7da4934 
							
						 
					 
					
						
						
							
							Add tootyfruity  
						
						
						
						
					 
					
						2017-02-02 20:27:53 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							9faf4c9dea 
							
						 
					 
					
						
						
							
							Update Sponsors.md  
						
						
						
						
					 
					
						2017-02-02 20:14:02 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							1511efc8d2 
							
						 
					 
					
						
						
							
							Update Sponsors.md  
						
						
						
						
					 
					
						2017-02-02 19:43:21 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							d33dfce34f 
							
						 
					 
					
						
						
							
							Updated list of top sponsors  
						
						
						
						
					 
					
						2017-02-02 19:40:15 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							df507f5e6e 
							
						 
					 
					
						
						
							
							Fix streaming API queries  
						
						
						
						
					 
					
						2017-02-02 17:10:59 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							889b814385 
							
						 
					 
					
						
						
							
							Fix bug  
						
						
						
						
					 
					
						2017-02-02 16:57:09 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							aa2fa227e9 
							
						 
					 
					
						
						
							
							Adding documentation for streaming API. Fixing filtering bug  
						
						
						
						
					 
					
						2017-02-02 16:35:06 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							61ce15d94b 
							
						 
					 
					
						
						
							
							Make node read the right .env file  
						
						
						
						
					 
					
						2017-02-02 16:11:36 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							d1a01dbbdd 
							
						 
					 
					
						
						
							
							Add redis configuration to streaming API  
						
						
						
						
					 
					
						2017-02-02 15:29:41 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							b6c922f169 
							
						 
					 
					
						
						
							
							Fix potential resource leaks in streaming server  
						
						
						
						
					 
					
						2017-02-02 15:20:31 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							0cfd3188b4 
							
						 
					 
					
						
						
							
							Add streaming API in Node.js  
						
						
						
						
					 
					
						2017-02-02 01:31:09 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							ede04cdb24 
							
						 
					 
					
						
						
							
							Move rendering of JSON payloads for public/hashtag timelines to  
						
						... 
						
						
						
						FanOutOnWriteService. The only recipient-specific part on them
is reblogged/favourited. But since only newly created statuses
appear on them, it is safe to assume that both attributes would
be false 
						
						
					 
					
						2017-02-02 00:39:17 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							1da0ce5c7c 
							
						 
					 
					
						
						
							
							Looks like log level :debug is required for activerecord times to be tracked  
						
						
						
						
					 
					
						2017-02-01 12:13:16 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							65402d9c09 
							
						 
					 
					
						
						
							
							Fix activerecord logging in production  
						
						
						
						
					 
					
						2017-02-01 11:34:50 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							8b9c537d5a 
							
						 
					 
					
						
						
							
							Fix elephant friend  
						
						
						
						
					 
					
						2017-01-31 19:08:24 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							52d68be157 
							
						 
					 
					
						
						
							
							Fix CORS issue on avatars resampling  
						
						
						
						
					 
					
						2017-01-31 19:06:13 +01:00 
						 
				 
			
				
					
						
							
							
								tom 
							
						 
					 
					
						
						
						
						
							
						
						
							b84d1533d4 
							
						 
					 
					
						
						
							
							Fix text overlapping image in Edge and on mobile ( #582 )  
						
						... 
						
						
						
						Changing the way the background image is positioned and the box is sized should fix problems with the text overlapping the image on mobile browsers and Edge. 
						
						
					 
					
						2017-01-31 19:06:03 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							c2fbd144cf 
							
						 
					 
					
						
						
							
							Add "open in web" link to detailed public status pages  
						
						
						
						
					 
					
						2017-01-30 23:01:37 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							a2a85e8549 
							
						 
					 
					
						
						
							
							Add capistrano to development environment  
						
						
						
						
					 
					
						2017-01-30 20:03:17 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							57159804b8 
							
						 
					 
					
						
						
							
							Merge branch 'PurpleBooth-add-missing-back-on-follow'  
						
						
						
						
					 
					
						2017-01-30 15:22:31 +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 
						 
				 
			
				
					
						
							
							
								James 
							
						 
					 
					
						
						
						
						
							
						
						
							b12bdd2aea 
							
						 
					 
					
						
						
							
							Add 2-FA instructions for non-technical users ( #580 )  
						
						
						
						
					 
					
						2017-01-29 19:26:27 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							2165a0ec63 
							
						 
					 
					
						
						
							
							Update some API docs  
						
						
						
						
					 
					
						2017-01-29 14:40:57 +01:00 
						 
				 
			
				
					
						
							
							
								Misty De Meo 
							
						 
					 
					
						
						
						
						
							
						
						
							a30e669df2 
							
						 
					 
					
						
						
							
							Fix avatar scaling on high-DPI displays ( #573 )  
						
						
						
						
					 
					
						2017-01-29 14:26:50 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							ff90a5ff84 
							
						 
					 
					
						
						
							
							Update sample .env  
						
						
						
						
					 
					
						2017-01-29 13:06:58 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							aa52d5fd1e 
							
						 
					 
					
						
						
							
							Add more links to main docs page  
						
						
						
						
					 
					
						2017-01-29 12:59:02 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							ca8a9d5941 
							
						 
					 
					
						
						
							
							Fix JSON formatting in docs  
						
						
						
						
					 
					
						2017-01-29 12:55:12 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							fe9306f346 
							
						 
					 
					
						
						
							
							Update docs with information about push notifications  
						
						
						
						
					 
					
						2017-01-29 12:53:50 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							e70e721a0d 
							
						 
					 
					
						
						
							
							Add tests for new API  
						
						
						
						
					 
					
						2017-01-29 12:35:55 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							83ccdeb87a 
							
						 
					 
					
						
						
							
							Fix tests  
						
						
						
						
					 
					
						2017-01-29 12:25:10 +01:00