3abb0f7bc7 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						
						
						
					 
					
						2017-04-04 12:06:53 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						db4a41cf58 
					 
					
						
						
							
							Merge branch 'master' into master  
						
						
						
						
					 
					
						2017-04-04 08:41:46 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						dc89fc17cc 
					 
					
						
						
							
							updated translation  
						
						
						
						
					 
					
						2017-04-04 08:29:53 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b8243c1b49 
					 
					
						
						
							
							changed line 25 for better translation  
						
						
						
						
					 
					
						2017-04-04 08:26:59 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e81ba26be9 
					 
					
						
						
							
							More consistent typography  
						
						
						
						
					 
					
						2017-04-04 06:58:17 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c22388fc79 
					 
					
						
						
							
							Fix typo in Heroku guide  
						
						
						
						
					 
					
						2017-04-04 00:00:56 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						eb023beb49 
					 
					
						
						
							
							Fix   #808  - smaller elephant friend PNG for frontpage  
						
						
						
						
					 
					
						2017-04-04 02:03:16 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b510a56c0c 
					 
					
						
						
							
							Only call regeneration worker after first login after a 14 day break  
						
						
						
						
					 
					
						2017-04-04 02:00:10 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4c53af64f0 
					 
					
						
						
							
							Fix ActionController::Parameters in API issue  
						
						
						
						
					 
					
						2017-04-04 01:33:34 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f722bd2387 
					 
					
						
						
							
							Separate background jobs into different queues. ATTENTION: new queue "pull"  
						
						... 
						
						
						
						must be added to the Sidekiq invokation in your systemd file
