Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream 
						
					 
				 
				2017-09-28 09:18:35 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Upgrade Webpacker to version 3.0.1 ( #5122 ) 
						
					 
				 
				2017-09-27 14:41:54 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream 
						
					 
				 
				2017-09-28 09:18:35 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream 
						
					 
				 
				2017-09-28 09:18:35 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Fix redirect link on Tuning.md ( #1595 ) 
						
					 
				 
				2017-04-12 12:40:37 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Upgrade Webpacker to version 3.0.1 ( #5122 ) 
						
					 
				 
				2017-09-27 14:41:54 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Initial commit 
						
					 
				 
				2016-02-20 22:53:20 +01:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							[nanobox] Allow Full-size Uploads ( #4123 ) 
						
					 
				 
				2017-07-09 02:52:36 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream 
						
					 
				 
				2017-09-28 09:18:35 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream 
						
					 
				 
				2017-09-28 09:18:35 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									 
							
						
					 
				 
				
					
						
							
							Fix streaming API double-JSON-encoding status IDs for deletes ( #5069 ) 
						
					 
				 
				2017-09-24 15:31:03 +02:00  
		
			
			
			
			
				
					
						
							
								
								
									
									
									vendor /assets
									
								 
							
						
					 
				 
				
					
						
							
							Initial commit 
						
					 
				 
				2016-02-20 22:53:20 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							🎄 🔨  Force tree shake emojione ( #4202 ) 
						
					 
				 
				2017-07-14 20:30:12 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add heroku APT buildpack for scalingo. ( #3051 ) 
						
					 
				 
				2017-05-14 12:57:13 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Enable CodeClimate SCSS Lint checks ( #2886 ) 
						
					 
				 
				2017-05-07 20:47:31 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Remove Storybook ( #4397 ) 
						
					 
				 
				2017-07-27 22:30:27 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add final newline to locale files ( #2890 ) 
						
					 
				 
				2017-05-07 19:55:47 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							[nanobox] Add Automated Backups ( #4023 ) 
						
					 
				 
				2017-07-07 00:46:45 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Document REDIS_NAMESPACE ( #5038 ) 
						
					 
				 
				2017-09-22 06:44:39 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add recovery code support for two-factor auth ( #1773 ) 
						
					 
				 
				2017-04-15 13:26:03 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant 
						
					 
				 
				2017-01-26 19:22:59 +11:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Dev Tooling fixes (eslint/editorconfig) ( #1398 ) 
						
					 
				 
				2017-04-11 00:36:03 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Remove eslint-disable comments ( #4681 ) 
						
					 
				 
				2017-08-24 12:15:36 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Replace sprockets/browserify with Webpack ( #2617 ) 
						
					 
				 
				2017-05-03 02:04:16 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add .gitattributes file to avoid unwanted CRLF ( #3954 ) 
						
					 
				 
				2017-06-26 13:15:24 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Generate 500.html with assets:precompile, remove loading from Google Fonts ( #5067 ) 
						
					 
				 
				2017-09-25 04:04:04 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Added haml-lint and fix warnings ( #2773 ) 
						
					 
				 
				2017-05-08 03:35:25 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Remove Storybook ( #4397 ) 
						
					 
				 
				2017-07-27 22:30:27 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							update Node to 6.x LTS ( #1228 ) 
						
					 
				 
				2017-04-15 02:05:41 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add object-fit polyfill for Edge ( #4182 ) 
						
					 
				 
				2017-07-14 01:59:34 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs ( #3276 ) 
						
					 
				 
				2017-05-24 17:57:33 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Adding a Mention model, test stubs 
						
					 
				 
				2016-02-25 00:17:01 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Add handling of Linked Data Signatures in payloads ( #4687 ) 
						
					 
				 
				2017-08-26 13:47:38 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Bump ruby version to 2.4.2 ( #4958 ) 
						
					 
				 
				2017-09-18 04:55:57 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Enable CodeClimate SCSS Lint checks ( #2886 ) 
						
					 
				 
				2017-05-07 20:47:31 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Remove Storybook ( #4397 ) 
						
					 
				 
				2017-07-27 22:30:27 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Remove ubuntu-toolchain-r-test ( #5005 ) 
						
					 
				 
				2017-09-19 05:06:27 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Change logo URL for Heroku and Scalingo ( #4476 ) 
						
					 
				 
				2017-08-01 05:59:11 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Specify libicu explicitly in Aptfile ( #4920 ) 
						
					 
				 
				2017-09-13 09:30:13 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							[nanobox] Minor tweaks for 1.5 ( #4395 ) 
						
					 
				 
				2017-07-27 15:13:32 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							remove capistrano/faster_assets from Capfile ( #2737 ) 
						
					 
				 
				2017-05-03 12:14:52 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Introduce CODEOWNERS file ( #4670 ) 
						
					 
				 
				2017-08-23 15:21:00 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix rubocop issues, introduce usage of frozen literal to improve performance 
						
					 
				 
				2016-11-15 16:56:29 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Added link to docs website 
						
					 
				 
				2017-07-14 09:42:50 -07:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Switch docker-compose to version 3. ( #2747 ) 
						
					 
				 
				2017-05-04 15:56:05 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Some Dockerfile improvements ( #3182 ) 
						
					 
				 
				2017-05-20 20:01:05 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Update Yarn to version 1.1.0 ( #5125 ) 
						
					 
				 
				2017-09-28 04:51:36 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Upgrade Webpacker to version 3.0.1 ( #5122 ) 
						
					 
				 
				2017-09-27 14:41:54 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Upgrade Webpacker to version 3.0.1 ( #5122 ) 
						
					 
				 
				2017-09-27 14:41:54 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Adds note for instance admins. ( #1925 ) 
						
					 
				 
				2017-04-16 16:59:53 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Fix   #49  - License changed from GPL-2.0 to AGPL-3.0 
						
					 
				 
				2016-09-21 23:04:34 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							In detail status view, display attachment uncropped if there's only one ( #5054 ) 
						
					 
				 
				2017-09-24 05:58:30 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							More robust PuSH subscription refreshes ( #2799 ) 
						
					 
				 
				2017-05-05 02:23:01 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Upgrade Webpacker to version 3.0.1 ( #5122 ) 
						
					 
				 
				2017-09-27 14:41:54 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Initial commit 
						
					 
				 
				2016-02-20 22:53:20 +01:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Merge upstream ( #111 ) 
						
					 
				 
				2017-08-01 13:20:29 -07:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Change logo URL for Heroku and Scalingo ( #4476 ) 
						
					 
				 
				2017-08-01 05:59:11 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							Install libidn11-dev in Vagrant ( #4238 ) 
						
					 
				 
				2017-07-18 00:31:43 +02:00  
		
			
			
			
			
				
					
						
							
								 
				 
				
					
						
							
							In detail status view, display attachment uncropped if there's only one ( #5054 ) 
						
					 
				 
				2017-09-24 05:58:30 +02:00