Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								dad7cd6d77 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #8084 )  
							
							 
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-07-29 02:20:45 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								91aadec929 
								
							 
						 
						
							
							
								
								Resize images by area instead of fixed dimensions ( #8083 )  
							
							 
							
							... 
							
							
							
							To improve the way super tall or super ride images are treated, the
numbers remain the same, 1280x1280 and 400x400, but if an image
is less in one dimension than the other, the other can become larger
Thanks to @WAHa_06x36@mastodon.social for the tip 
							
						 
						
							2018-07-28 03:33:00 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a41c54afac 
								
							 
						 
						
							
							
								
								Double CircleCI's timeout for assets:precompile…  
							
							 
							
							
							
						 
						
							2018-07-27 10:38:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								d0853d1f3a 
								
							 
						 
						
							
							
								
								[Glitch] Add documentation for “p” hotkey  
							
							 
							
							... 
							
							
							
							Port ed50c2393a0f12f88f1102f8cf8beca3bf711158 to glitch-soc 
							
						 
						
							2018-07-26 22:19:01 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								56f5323194 
								
							 
						 
						
							
							
								
								Add hotkey variants to keyboard shortcuts description  
							
							 
							
							... 
							
							
							
							Port 89c6d2bd6bc014ca6487c8f2569f8252fb3ef5dc to glitch-soc 
							
						 
						
							2018-07-26 22:19:01 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								2042c03090 
								
							 
						 
						
							
							
								
								Merge pull request  #603  from ThibG/glitch-soc/merge-upstream  
							
							 
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-07-26 22:17:10 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3a4a87d9c0 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							 
							
							
							
						 
						
							2018-07-26 21:22:43 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								12eb48c85c 
								
							 
						 
						
							
							
								
								Prevent scrolling main frame when navigating in image gallery with arrow keys  
							
							 
							
							
							
						 
						
							2018-07-26 08:42:25 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								d2b918522e 
								
							 
						 
						
							
							
								
								Improve keyboard shortcuts descriptions ( #8066 )  
							
							 
							
							... 
							
							
							
							* Add hotkey variants to keyboard shortcuts description
* Add documentation for “p” hotkey
* yarn manage:translations 
							
						 
						
							2018-07-26 04:51:25 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								a2ed0630a2 
								
							 
						 
						
							
							
								
								Prevent scrolling main frame when navigating in image gallery with arrow keys ( #8073 )  
							
							 
							
							
							
						 
						
							2018-07-26 04:50:50 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eai 
								
							 
						 
						
							
							
							
							
								
							
							
								ff2e8c70c6 
								
							 
						 
						
							
							
								
								Fix .column-back-button line-height ( #8074 )  
							
							 
							
							
							
						 
						
							2018-07-26 04:49:45 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									abcang 
								
							 
						 
						
							
							
							
							
								
							
							
								258eba090b 
								
							 
						 
						
							
							
								
								Call address instead of exchange ( #8076 )  
							
							 
							
							
							
						 
						
							2018-07-26 04:49:28 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								288ac10da1 
								
							 
						 
						
							
							
								
								fix typo in  🇵🇱  ( #8075 )  
							
							 
							
							
							
						 
						
							2018-07-26 08:42:33 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									abcang 
								
							 
						 
						
							
							
							
							
								
							
							
								b46416fe47 
								
							 
						 
						
							
							
								
								Add secure option to additional cookie ( #8069 )  
							
							 
							
							
							
						 
						
							2018-07-25 18:49:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								ddaf5eeb3b 
								
							 
						 
						
							
							
								
								[Glitch] Use LoadingBar instead of blur to indicate that an image is loading  
							
							 
							
							... 
							
							
							
							Port 792362b806  to the glitch-soc flavour 
							
						 
						
							2018-07-24 21:20:18 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								443b660cd6 
								
							 
						 
						
							
							
								
								Use the same description string as upstream for the “x” hotkey  
							
							 
							
							
							
						 
						
							2018-07-24 21:15:21 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a2c595d0d0 
								
							 
						 
						
							
							
								
								Fix focusing search bar with hotkeys  
							
							 
							
							
							
						 
						
							2018-07-24 21:15:21 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5de267d6ff 
								
							 
						 
						
							
							
								
								Fix focusing composer textarea on “new toot” hotkey  
							
							 
							
							
							
						 
						
							2018-07-24 21:15:21 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b908e9b23a 
								
							 
						 
						
							
							
								
								Fix routing issues, especially keyboards shortcuts changing location  
							
							 
							
							
							
						 
						
							2018-07-24 21:14:50 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								2629ffb68a 
								
							 
						 
						
							
							
								
								Weblate translations (2018-07-25) ( #8065 )  
							
							 
							
							... 
							
							
							
							* Translated using Weblate (Italian)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/it/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ 
* Translated using Weblate (Danish)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ 
* Translated using Weblate (Occitan)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ 
* Translated using Weblate (Occitan)
Currently translated at 99.8% (642 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Slovak)
Currently translated at 97.2% (625 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Czech)
Currently translated at 5.1% (5 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (Italian)
Currently translated at 97.5% (80 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ 
* Translated using Weblate (Italian)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ 
* Translated using Weblate (Italian)
Currently translated at 83.5% (537 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ 
* Translated using Weblate (Esperanto)
Currently translated at 99.8% (642 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 98.7% (81 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ 
* Translated using Weblate (Galician)
Currently translated at 99.8% (661 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Japanese)
Currently translated at 95.1% (78 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ 
* Translated using Weblate (Persian)
Currently translated at 98.9% (655 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Japanese)
Currently translated at 98.7% (654 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 98.9% (655 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 99.0% (656 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 99.2% (657 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Danish)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ 
* Translated using Weblate (Danish)
Currently translated at 77.9% (516 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ 
* Translated using Weblate (Danish)
Currently translated at 74.1% (46 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/ 
* Translated using Weblate (Slovak)
Currently translated at 95.6% (633 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (661 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ 
* Translated using Weblate (Japanese)
Currently translated at 99.3% (658 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Slovak)
Currently translated at 96.2% (637 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ 
* Translated using Weblate (Greek)
Currently translated at 99.8% (661 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Japanese)
Currently translated at 99.5% (659 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 99.5% (659 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Persian)
Currently translated at 99.6% (660 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Occitan)
Currently translated at 99.6% (660 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Occitan)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ 
* Translated using Weblate (Japanese)
Currently translated at 99.5% (660 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Persian)
Currently translated at 99.6% (661 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Greek)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Occitan)
Currently translated at 99.6% (661 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Galician)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Occitan)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (663 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Added translation using Weblate (Asturian)
* Translated using Weblate (Danish)
Currently translated at 78.1% (518 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (663 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Greek)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Japanese)
Currently translated at 99.5% (660 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ 
* Translated using Weblate (German)
Currently translated at 95.1% (78 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ 
* Translated using Weblate (Asturian)
Currently translated at 4.0% (27 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/ 
* Translated using Weblate (Asturian)
Currently translated at 19.6% (130 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/ 
* Added translation using Weblate (Asturian)
* Added translation using Weblate (Asturian)
* Added translation using Weblate (Asturian)
* Added translation using Weblate (Asturian)
* Added translation using Weblate (Asturian)
* Translated using Weblate (Italian)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ 
* Translated using Weblate (Arabic)
Currently translated at 94.5% (627 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (German)
Currently translated at 96.9% (643 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ 
* Translated using Weblate (Japanese)
Currently translated at 99.6% (661 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Occitan)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (Arabic)
Currently translated at 95.1% (78 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Slovenian)
Currently translated at 1.0% (1 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sl/ 
* i18n-tasks normalize && i18n-tasks remove-unused && yarn manage:translations
* Add Asturian 
							
						 
						
							2018-07-24 20:47:13 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								faa14e76da 
								
							 
						 
						
							
							
								
								Display custom emoji in account notes in WebUI ( fixes   #595 )  
							
							 
							
							
							
						 
						
							2018-07-21 21:44:49 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								25a68179f5 
								
							 
						 
						
							
							
								
								Add CSS for the newly-introduced dashboard ( fixes   #592 )  
							
							 
							
							
							
						 
						
							2018-07-18 23:08:27 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								57b3874b47 
								
							 
						 
						
							
							
								
								[Glitch] Ensure container of React components has full width  
							
							 
							
							... 
							
							
							
							Port 8058ec5a13  to glitch-soc 
							
						 
						
							2018-07-18 22:38:55 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								b877a2365e 
								
							 
						 
						
							
							
								
								Merge pull request  #590  from ThibG/glitch-soc/merge-upstream  
							
							 
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-07-18 22:38:43 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e81eb34566 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							 
							
							
							
						 
						
							2018-07-18 21:54:51 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								107f4b89fb 
								
							 
						 
						
							
							
								
								Increase timeout for assets:precompile  
							
							 
							
							
							
						 
						
							2018-07-18 21:20:30 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								dd565707fa 
								
							 
						 
						
							
							
								
								Goodbye Travis CI, hello Circle CI? ( fixes   #559 )  
							
							 
							
							
							
						 
						
							2018-07-18 21:20:30 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								95a752365a 
								
							 
						 
						
							
							
								
								Disable threaded mode when canceling a reply ( fixes   #583 )  
							
							 
							
							
							
						 
						
							2018-07-18 16:42:00 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								61ed8b2532 
								
							 
						 
						
							
							
								
								Merge pull request  #585  from ThibG/glitch-soc/merge-upstream  
							
							 
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-07-18 09:17:20 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								8aa855c0f7 
								
							 
						 
						
							
							
								
								Weblate translations (2018-07-18) ( #8047 )  
							
							 
							
							... 
							
							
							
							* Translated using Weblate (Italian)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/it/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ 
* Translated using Weblate (Danish)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ 
* Translated using Weblate (Occitan)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ 
* Translated using Weblate (Occitan)
Currently translated at 99.8% (642 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Slovak)
Currently translated at 97.2% (625 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Czech)
Currently translated at 5.1% (5 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (Italian)
Currently translated at 97.5% (80 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ 
* Translated using Weblate (Italian)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ 
* Translated using Weblate (Italian)
Currently translated at 83.5% (537 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ 
* Translated using Weblate (Esperanto)
Currently translated at 99.8% (642 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 98.7% (81 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ 
* Translated using Weblate (Galician)
Currently translated at 99.8% (661 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Japanese)
Currently translated at 95.1% (78 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ 
* Translated using Weblate (Persian)
Currently translated at 98.9% (655 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Japanese)
Currently translated at 98.7% (654 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 98.9% (655 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 99.0% (656 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 99.2% (657 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Danish)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ 
* Translated using Weblate (Danish)
Currently translated at 77.9% (516 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ 
* Translated using Weblate (Danish)
Currently translated at 74.1% (46 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/ 
* Translated using Weblate (Slovak)
Currently translated at 95.6% (633 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (661 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ 
* Translated using Weblate (Japanese)
Currently translated at 99.3% (658 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Slovak)
Currently translated at 96.2% (637 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ 
* Translated using Weblate (Greek)
Currently translated at 99.8% (661 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Japanese)
Currently translated at 99.5% (659 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 99.5% (659 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Persian)
Currently translated at 99.6% (660 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Occitan)
Currently translated at 99.6% (660 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Occitan)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ 
* Translated using Weblate (Japanese)
Currently translated at 99.5% (660 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Persian)
Currently translated at 99.6% (661 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Greek)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Occitan)
Currently translated at 99.6% (661 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* yarn manage:translations && i18n-tasks normalize
* revert db/schema.rb 
							
						 
						
							2018-07-18 15:38:35 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								62b47edf17 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							 
							
							
							
						 
						
							2018-07-17 22:05:25 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a69426ba4e 
								
							 
						 
						
							
							
								
								Do not cause an error if domain_lists.blocks.next is undefined ( fixes   #572 )  
							
							 
							
							... 
							
							
							
							Port 3aaa8f1a95  to glitch-soc 
							
						 
						
							2018-07-17 21:54:54 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								7cc4e6b2b2 
								
							 
						 
						
							
							
								
								Process statuses on COMPOSE_SUBMIT_SUCCESS ( fixes   #579 )  
							
							 
							
							
							
						 
						
							2018-07-17 21:54:36 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								6eee447159 
								
							 
						 
						
							
							
								
								Merge pull request  #578  from ThibG/glitch-soc/merge-upstream  
							
							 
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2018-07-17 21:54:12 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								cc3a3f579a 
								
							 
						 
						
							
							
								
								Hide "A look inside" in mobile layout on frontpage ( #8044 )  
							
							 
							
							
							
						 
						
							2018-07-17 21:44:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8058ec5a13 
								
							 
						 
						
							
							
								
								Ensure container of React components has full width ( #8043 )  
							
							 
							
							... 
							
							
							
							Fix  #8018  
							
						 
						
							2018-07-17 18:54:07 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									abcang 
								
							 
						 
						
							
							
							
							
								
							
							
								dd5b6bf3bb 
								
							 
						 
						
							
							
								
								Update supported Node.js version ( #8041 )  
							
							 
							
							
							
						 
						
							2018-07-17 15:29:33 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8ccb57f8a6 
								
							 
						 
						
							
							
								
								Add missing translation for admin dashboard trends section ( #8040 )  
							
							 
							
							
							
						 
						
							2018-07-17 07:15:17 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								56fdbc04b3 
								
							 
						 
						
							
							
								
								Fix number of results returned from TrendingTags.get  
							
							 
							
							
							
						 
						
							2018-07-16 19:54:14 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d987567b39 
								
							 
						 
						
							
							
								
								Fix tag usage display on admin dashboard  
							
							 
							
							
							
						 
						
							2018-07-16 19:51:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2f6967913a 
								
							 
						 
						
							
							
								
								Display trending hashtags on admin dashboard ( #8038 )  
							
							 
							
							
							
						 
						
							2018-07-16 19:21:27 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								77d8396217 
								
							 
						 
						
							
							
								
								Fix ActivityPub::UpdateDistributionWorker regression ( #8039 )  
							
							 
							
							... 
							
							
							
							Regression from #7998  let to profile updates not sending 
							
						 
						
							2018-07-16 18:43:22 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								38f413e583 
								
							 
						 
						
							
							
								
								Fix activity:interactions counter to count all interactions ( #8037 )  
							
							 
							
							
							
						 
						
							2018-07-16 18:35:43 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								27be4fa311 
								
							 
						 
						
							
							
								
								Avoid loading rails-ujs twice on vanilla flavour  
							
							 
							
							
							
						 
						
							2018-07-16 16:42:52 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b751ec1c2e 
								
							 
						 
						
							
							
								
								Whitelist dat/ipfs/gopher links in sanitizer ( #8034 )  
							
							 
							
							... 
							
							
							
							Fix  #7994  
							
						 
						
							2018-07-16 22:17:43 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4ec907e413 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							 
							
							... 
							
							
							
							Conflicts:
	Dockerfile
	app/javascript/packs/common.js
	config/webpack/loaders/sass.js
	config/webpack/shared.js
	db/schema.rb
	package.json
	yarn.lock
A lot of the conflicts come from updating webpack.
Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.
Ported glitch changes to webpack 4.x 
							
						 
						
							2018-07-16 14:50:42 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								d1d46f914b 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #8032 )  
							
							 
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-07-16 19:23:27 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								26bd3742e9 
								
							 
						 
						
							
							
								
								Fix typo in Admin::DashboardController#index  
							
							 
							
							
							
						 
						
							2018-07-16 01:58:10 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d0b14eaee2 
								
							 
						 
						
							
							
								
								Add admin dashboard ( #8029 )  
							
							 
							
							
							
						 
						
							2018-07-16 01:11:53 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								eff09fbdff 
								
							 
						 
						
							
							
								
								Fix index detection a migration to revert index change ( #8026 )  
							
							 
							
							
							
						 
						
							2018-07-15 14:56:00 +02:00