nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								1b2e66ecfe 
								
							 
						 
						
							
							
								
								Merge pull request  #3  from Gargron/master  
							
							... 
							
							
							
							Merge 
							
						 
						
							2016-11-25 08:53:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ca342abbff 
								
							 
						 
						
							
							
								
								Fix bad reference  
							
							
							
						 
						
							2016-11-24 23:56:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								45c68c76d0 
								
							 
						 
						
							
							
								
								Fix forgotten reference  
							
							
							
						 
						
							2016-11-24 23:49:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								30f9e9e624 
								
							 
						 
						
							
							
								
								Remove Neo4J  
							
							
							
						 
						
							2016-11-24 23:46:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4bbec58034 
								
							 
						 
						
							
							
								
								Center header in account column, hide media in "muted" status components (notifications)  
							
							
							
						 
						
							2016-11-24 23:09:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								a353fc5c4d 
								
							 
						 
						
							
							
								
								Merge pull request  #265  from nclm/french-translation  
							
							... 
							
							
							
							Forgot to add one `fr` to make the French locale (hopefully) work 
							
						 
						
							2016-11-24 20:31:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								f447649d25 
								
							 
						 
						
							
							
								
								Merge branch 'master' into french-translation  
							
							
							
						 
						
							2016-11-24 20:13:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								d46c2e98ee 
								
							 
						 
						
							
							
								
								Update index.jsx  
							
							... 
							
							
							
							Forgot to add `fr` here. 
							
						 
						
							2016-11-24 20:12:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8ab2fcbb2c 
								
							 
						 
						
							
							
								
								Mini Profiler not working well, remove it  
							
							
							
						 
						
							2016-11-24 19:59:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alyssa Ross 
								
							 
						 
						
							
							
							
							
								
							
							
								ae142ab32a 
								
							 
						 
						
							
							
								
								Add .env.test  
							
							... 
							
							
							
							It took me ages to get Mastodon set up with the tests passing because