The pull queue will handle link crawling, thread resolving, and OStatus
processing. Such tasks are more likely to hang for a longer time (due to
network requests) so it is more sensible to not make the "in-house" tasks
wait for them. 
						
						
					 
					
						2017-04-04 00:53:20 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ce1ca28594 
					 
					
						
						
							
							Changed "reblogs" to "boosts"  
						
						
						
						
					 
					
						2017-04-03 17:45:36 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5b6f4fdeb4 
					 
					
						
						
							
							Add octodon.social  
						
						
						
						
					 
					
						2017-04-03 23:05:03 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8232f76c48 
					 
					
						
						
							
							Add check for visibility.nil? even though it can't ever be, to check for race conditions  
						
						
						
						
					 
					
						2017-04-03 22:54:46 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3f30ae1f97 
					 
					
						
						
							
							accessibility fix  
						
						... 
						
						
						
						eanable focus on ClearColumnButton 
						
						
					 
					
						2017-04-03 22:45:29 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1ed37fae9b 
					 
					
						
						
							
							Add fern.surgeplay.com to the instances list  
						
						... 
						
						
						
						It's hard to tell if this is supposed to be alphabetically sorted or not. I put it after epiktistes since it starts with F - let me know if it should go elsewhere. 
						
						
					 
					
						2017-04-03 15:52:33 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cc451e1fcb 
					 
					
						
						
							
							update social.targaryen.house info  
						
						
						
						
					 
					
						2017-04-03 21:36:28 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0700521ef3 
					 
					
						
						
							
							added Esperanto (eo)  
						
						
						
						
					 
					
						2017-04-03 20:22:50 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						98a93aa07e 
					 
					
						
						
							
							Fix norwegian translation being malformed  
						
						
						
						
					 
					
						2017-04-03 19:50:55 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						68f829e11c 
					 
					
						
						
							
							Add basic logging of who resolved report  
						
						
						
						
					 
					
						2017-04-03 19:35:00 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						71458dc6df 
					 
					
						
						
							
							When taking action on a report (silence/suspend), it dismisses all other  
						
						... 
						
						
						
						reports for that user automatically 
						
						
					 
					
						2017-04-03 19:19:54 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ec8029a955 
					 
					
						
						
							
							Updated and fixed orthography  
						
						
						
						
					 
					
						2017-04-03 19:10:48 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7dd5ba42a3 
					 
					
						
						
							
							Updated and fixed german orthography  
						
						
						
						
					 
					
						2017-04-03 19:01:17 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b7c1b12367 
					 
					
						
						
							
							Make default admin UI page reports. Add admin UI for creating a domain block  
						
						
						
						
					 
					
						2017-04-03 18:55:06 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8a45a97e2e 
					 
					
						
						
							
							Add instances from instances.mastodon.xyz  
						
						... 
						
						
						
						Updated list with lots of instances that have been added to instances.mastodon.xyz but not this list 
						
						
					 
					
						2017-04-03 12:28:36 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f6e9251054 
					 
					
						
						
							
							Merge pull request  #777  from chriswk/master  
						
						... 
						
						
						
						Add Norwegian locale 
						
						
					 
					
						2017-04-03 18:06:37 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9738aaf5fb 
					 
					
						
						
							
							Merge pull request  #782  from wxcafe/patch-1  
						
						... 
						
						
						
						Adds social.wxcafe.net 
						
						
					 
					
						2017-04-03 18:06:16 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ce433e22f6 
					 
					
						
						
							
							Merge pull request  #784  from singingwolfboy/github-capitalized  
						
						... 
						
						
						
						GitHub should be capitalized 
						
						
					 
					
						2017-04-03 18:06:02 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5652f00d81 
					 
					
						
						
							
							GitHub should be capitalized  
						
						
						
						
					 
					
						2017-04-03 11:44:11 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d06c810b16 
					 
					
						
						
							
							Adds social.wxcafe.net  
						
						
						
						
					 
					
						2017-04-03 17:32:25 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5cb011b66b 
					 
					
						
						
							
							Add Norwegian locale  
						
						
						
						
					 
					
						2017-04-03 16:32:03 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						663e5378c0 
					 
					
						
						
							
							Merge pull request  #775  from JantsoP/master  
						
						... 
						
						
						
						Finnish Translation 
						
						
					 
					
						2017-04-03 15:04:51 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						65d667dc6c 
					 
					
						
						
							
							another typo. fuck me  
						
						
						
						
					 
					
						2017-04-03 14:56:13 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d3fde60297 
					 
					
						
						
							
							fixed an sneaky peaky tpy  
						
						
						
						
					 
					
						2017-04-03 14:54:53 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						85a8b62ca2 
					 
					
						
						
							
							add finnish translation  
						
						... 
						
						
						
						add finnish translation 
						
						
					 
					
						2017-04-03 14:43:07 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						97803600ed 
					 
					
						
						
							
							add finnish translation  
						
						... 
						
						
						
						add finnish translation 
						
						
					 
					
						2017-04-03 14:20:50 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a229840ffe 
					 
					
						
						
							
							fixed typo  
						
						
						
						
					 
					
						2017-04-03 14:16:03 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bfa99981e5 
					 
					
						
						
							
							Merge branch 'master' into master  
						
						
						
						
					 
					
						2017-04-03 13:50:57 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6501ffdadc 
					 
					
						
						
							
							add finnish translation  
						
						... 
						
						
						
						add finnish translation 
						
						
					 
					
						2017-04-03 13:35:12 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ae95f35fe6 
					 
					
						
						
							
							add finnish translation  
						
						... 
						
						
						
						add finnish translation 
						
						
					 
					
						2017-04-03 13:34:26 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						22f88b845a 
					 
					
						
						
							
							add finnish translation  
						
						... 
						
						
						
						add finnish translation 
						
						
					 
					
						2017-04-03 13:33:43 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						eabb86b124 
					 
					
						
						
							
							add finnish language  
						
						... 
						
						
						
						add finnish language 
						
						
					 
					
						2017-04-03 13:32:10 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b0f4c9b91f 
					 
					
						
						
							
							finnish translation  
						
						... 
						
						
						
						finnish translation 
						
						
					 
					
						2017-04-03 13:25:46 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f9b4f30de6 
					 
					
						
						
							
							updated final translation  
						
						... 
						
						
						
						updated final translation 
						
						
					 
					
						2017-04-03 13:07:09 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						01b79beca4 
					 
					
						
						
							
							Merge pull request  #769  from Angristan/patch-1  
						
						... 
						
						
						
						Improve french translation 
						
						
					 
					
						2017-04-03 12:59:41 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5d854f37b4 
					 
					
						
						
							
							Merge pull request  #764  from ticky/tweak-quick-start-area  
						
						... 
						
						
						
						Fix the position of the Mastodon mascot in the UI 
						
						
					 
					
						2017-04-03 12:59:16 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						92a0b3d73a 
					 
					
						
						
							
							Merge pull request  #765  from marrus-sh/mastodon-API-update  
						
						... 
						
						
						
						Update API docs 
						
						
					 
					
						2017-04-03 12:58:38 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2f7139c6b5 
					 
					
						
						
							
							Merge pull request  #768  from marvinkopf/mutedropdown  
						
						... 
						
						
						
						add mute option in status dropdown 
						
						
					 
					
						2017-04-03 12:53:49 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						87854745e9 
					 
					
						
						
							
							Create new translation file  
						
						... 
						
						
						
						Still in progress. Should be done shortly 
						
						
					 
					
						2017-04-03 12:42:09 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						69fc95a2f5 
					 
					
						
						
							
							Create Finnish translation for Mastodon  
						
						... 
						
						
						
						Create Finnish translation for Mastodon 
						
						
					 
					
						2017-04-03 12:09:33 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c97fc5c1f4 
					 
					
						
						
							
							Improve french translation  
						
						
						
						
					 
					
						2017-04-03 11:04:00 +02:00