6d1c325167 
								
							 
						 
						
							
							
								
								Rename key to path in actions and reducers for settings (tootsuite pr  #6105 )  
							
							
							
						 
						
							2018-01-09 09:48:14 -06:00  
				
					
						
							
							
								 
						
							
								7f4374d97d 
								
							 
						 
						
							
							
								
								Fix newlines-to-spaces functionality (tootsuite pr  #6158 )  
							
							
							
						 
						
							2018-01-09 08:52:14 -06:00  
				
					
						
							
							
								 
						
							
								8a0e4bb9a4 
								
							 
						 
						
							
							
								
								Hide moved account's follow button in search result (tootsuite pr  #5913 )  
							
							
							
						 
						
							2018-01-09 08:50:55 -06:00  
				
					
						
							
							
								 
						
							
								5963630c63 
								
							 
						 
						
							
							
								
								Prevent duplicate load of favourites (tootsuite pr  #5931 )  
							
							
							
						 
						
							2018-01-09 08:46:35 -06:00  
				
					
						
							
							
								 
						
							
								6f5c0afe93 
								
							 
						 
						
							
							
								
								add index on statuses for /api/v1/accounts/:account_id/statuses ( #6202 )  
							
							
							
						 
						
							2018-01-09 15:00:19 +01:00  
				
					
						
							
							
								 
						
							
								eec6095e02 
								
							 
						 
						
							
							
								
								Russian language update ( #6227 )  
							
							... 
							
							
							
							* Russian language update
New strings translated, except "terms" key.
Should this be translated? Can it be changed by end user?
* Removed double quotes in "terms" -> "title" key 
							
						 
						
							2018-01-09 14:59:19 +01:00  
				
					
						
							
							
								 
						
							
								e780d5951b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-09 12:17:16 +00:00  
				
					
						
							
							
								 
						
							
								9f04b0d4b1 
								
							 
						 
						
							
							
								
								Weblate translations ( #6228 )  
							
							... 
							
							
							
							* Translated using Weblate (Catalan)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (523 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (525 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Arabic)
Currently translated at 80.3% (45 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 83.9% (47 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Persian)
Currently translated at 87.6% (460 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Japanese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ 
* Translated using Weblate (Catalan)
Currently translated at 99.2% (521 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 47.2% (248 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 48.0% (252 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (525 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Japanese)
Currently translated at 99.0% (520 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Persian)
Currently translated at 90.4% (475 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Polish)
Currently translated at 99.8% (524 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Polish)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ 
* Translated using Weblate (Polish)
Currently translated at 99.8% (524 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ 
* Translated using Weblate (Persian)
Currently translated at 99.8% (524 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Portuguese)
Currently translated at 48.3% (254 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 56.5% (297 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 59.4% (312 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ 
* Translated using Weblate (Arabic)
Currently translated at 91.0% (51 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Portuguese)
Currently translated at 59.6% (313 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (Japanese)
Currently translated at 99.6% (523 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Portuguese)
Currently translated at 67.6% (355 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Arabic)
Currently translated at 98.2% (55 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ 
* Translated using Weblate (Arabic)
Currently translated at 51.1% (22 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/ 
* Added translation using Weblate (Galician)
* Added translation using Weblate (Galician)
* Translated using Weblate (Galician)
Currently translated at 50.0% (1 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (43 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/ 
* Added translation using Weblate (Galician)
* Translated using Weblate (Galician)
Currently translated at 24.0% (126 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Added translation using Weblate (Portuguese)
* Translated using Weblate (Arabic)
Currently translated at 55.2% (290 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Galician)
Currently translated at 42.6% (224 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Portuguese)
Currently translated at 80.9% (425 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ 
* Translated using Weblate (Arabic)
Currently translated at 62.7% (27 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (75 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (56 of 56 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Portuguese)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 81.3% (427 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/ 
* Translated using Weblate (Galician)
Currently translated at 99.8% (524 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Portuguese)
Currently translated at 93.7% (492 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Portuguese)
Currently translated at 95.4% (501 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (525 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Galician)
Currently translated at 99.8% (524 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (525 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Portuguese)
Currently translated at 96.0% (504 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (257 of 257 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Arabic)
Currently translated at 69.7% (30 of 43 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ 
* Translated using Weblate (Portuguese)
Currently translated at 97.9% (514 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (523 of 525 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Normalize translations
Ran i18n-tasks normalize && yarn manage:translations
* Add back simple_forms removed by weblate
Weblate for some reason removed this files, add back to their previous
versions
* Remove linebreak on doorkeeper.pt.yml
PR review 
							
						 
						
							2018-01-09 20:30:28 +09:00  
				
					
						
							
							
								 
						
							
								ce7f4aef16 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master  
							
							
							
						 
						
							2018-01-08 23:20:39 -06:00  
				
					
						
							
							
								 
						
							
								ec0bdd6c1a 
								
							 
						 
						
							
							
								
								Merge pull request  #312  from glitch-soc/tag-sensitive-imgs  
							
							... 
							
							
							
							Show SENSITIVE tag on sensitive images (#267 ) 
							
						 
						
							2018-01-08 23:19:14 -06:00  
				
					
						
							
							
								 
						
							
								df04da098a 
								
							 
						 
						
							
							
								
								Merge pull request  #311  from glitch-soc/dont-show-solo-skins  
							
							... 
							
							
							
							Don't show skins selector when there's only one (#256 ) 
							
						 
						
							2018-01-08 23:18:30 -06:00  
				
					
						
							
							
								 
						
							
								7c719c567c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-09 05:17:13 +00:00  
				
					
						
							
							
								 
						
							
								488381ae2f 
								
							 
						 
						
							
							
								
								Merge pull request  #310  from glitch-soc/fix-thread-inheritance  
							
							... 
							
							
							
							Threads now inherit privacy directly (#309 ) 
							
						 
						
							2018-01-08 23:15:58 -06:00  
				
					
						
							
							
								 
						
							
								60433d03f5 
								
							 
						 
						
							
							
								
								Add missing comma  
							
							
							
						 
						
							2018-01-08 18:38:28 -08:00  
				
					
						
							
							
								 
						
							
								5d2ef7a616 
								
							 
						 
						
							
							
								
								Show SENSITIVE tag on sensitive images ( #267 )  
							
							
							
						 
						
							2018-01-08 18:25:29 -08:00  
				
					
						
							
							
								 
						
							
								44792de49a 
								
							 
						 
						
							
							
								
								Don't show skins selector when there's only one ( #256 )  
							
							
							
						 
						
							2018-01-08 16:45:32 -08:00  
				
					
						
							
							
								 
						
							
								824a790e63 
								
							 
						 
						
							
							
								
								Threads now inherit privacy directly ( #309 )  
							
							
							
						 
						
							2018-01-08 16:35:01 -08:00  
				
					
						
							
							
								 
						
							
								628358aeea 
								
							 
						 
						
							
							
								
								Add the author of a status to cc if reblogged ( #6226 )  
							
							... 
							
							
							
							This makes slightly more sense, and ensures that the author of a post is always referenced in the audience (which some servers might rely on). And the announce is POSTed to the author's inbox anyways. 
							
						 
						
							2018-01-09 00:47:43 +01:00  
				
					
						
							
							
								 
						
							
								fe6663ef50 
								
							 
						 
						
							
							
								
								Minor style fixes  
							
							
							
						 
						
							2018-01-08 11:49:08 -08:00  
				
					
						
							
							
								 
						
							
								c235711ffe 
								
							 
						 
						
							
							
								
								Refactor /api/web APIs to use the centralized axios instance ( #6223 )  
							
							... 
							
							
							
							Also adds the ability to decouple the centralized axios logic from the
state dispatcher 
							
						 
						
							2018-01-08 20:01:33 +01:00  
				
					
						
							
							
								 
						
							
								ff6ca8bdc6 
								
							 
						 
						
							
							
								
								Bump version to 2.1.3  
							
							
							
						 
						
							2018-01-08 19:15:31 +01:00  
				
					
						
							
							
								 
						
							
								90e568413b 
								
							 
						 
						
							
							
								
								Merge pull request  #308  from KnzkDev/fix/list-editor  
							
							... 
							
							
							
							Fix list editor design 
							
						 
						
							2018-01-08 13:08:11 -05:00  
				
					
						
							
							
								 
						
							
								ef0b7d1e76 
								
							 
						 
						
							
							
								
								fix list editor scss  
							
							
							
						 
						
							2018-01-09 02:50:24 +09:00  
				
					
						
							
							
								 
						
							
								65986b6f0b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master  
							
							
							
						 
						
							2018-01-08 09:48:42 -06:00  
				
					
						
							
							
								 
						
							
								2dc4fbbd1a 
								
							 
						 
						
							
							
								
								When pulling out max_toot_chars, handle nulls  
							
							... 
							
							
							
							flavours/glitch/util/initial_state is used in places where we want to
exhibit different behavior based on user preferences.  This means that
it's used in places where no preference is defined, i.e. on an
unauthenticated access.  All values exported from that module must
therefore expect that case; previously, the max chars value didn't.
Addresses #306 . 
							
						 
						
							2018-01-08 09:45:59 -06:00  
				
					
						
							
							
								 
						
							
								f839ac694c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-08 10:17:15 +00:00  
				
					
						
							
							
								 
						
							
								dbda87c31f 
								
							 
						 
						
							
							
								
								Revert  #5772  ( #6221 )  
							
							
							
						 
						
							2018-01-08 10:57:52 +01:00  
				
					
						
							
							
								 
						
							
								722b3f567f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-08 04:17:11 +00:00  
				
					
						
							
							
								 
						
							
								e4a241abef 
								
							 
						 
						
							
							
								
								Fix bad URL schemes being accepted ( #6219 )  
							
							... 
							
							
							
							* Fix actors accepting invalid URI schemes or different host between URI and URL
* Fix statuses accepting invalid URI scheme or different host to actor
* Adjust tests to new requirements
* Improve readability of mismatching_origin?/invalid_origin? methods 
							
						 
						
							2018-01-08 05:00:23 +01:00  
				
					
						
							
							
								 
						
							
								93555182c3 
								
							 
						 
						
							
							
								
								Do not display elephant friend in single-column layout ( #6222 )  
							
							
							
						 
						
							2018-01-08 03:50:53 +01:00  
				
					
						
							
							
								 
						
							
								0eff42d688 
								
							 
						 
						
							
							
								
								Move Article from supported to converted types ( #6218 )  
							
							
							
						 
						
							2018-01-08 00:21:14 +01:00  
				
					
						
							
							
								 
						
							
								f7c4d4464b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master  
							
							
							
						 
						
							2018-01-07 13:30:52 -06:00  
				
					
						
							
							
								 
						
							
								70c99a9f34 
								
							 
						 
						
							
							
								
								Use error pack when rendering error pages.   Fixes   #305 .  
							
							
							
						 
						
							2018-01-07 13:30:17 -06:00  
				
					
						
							
							
								 
						
							
								c2e1bfd9ae 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-07 15:17:13 +00:00  
				
					
						
							
							
								 
						
							
								1d92b90be9 
								
							 
						 
						
							
							
								
								Fix force_ssl conditional ( #6201 )  
							
							
							
						 
						
							2018-01-07 15:19:23 +01:00  
				
					
						
							
							
								 
						
							
								da809f9eec 
								
							 
						 
						
							
							
								
								Fix unintended cache ( #6214 )  
							
							
							
						 
						
							2018-01-07 15:12:59 +01:00  
				
					
						
							
							
								 
						
							
								c4d36d024c 
								
							 
						 
						
							
							
								
								Update Simplified Chinese translations ( #6215 )  
							
							... 
							
							
							
							* i18n: (zh-CN) Add translations of #6125 
* i18n: (zh-CN) Add translations of #6132 
* i18n: (zh-CN) Add translations of #6099 
* i18n: (zh-CN) Add translations of #6071 
* i18n: (zh-CN) Improve translations 
							
						 
						
							2018-01-07 17:32:50 +09:00  
				
					
						
							
							
								 
						
							
								5083311d64 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master  
							
							
							
						 
						
							2018-01-07 00:32:24 -06:00  
				
					
						
							
							
								 
						
							
								2af307bce4 
								
							 
						 
						
							
							
								
								Fix unintended cache  
							
							
							
						 
						
							2018-01-07 14:59:12 +09:00  
				
					
						
							
							
								 
						
							
								56312df73b 
								
							 
						 
						
							
							
								
								Z indexes and colors  
							
							
							
						 
						
							2018-01-06 18:38:19 -08:00  
				
					
						
							
							
								 
						
							
								7a93acd803 
								
							 
						 
						
							
							
								
								To 2.1.2  
							
							
							
						 
						
							2018-01-06 18:25:19 -08:00  
				
					
						
							
							
								 
						
							
								bcbdd4f88d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-07 02:17:10 +00:00  
				
					
						
							
							
								 
						
							
								9e97fbf0af 
								
							 
						 
						
							
							
								
								Translate Korean ( #6212 )  
							
							
							
						 
						
							2018-01-07 11:13:42 +09:00  
				
					
						
							
							
								 
						
							
								b5874c1428 
								
							 
						 
						
							
							
								
								Fixes to search dropdown  
							
							
							
						 
						
							2018-01-06 15:34:01 -08:00  
				
					
						
							
							
								 
						
							
								61ef8d643e 
								
							 
						 
						
							
							
								
								fix typo in vanilla names.yml  
							
							
							
						 
						
							2018-01-06 16:49:53 -05:00  
				
					
						
							
							
								 
						
							
								9f29fd31ba 
								
							 
						 
						
							
							
								
								fixed ctrl enter  
							
							
							
						 
						
							2018-01-06 19:58:04 +01:00  
				
					
						
							
							
								 
						
							
								53caab0c0b 
								
							 
						 
						
							
							
								
								Fix the always-threaded bug  
							
							
							
						 
						
							2018-01-06 19:55:53 +01:00  
				
					
						
							
							
								 
						
							
								b75a1ce326 
								
							 
						 
						
							
							
								
								tighten csp  
							
							
							
						 
						
							2018-01-06 18:49:03 +00:00  
				
					
						
							
							
								 
						
							
								d442cfa65c 
								
							 
						 
						
							
							
								
								Merge pull request  #303  from KnzkDev/ja-for-thread-mode  
							
							... 
							
							
							
							Update ja.js for #296  
							
						 
						
							2018-01-06 12:06:17 -05:00  
				
					
						
							
							
								 
						
							
								f5a4201ad8 
								
							 
						 
						
							
							
								
								Update ja.js  
							
							
							
						 
						
							2018-01-07 01:51:49 +09:00