the environment variables I needed to define weren't documented and I
had to work them out one at a time.
This change adds a .env.test file, and makes it so it isn't ignored by
git. I think it makes sense for the .env.test file to be in git, since
there's nothing secret in it, but other approaches would be to have a
.env.test.sample (like the corresponding one for production), or to set
these values in a test helper, or to adapt the tests to work with
environments other than this one. I'd be happy to make these changes if
that would be preferred.
Being able to get set up and run the tests is a pretty important part of
being able to contribute to Mastodon (or your test coverage with
suffer!), so having some sort of solution like this one is vital. 
							
						 
						
							2016-11-24 17:48:25 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4af2805038 
								
							 
						 
						
							
							
								
								Add some OpenGraph tags to public statuses  
							
							
							
						 
						
							2016-11-24 18:28:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f613f2b84a 
								
							 
						 
						
							
							
								
								Only distribute statuses to followers who signed in in the last 2 weeks, add rake task for clearing feeds of inactive users  
							
							
							
						 
						
							2016-11-24 18:17:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								2152dfef02 
								
							 
						 
						
							
							
								
								Merge pull request  #242  from TazeTSchnitzel/media_uri_obfuscation  
							
							... 
							
							
							
							Rename media to avoid exposing filename (fixes  #207 ) 
							
						 
						
							2016-11-24 16:27:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alyssa Ross 
								
							 
						 
						
							
							
							
							
								
							
							
								cb06801b21 
								
							 
						 
						
							
							
								
								Extract filename obfuscation into module  
							
							
							
						 
						
							2016-11-24 00:30:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								90b3ff2518 
								
							 
						 
						
							
							
								
								Follow/unfollow button outside of dropdown, also make favs/reblogs update indicator instantly and  
							
							... 
							
							
							
							then adjust to failure later if the request fails 
							
						 
						
							2016-11-23 23:34:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f6d196255c 
								
							 
						 
						
							
							
								
								Fix unfollows not clearing reblogs, fix blocks not clearing reblogs and notifications,  
							
							... 
							
							
							
							skip ActionCable for follow/unfollow/block events, instead clear UI from
blocked account's posts instantly if block request succeeds. Add forgotten
i18n for sensitive content 
							
						 
						
							2016-11-23 22:57:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrea Faulds 
								
							 
						 
						
							
							
							
							
								
							
							
								66a20701b7 
								
							 
						 
						
							
							
								
								Rename media to avoid exposing filename ( fixes   #207 )  
							
							
							
						 
						
							2016-11-23 21:03:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								cda67241d4 
								
							 
						 
						
							
							
								
								Merge branch 'development'  
							
							
							
						 
						
							2016-11-23 19:01:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d78962c1ed 
								
							 
						 
						
							
							
								
								Cache accounts/:id/statuses and single statuses too  
							
							
							
						 
						
							2016-11-23 19:00:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								1c8ca7aed5 
								
							 
						 
						
							
							
								
								Adding content sensitivity toggle, spoilers for media  
							
							
							
						 
						
							2016-11-23 18:53:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrea Faulds 
								
							 
						 
						
							
							
							
							
								
							
							
								5dc7e130f8 
								
							 
						 
						
							
							
								
								Improve contrast for settings pages ( fixes   #173 )  
							
							
							
						 
						
							2016-11-23 17:37:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								48bd02124c 
								
							 
						 
						
							
							
								
								Merge pull request  #227  from nclm/french-translation  
							
							... 
							
							
							
							Missing lines in the French translation 
							
						 
						
							2016-11-23 17:18:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								862b82051a 
								
							 
						 
						
							
							
								
								Rename ‘Publier’ to ‘Pouet’ in French locale.  
							
							... 
							
							
							
							🎺  https://mastodon.social/users/Pierrec/updates/100589  
						
							2016-11-23 15:53:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								29bcf41808 
								
							 
						 
						
							
							
								
								Merge branch 'master' into french-translation  
							
							
							
						 
						
							2016-11-23 15:43:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								cb19a97e3e 
								
							 
						 
						
							
							
								
								Update doorkeeper.fr.yml  
							
							... 
							
							
							
							e 
							
						 
						
							2016-11-23 14:47:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								85e53eb127 
								
							 
						 
						
							
							
								
								Update doorkeeper.fr.yml  
							
							
							
						 
						
							2016-11-23 14:45:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								3c12f6f23b 
								
							 
						 
						
							
							
								
								Add content spoilers for media in sensitive-content statuses  
							
							
							
						 
						
							2016-11-23 11:23:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								65d6191147 
								
							 
						 
						
							
							
								
								Adding sensitive marker to statuses in API  
							
							
							
						 
						
							2016-11-23 10:46:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrea Faulds 
								
							 
						 
						
							
							
							
							
								
							
							
								5961d22b95 
								
							 
						 
						
							
							
								
								Explain application secrets ( #217 )  
							
							
							
						 
						
							2016-11-23 09:30:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c60df460af 
								
							 
						 
						
							
							
								
								Rename "publish" to "toot" in english locale, fix lightbox showing old image  
							
							... 
							
							
							
							before loading new one, cache notifications API, fix missing follow button
on public profiles 
							
						 
						
							2016-11-23 09:20:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								59d7fe4c05 
								
							 
						 
						
							
							
								
								Fix   #168  - Turn off e-mail notifications by default  
							
							
							
						 
						
							2016-11-23 08:39:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								dda6354c76 
								
							 
						 
						
							
							
								
								Implement includes caching for timelines APIs  
							
							
							
						 
						
							2016-11-23 08:34:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f6a975af8b 
								
							 
						 
						
							
							
								
								More query optimizations  
							
							
							
						 
						
							2016-11-22 23:18:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								30010a6dbd 
								
							 
						 
						
							
							
								
								Moving some counter queries out of subqueries in the API  
							
							
							
						 
						
							2016-11-22 22:59:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2945c5d3dd 
								
							 
						 
						
							
							
								
								Upgrade to latest Rails, which apparently improves ActionCable performance  
							
							
							
						 
						
							2016-11-22 22:26:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f07b0dc82f 
								
							 
						 
						
							
							
								
								Remove unneeded indices, improve error handling in background workers, don't needlessly reload reblogged status, send Devise e-mails asynchronously  
							
							
							
						 
						
							2016-11-22 17:32:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								28884e0860 
								
							 
						 
						
							
							
								
								Merge pull request  #2  from Gargron/master  
							
							... 
							
							
							
							Merge 
							
						 
						
							2016-11-22 17:26:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								71c7cd9f6c 
								
							 
						 
						
							
							
								
								Merge branch 'nclm-french-translation'  
							
							
							
						 
						
							2016-11-22 11:35:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								33ccf97c49 
								
							 
						 
						
							
							
								
								Fix broken locales  
							
							
							
						 
						
							2016-11-22 11:34:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								5902e95af9 
								
							 
						 
						
							
							
								
								Update fr.jsx  
							
							
							
						 
						
							2016-11-22 10:49:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								a731b0d15a 
								
							 
						 
						
							
							
								
								Update fr.yml  
							
							
							
						 
						
							2016-11-22 10:39:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								9725264490 
								
							 
						 
						
							
							
								
								Update simple_form.fr.yml  
							
							... 
							
							
							
							silenced mode + edits 
							
						 
						
							2016-11-22 10:32:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								1a9ad408e8 
								
							 
						 
						
							
							
								
								Merging code updates (Unlisted Mode)  
							
							
							
						 
						
							2016-11-22 10:25:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								1555bf8400 
								
							 
						 
						
							
							
								
								Adding French locale to mastodon.jsx  
							
							
							
						 
						
							2016-11-22 10:21:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								2a1b5185b3 
								
							 
						 
						
							
							
								
								Adding French locale to settings_helper.rb  
							
							
							
						 
						
							2016-11-22 10:20:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								74df3ba1d7 
								
							 
						 
						
							
							
								
								Local accounts can control "silenced" attribute which removes them from public timeline  
							
							
							
						 
						
							2016-11-21 23:06:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								1aeebf8de5 
								
							 
						 
						
							
							
								
								Adding French locale  
							
							
							
						 
						
							2016-11-21 22:46:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								d20ba4c34c 
								
							 
						 
						
							
							
								
								Importing doorkeeper.fr.yml  
							
							... 
							
							
							
							From https://github.com/doorkeeper-gem/doorkeeper-i18n/blob/master/rails/locales/fr.yml  
							
						 
						
							2016-11-21 22:39:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nicolas 
								
							 
						 
						
							
							
							
							
								
							
							
								324fe9b102 
								
							 
						 
						
							
							
								
								Importing devise.fr.yml  
							
							... 
							
							
							
							From https://gist.github.com/qsypoq/4cf3b858ff8242ffb013  
							
						 
						
							2016-11-21 22:34:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7e8f1061dd 
								
							 
						 
						
							
							
								
								Fix   #163  - No need for Safari chrome on iOS  
							
							
							
						 
						
							2016-11-21 22:33:44 +01:00