4f3264d291 
					 
					
						
						
							
							Merge branch 'master' into boostspin  
						
						
						
						
					 
					
						2017-01-24 14:27:13 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4a146a0d18 
					 
					
						
						
							
							Make boost animation an SVG that uses SCSS colours  
						
						
						
						
					 
					
						2017-01-24 07:48:13 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						21c209636d 
					 
					
						
						
							
							Set isLoading false on timelines when request fails  
						
						
						
						
					 
					
						2017-01-24 13:04:12 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1f5792c834 
					 
					
						
						
							
							API now respects ?limit param as long as it's within 2x default limit  
						
						
						
						
					 
					
						2017-01-24 04:22:10 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d9022884c6 
					 
					
						
						
							
							Smarter infinite scroll  
						
						
						
						
					 
					
						2017-01-24 04:12:10 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bf0f6eb62d 
					 
					
						
						
							
							Implement a click-to-view spoiler system  
						
						
						
						
					 
					
						2017-01-23 21:07:40 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1761d3f9c3 
					 
					
						
						
							
							Fix mistake  
						
						
						
						
					 
					
						2017-01-23 22:18:08 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d00189b55a 
					 
					
						
						
							
							Domains with reject_media? set to true won't download avatars either  
						
						
						
						
					 
					
						2017-01-23 21:55:29 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8aab692034 
					 
					
						
						
							
							Less re-rendering  
						
						
						
						
					 
					
						2017-01-23 21:40:48 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						434cf8237e 
					 
					
						
						
							
							Optional domain block attribute that prevents media attachments from being downloaded  
						
						
						
						
					 
					
						2017-01-23 21:36:08 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f2e08ff568 
					 
					
						
						
							
							Remove unneeded block check  
						
						
						
						
					 
					
						2017-01-23 17:40:23 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6d98a73180 
					 
					
						
						
							
							Domain blocks now have varying severity - auto-suspend vs auto-silence  
						
						
						
						
					 
					
						2017-01-23 17:38:38 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ef2b924679 
					 
					
						
						
							
							Forgot to commit  
						
						
						
						
					 
					
						2017-01-23 17:18:41 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f855d645b2 
					 
					
						
						
							
							Move all hex colors in SASS to variables and all variations to darken/lighten  
						
						
						
						
					 
					
						2017-01-23 16:01:46 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d4d56b8af0 
					 
					
						
						
							
							Fix   #365 , 1/2 of  #408  - replace rails_autolink with URI.regexp, run link_hashtags on simplified_format  
						
						
						
						
					 
					
						2017-01-23 14:45:09 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						aa9c51a34c 
					 
					
						
						
							
							Fix a couple unhandled exceptions  
						
						
						
						
					 
					
						2017-01-23 13:56:57 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a1894786cf 
					 
					
						
						
							
							Potentially fix notifications issue  
						
						
						
						
					 
					
						2017-01-23 13:43:14 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						33fd8a7d95 
					 
					
						
						
							
							Textarea: fix clicking on name suggestions  
						
						... 
						
						
						
						This was broken in c3e9ba6a 
						
						
					 
					
						2017-01-22 22:57:58 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1953e3b6ed 
					 
					
						
						
							
							Fix inflection  
						
						
						
						
					 
					
						2017-01-22 23:08:51 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cea9fb31fe 
					 
					
						
						
							
							Mitigate inconsistent notifications  
						
						
						
						
					 
					
						2017-01-22 21:50:17 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3a4b5961be 
					 
					
						
						
							
							Method to fetch a single notification  
						
						
						
						
					 
					
						2017-01-21 22:14:13 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8f21f5522f 
					 
					
						
						
							
							Call uniq on the string version of mb_chars tags  
						
						
						
						
					 
					
						2017-01-21 21:02:42 +11:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1aae0cfc2c 
					 
					
						
						
							
							Fix   #475  - add space after autocomplete  
						
						
						
						
					 
					
						2017-01-20 21:39:41 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9bd3b11cfb 
					 
					
						
						
							
							Instead of refusing to create accounts, domain blocks auto-suspend new accounts from that domain  
						
						
						
						
					 
					
						2017-01-20 20:14:02 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						05abd977c1 
					 
					
						
						
							
							Fix preview cards layout, do preview card crawling for remote statuses  
						
						
						
						
					 
					
						2017-01-20 18:31:49 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7f63edd820 
					 
					
						
						
							
							Show visibility toggle on videos, show regardless of sensitivity  
						
						
						
						
					 
					
						2017-01-19 21:24:30 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c8e4b9c663 
					 
					
						
						
							
							No loading bars for cards, no failure if it 404s (that's expected)  
						
						
						
						
					 
					
						2017-01-20 01:07:53 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f0de621e76 
					 
					
						
						
							
							Fix   #463  - Fetch and display previews of URLs using OpenGraph tags  
						
						
						
						
					 
					
						2017-01-20 01:00:14 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8d0284f8d9 
					 
					
						
						
							
							Hide more non-essential loading bars  
						
						
						
						
					 
					
						2017-01-19 11:23:24 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9b0941182f 
					 
					
						
						
							
							Don't show loading bar when checking account timeline for newer stuff  
						
						
						
						
					 
					
						2017-01-19 11:01:01 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						46be4631ae 
					 
					
						
						
							
							Fix   #222  - Update followers count when following/unfollowing  
						
						... 
						
						
						
						Also, since the root component connects to the stream that updates home/notification columns,
there is pretty much no case for refreshing those columns beyond initial load. So, move the
loading of those columns into the root component, to prevent unneccessary reloads when switching tabs
on mobile or resizing desktop window between mobile/desktop layouts 
						
						
					 
					
						2017-01-19 10:54:18 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f051c2e813 
					 
					
						
						
							
							Fix statsd null backend not being initialized properly  
						
						
						
						
					 
					
						2017-01-19 09:37:07 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8b9206f7d9 
					 
					
						
						
							
							Try to avoid any potential loops  
						
						
						
						
					 
					
						2017-01-19 02:14:57 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						306eb6e9c9 
					 
					
						
						
							
							Add optional StatsD performance tracking  
						
						
						
						
					 
					
						2017-01-18 23:44:29 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7cfd5b680a 
					 
					
						
						
							
							Fix forgotten change of settings  
						
						
						
						
					 
					
						2017-01-17 20:37:54 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c468446f4c 
					 
					
						
						
							
							Fix boops?  
						
						
						
						
					 
					
						2017-01-17 20:28:32 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cde0476ca2 
					 
					
						
						
							
							Fix   #487  
						
						
						
						
					 
					
						2017-01-17 20:11:16 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						fcb5a85cdd 
					 
					
						
						
							
							Add sounds for notifications. Boop by @jk@mastodon.social  
						
						
						
						
					 
					
						2017-01-17 20:09:03 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6cf44ca92c 
					 
					
						
						
							
							Improve how the list entry Account component looks when target is blocked/follow is requested  
						
						
						
						
					 
					
						2017-01-16 19:36:32 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						889709a2a6 
					 
					
						
						
							
							Show 'do not display in public timeline' when replying to self  
						
						
						
						
					 
					
						2017-01-16 10:26:44 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1a33e4042e 
					 
					
						
						
							
							Fix upload file input being re-rendered needlessly  
						
						
						
						
					 
					
						2017-01-16 14:21:55 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7d53ee73f3 
					 
					
						
						
							
							Fix   #238  - Add "favourites" column  
						
						
						
						
					 
					
						2017-01-16 13:28:25 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						da5d366230 
					 
					
						
						
							
							Fix   #414  - Improve lightbox, add loading indicator  
						
						
						
						
					 
					
						2017-01-16 12:04:02 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2ae0fb4419 
					 
					
						
						
							
							Merge branch 'sensitive' of  https://github.com/blackle/mastodon  into blackle-sensitive  
						
						
						
						
					 
					
						2017-01-16 11:36:02 +01:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0439c7d58b 
					 
					
						
						
							
							Move follow requests link above logout link in getting started column  
						
						
						
						
					 
					
						2017-01-16 11:35:32 +01:00