Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							f1a73fd5f4 
							
						 
					 
					
						
						
							
							Outline white/grey/blue emojis  
						
						
						
						
					 
					
						2018-09-04 16:01:41 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							6e771bf680 
							
						 
					 
					
						
						
							
							Light theme overhaul  
						
						
						
						
					 
					
						2018-09-04 16:01:41 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							36f50be305 
							
						 
					 
					
						
						
							
							[Glitch] Add white outline to black emoji  
						
						... 
						
						
						
						Inspired from 0bfa0f237495249a322cd3a1100b394211755e8c 
						
						
					 
					
						2018-09-04 15:40:27 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							b6ce5fa3fb 
							
						 
					 
					
						
						
							
							Fix emoji autosuggest when using a CDN for assets  
						
						
						
						
					 
					
						2018-09-04 15:05:31 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							8622dccaf1 
							
						 
					 
					
						
						
							
							Disable focus points for letterboxed media  
						
						
						
						
					 
					
						2018-09-04 13:31:55 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							9998271a5b 
							
						 
					 
					
						
						
							
							Fix full-width margins  
						
						
						
						
					 
					
						2018-09-04 13:31:55 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							be644e3b7c 
							
						 
					 
					
						
						
							
							Media gallery styling closer to upstream's  
						
						
						
						
					 
					
						2018-09-04 13:31:55 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							8183d2ed55 
							
						 
					 
					
						
						
							
							[Glitch] Do not override ctrl/cmd+click in media gallery  
						
						
						
						
					 
					
						2018-09-04 13:31:55 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							bd437f8077 
							
						 
					 
					
						
						
							
							Add admin links to status and account menus ( fixes   #673 )  
						
						... 
						
						
						
						If the current logged-in user is an admin, add quick links to the admin
interface in account and toot dropdown menu. Suggestion by @ashkitten 
						
						
					 
					
						2018-09-03 18:19:11 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							6ad7dac791 
							
						 
					 
					
						
						
							
							Let the front-end know the current account is a moderator  
						
						
						
						
					 
					
						2018-09-03 18:19:11 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							b3fdd166e8 
							
						 
					 
					
						
						
							
							[Glitch] Skip VS15 (Emoji textual presentation)  
						
						... 
						
						
						
						Port a060beee726de5295e1f608231975a90b7709a0a to glitch-soc 
						
						
					 
					
						2018-09-03 18:18:50 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							8e862ecf8d 
							
						 
					 
					
						
						
							
							[Glitch] Add aria-label to floatingActionButton  
						
						... 
						
						
						
						Port 7c12c7b1246b991c68f4b51573538e02b3968beb to glitch-soc 
						
						
					 
					
						2018-09-03 18:18:39 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							27ee42299b 
							
						 
					 
					
						
						
							
							[Glitch] Inactive header in main profile to match column  
						
						... 
						
						
						
						Port 1bfe735d574fdbb01b1aea07db6c69fb3a32b90f to glitch-soc 
						
						
					 
					
						2018-09-03 18:18:24 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							6c233a04a0 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
	README.md
Discarded upstream changes to the README, kept our version. 
						
						
					 
					
						2018-09-03 14:33:06 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							e915bc3e9e 
							
						 
					 
					
						
						
							
							Fixes columns scrolling to top when opening media modal  
						
						... 
						
						
						
						Fixes  #700  
					
						2018-09-03 14:24:10 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							78b89e7a5d 
							
						 
					 
					
						
						
							
							Weblate translations (2018-09-02) ( #8582 )  
						
						... 
						
						
						
						* Translated using Weblate (Serbian)
Currently translated at 72.4% (499 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ 
* Translated using Weblate (Serbian)
Currently translated at 77.6% (535 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ 
* Translated using Weblate (Dutch)
Currently translated at 100,0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (689 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Corsican)
Currently translated at 99.7% (687 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (689 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ 
* Translated using Weblate (Serbian)
Currently translated at 72.3% (60 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ 
* Translated using Weblate (German)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ 
* Translated using Weblate (Serbian)
Currently translated at 92.8% (77 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ 
* Translated using Weblate (Serbian)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ 
 Језик писања? Нисам сигуран
* Translated using Weblate (Corsican)
Currently translated at 99.9% (688 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ 
* Translated using Weblate (Serbian)
Currently translated at 98.8% (330 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ 
* Translated using Weblate (Serbian)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ 
Favourites је веома тешко превести у овом контексту, па сам измислио "омиљеновање", а за boosts - подршка се чини као добра ријеч за превод.
* Translated using Weblate (Occitan)
Currently translated at 100,0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ 
* Translated using Weblate (Occitan)
Currently translated at 100,0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ 
* Translated using Weblate (Serbian)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ 
Favourites је веома тешко превести у овом контексту, па сам измислио "омиљеновање", а за boosts - подршка се чини као добра ријеч за превод.
* Translated using Weblate (German)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ 
* Translated using Weblate (German)
Currently translated at 99.7% (687 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ 
* Translated using Weblate (Serbian)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ 
* Translated using Weblate (Serbian)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ 
* i18n-tasks noramlize && yarn manage:translations 
						
						
					 
					
						2018-09-02 22:31:35 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							dc8eb5305f 
							
						 
					 
					
						
						
							
							Weblate translations (2018-09-02) ( #8577 )  
						
						... 
						
						
						
						* Translated using Weblate (Polish)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ 
* Added translation using Weblate (Tamil)
* Translated using Weblate (Greek)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ 
* Translated using Weblate (Corsican)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ 
* Translated using Weblate (Corsican)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (83 of 83 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ 
* Translated using Weblate (Romanian)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/ 
* Added translation using Weblate (Romanian)
* Added translation using Weblate (Romanian)
* Added translation using Weblate (Romanian)
* i18n-tasks normalize && yarn manage:translations
* Fix ro YML files 
						
						
					 
					
						2018-09-02 18:20:26 +02:00 
						 
				 
			
				
					
						
							
							
								Frederic Hemberger 
							
						 
					 
					
						
						
						
						
							
						
						
							7c12c7b124 
							
						 
					 
					
						
						
							
							Add aria-label to floatingActionButton ( #8574 )  
						
						
						
						
					 
					
						2018-09-02 15:51:06 +02:00 
						 
				 
			
				
					
						
							
							
								Alix R 
							
						 
					 
					
						
						
						
						
							
						
						
							b0e3fffa1f 
							
						 
					 
					
						
						
							
							Add Corsican locale data ( #8566 )  
						
						
						
						
					 
					
						2018-09-02 20:23:38 +09:00 
						 
				 
			
				
					
						
							
							
								Evgeny Petrov 
							
						 
					 
					
						
						
						
						
							
						
						
							2caeeb951f 
							
						 
					 
					
						
						
							
							[RU] Added translation for the following sections: ( #8570 )  
						
						... 
						
						
						
						* Added translation for the following sections:
• Empty followers, mutes, boosts etc. lists
• Keyboard shortcuts
• "About"
• Plurals for statuses, users and subscribers counters
• Relays, Custom CSS and suspensions settings.
• Remote interactions
• Other misc stuff
* i18n-tasks normalize 
						
						
					 
					
						2018-09-02 20:21:54 +09:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d97e383851 
							
						 
					 
					
						
						
							
							Weblate translations (2018-09-01) ( #8561 )  
						
						... 
						
						
						
						* Translated using Weblate (German)
Currently translated at 99.9% (687 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ 
* Translated using Weblate (German)
Currently translated at 100,0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ 
* Translated using Weblate (German)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ 
* Translated using Weblate (Japanese)
Currently translated at 99.9% (688 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Dutch)
Currently translated at 100,0% (689 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Japanese)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ 
* Translated using Weblate (Greek)
Currently translated at 99.9% (688 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Catalan)
Currently translated at 100,0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ 
* Translated using Weblate (Catalan)
Currently translated at 100,0% (689 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ 
* Translated using Weblate (Arabic)
Currently translated at 98.1% (676 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (French)
Currently translated at 99.9% (688 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ 
* Translated using Weblate (Persian)
Currently translated at 99.7% (687 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Welsh)
Currently translated at 7.3% (6 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Welsh)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ 
* Translated using Weblate (Welsh)
Currently translated at 15.5% (107 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ 
* Translated using Weblate (Welsh)
Currently translated at 1.6% (1 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cy/ 
* Translated using Weblate (Welsh)
Currently translated at 15.8% (109 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ 
* Translated using Weblate (French)
Currently translated at 99.9% (688 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ 
* Translated using Weblate (French)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ 
* Translated using Weblate (Occitan)
Currently translated at 99.9% (688 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Occitan)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ 
* Translated using Weblate (Danish)
Currently translated at 100,0% (689 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ 
* Translated using Weblate (Occitan)
Currently translated at 99.7% (333 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Czech)
Currently translated at 99.9% (688 of 689 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Added translation using Weblate (Romanian)
* Translated using Weblate (Romanian)
Currently translated at 47.9% (160 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/ 
* i18n-tasks normalize && yarn manage:translations 
						
						
					 
					
						2018-09-02 03:14:46 +02:00 
						 
				 
			
				
					
						
							
							
								M Somerville 
							
						 
					 
					
						
						
						
						
							
						
						
							a060beee72 
							
						 
					 
					
						
						
							
							Skip VS15 (Emoji textual presentation). ( #8553 )  
						
						... 
						
						
						
						Mastodon converts all Emoji to images, whether they have a VS15 after
them or not, but leaves the VS15 in the string, which is displayed as
a black box in Safari. 
						
						
					 
					
						2018-09-01 19:42:02 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							a74a7d5fe3 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2018-09-01 17:23:46 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							cc7adf7e84 
							
						 
					 
					
						
						
							
							Fix composer not displaying on chrome mobile ( fixes   #696 )  
						
						
						
						
					 
					
						2018-09-01 09:39:25 +02:00 
						 
				 
			
				
					
						
							
							
								trwnh 
							
						 
					 
					
						
						
						
						
							
						
						
							6a147f8377 
							
						 
					 
					
						
						
							
							Fix the display of missing lists ( #8523 )  
						
						... 
						
						
						
						* Fix the display of missing lists
See #6786  -- this fixes part of the issue pertaining to lists that don't exist. I copied the Column being returned from the missing status logic, which works fine. Prior to this, the missing lists logic would generate a column with no back button and with a broken layout. This doesn't fix the broken display of missing accounts -- the column construction pertaining to that logic happens in multiple external functions.
* import ColumnBackButton
missed the import with the first commit 
						
						
					 
					
						2018-09-01 03:36:36 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							530da545a5 
							
						 
					 
					
						
						
							
							[Glitch] Give focused status a sensible aria-label for screen readers  
						
						... 
						
						
						
						Port 248df68c36a2f1ffd9c214afe7d1b0c62b4a5f27 to glitch-soc 
						
						
					 
					
						2018-08-31 19:49:51 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							087dcf720e 
							
						 
					 
					
						
						
							
							[Glitch] Fix off-by-one error in aria-posinset  
						
						... 
						
						
						
						Port 885711afb97b772f7c970ed16e17de799a74c923 to glitch-soc 
						
						
					 
					
						2018-08-31 19:49:29 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							d8fbd74c47 
							
						 
					 
					
						
						
							
							[Glitch] Add aria-label to column regions  
						
						... 
						
						
						
						Port 66dbb59aa16981643e3bfa3f94d441bc3166eab3 to glitch-soc 
						
						
					 
					
						2018-08-31 19:49:29 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							6f75a9001f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml
Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml 
						
						
					 
					
						2018-08-31 19:10:57 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							c6942a5283 
							
						 
					 
					
						
						
							
							Add option to not automatically unfold content warnings matching a regexp  
						
						... 
						
						
						
						Fixes  #678  
					
						2018-08-31 18:35:03 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							5c400a2842 
							
						 
					 
					
						
						
							
							Allow text inputs in local settings dialog  
						
						
						
						
					 
					
						2018-08-31 18:35:03 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							9d2739d74d 
							
						 
					 
					
						
						
							
							Add a setting to automatically unfold all content warnings  
						
						
						
						
					 
					
						2018-08-31 18:35:03 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							130bdb5ee8 
							
						 
					 
					
						
						
							
							[Glitch] Show compose form on delete & redraft when in mobile layout  
						
						... 
						
						
						
						Port 025fbb8285cdedf495d9e4d015db611b0c622cbb to glitch-soc 
						
						
					 
					
						2018-08-31 18:33:46 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							0f1db47a7e 
							
						 
					 
					
						
						
							
							Fix search results on compose box  
						
						
						
						
					 
					
						2018-08-31 18:33:46 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							b4f548fa18 
							
						 
					 
					
						
						
							
							Fix account header showing on search page  
						
						
						
						
					 
					
						2018-08-31 18:33:46 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							4a686ddf8a 
							
						 
					 
					
						
						
							
							[Glitch] On the mobile UI, move the search column to the right  
						
						... 
						
						
						
						Port 20bb90ced60fdac4ca254b43dad5615b1549da26 to glitch-soc 
						
						
					 
					
						2018-08-31 18:33:46 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							4686b3fa76 
							
						 
					 
					
						
						
							
							[Glitch] Hide search from Compose on mobile devices  
						
						... 
						
						
						
						Port 0893b1669548858daee79ab1260fb98646a0b3fa to glitch-soc 
						
						
					 
					
						2018-08-31 18:33:46 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							37a00d4c1d 
							
						 
					 
					
						
						
							
							[Glitch] Add search item to tab bar for mobile devices  
						
						... 
						
						
						
						Port c9cbb8de703e321c0d152813a2e22471ffe5eef7 to glitch-soc 
						
						
					 
					
						2018-08-31 18:33:46 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							76a3f373e3 
							
						 
					 
					
						
						
							
							[Glitch] Use withRouter for TabsBar  
						
						... 
						
						
						
						Port 61e62757816cd8cfe38944d509f8ec13d7d86912 to glitch-soc 
						
						
					 
					
						2018-08-31 18:33:46 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							5f035a2a1a 
							
						 
					 
					
						
						
							
							[Glitch] Move "compose" on mobile to floating action button  
						
						... 
						
						
						
						Port e72db6d9dd53a9d44f641bdf6bce7e64548e7d94 to glitch-soc 
						
						
					 
					
						2018-08-31 18:33:46 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							70c308c4aa 
							
						 
					 
					
						
						
							
							[Glitch] When search enabled, display hint in search popout  
						
						... 
						
						
						
						Port 7901f9f63e156732ab10154c34f3c2d188471a9d to glitch-soc 
						
						
					 
					
						2018-08-31 18:33:46 +02:00 
						 
				 
			
				
					
						
							
							
								caasi Huang 
							
						 
					 
					
						
						
						
						
							
						
						
							55880c7098 
							
						 
					 
					
						
						
							
							Translate more messages to Traditional Chinese ( #8543 )  
						
						
						
						
					 
					
						2018-08-31 23:22:03 +09:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							dddf022aae 
							
						 
					 
					
						
						
							
							Weblate translations (2018-08-31) ( #8535 )  
						
						... 
						
						
						
						* Translated using Weblate (Portuguese (Brazil))
Currently translated at 95.8% (320 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.9% (686 of 687 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Japanese)
Currently translated at 92.8% (310 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ 
* Translated using Weblate (Greek)
Currently translated at 99.9% (686 of 687 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ 
* Translated using Weblate (Greek)
Currently translated at 98.8% (330 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ 
* Translated using Weblate (Japanese)
Currently translated at 92.8% (310 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ 
* Translated using Weblate (Dutch)
Currently translated at 100,0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Dutch)
Currently translated at 100,0% (687 of 687 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (687 of 687 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Occitan)
Currently translated at 100,0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ 
* Translated using Weblate (Occitan)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 99.9% (686 of 687 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Turkish)
Currently translated at 96.7% (323 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/tr/ 
* Translated using Weblate (French)
Currently translated at 99.0% (680 of 687 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ 
* Translated using Weblate (Arabic)
Currently translated at 97.4% (669 of 687 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Greek)
Currently translated at 99.9% (687 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Galician)
Currently translated at 100,0% (688 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Galician)
Currently translated at 100,0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ 
* Translated using Weblate (Czech)
Currently translated at 99.9% (687 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (Arabic)
Currently translated at 97.7% (672 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Danish)
Currently translated at 100,0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ 
* Translated using Weblate (Danish)
Currently translated at 100,0% (688 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ 
* Translated using Weblate (Danish)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ 
* Translated using Weblate (Dutch)
Currently translated at 100,0% (688 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ 
* Translated using Weblate (Persian)
Currently translated at 99.7% (686 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Polish)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ 
* Translated using Weblate (Arabic)
Currently translated at 97.8% (673 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 98.0% (674 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Thai)
Currently translated at 35.0% (241 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/th/ 
* Translated using Weblate (Chinese (Simplified))
Currently translated at 97.6% (326 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hans/ 
* Translated using Weblate (Italian)
Currently translated at 81.2% (559 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ 
* Translated using Weblate (Turkish)
Currently translated at 34.9% (240 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/tr/ 
* Translated using Weblate (Chinese (Simplified))
Currently translated at 86.6% (596 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hans/ 
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 88.4% (608 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ 
* Translated using Weblate (Bulgarian)
Currently translated at 15.3% (105 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/bg/ 
* Added translation using Weblate (Welsh)
* Translated using Weblate (Japanese)
Currently translated at 98.8% (680 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Danish)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ 
* Translated using Weblate (Danish)
Currently translated at 100.0% (688 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ 
* Translated using Weblate (Welsh)
Currently translated at 2.5% (17 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ 
* Translated using Weblate (Welsh)
Currently translated at 2.5% (17 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ 
* Translated using Weblate (Welsh)
Currently translated at 6.4% (44 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ 
* Translated using Weblate (Welsh)
Currently translated at 13.7% (94 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ 
* Translated using Weblate (Welsh)
Currently translated at 13.7% (94 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ 
* Translated using Weblate (Welsh)
Currently translated at 13.7% (94 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ 
* Translated using Weblate (French)
Currently translated at 100,0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ 
* Translated using Weblate (French)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ 
* Translated using Weblate (French)
Currently translated at 99.9% (687 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (334 of 334 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ 
* Translated using Weblate (Basque)
Currently translated at 98.5% (678 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ 
* Translated using Weblate (Occitan)
Currently translated at 97.2% (669 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Welsh)
Currently translated at 14.4% (99 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ 
* Translated using Weblate (Welsh)
Currently translated at 15.6% (107 of 688 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ 
* Added translation using Weblate (Welsh)
* Added translation using Weblate (Welsh)
* Added translation using Weblate (Welsh)
* Added translation using Weblate (Welsh)
* Added translation using Weblate (Welsh)
* i18n-tasks normalize && yarn manage:translations
* Fix empty cy YML files 
						
						
					 
					
						2018-08-31 04:28:29 +02:00 
						 
				 
			
				
					
						
							
							
								takayamaki 
							
						 
					 
					
						
						
						
						
							
						
						
							f5c052b5e6 
							
						 
					 
					
						
						
							
							refactor: getting-started__wrapper should contained in getting-started ( #8532 )  
						
						
						
						
					 
					
						2018-08-31 03:43:02 +02:00 
						 
				 
			
				
					
						
							
							
								M Somerville 
							
						 
					 
					
						
						
						
						
							
						
						
							1bfe735d57 
							
						 
					 
					
						
						
							
							Inactive header in main profile to match column. ( #8520 )  
						
						
						
						
					 
					
						2018-08-30 23:53:30 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							c20b27a9f4 
							
						 
					 
					
						
						
							
							Restrict querySelectorAll to the upload form component  
						
						
						
						
					 
					
						2018-08-30 13:20:37 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							1544ac4e27 
							
						 
					 
					
						
						
							
							Add confirmation dialog when posting media without description  
						
						... 
						
						
						
						Fixes  #211  
					
						2018-08-30 13:20:37 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							5ce6727669 
							
						 
					 
					
						
						
							
							[Glitch] Reduce padding of profile metadata boxes to allow more text  
						
						... 
						
						
						
						Port 9463bba5fb6873fa70e05f239079ee1a0072b70c to glitch-soc 
						
						
					 
					
						2018-08-29 19:28:59 +02:00 
						 
				 
			
				
					
						
							
							
								Finariel 
							
						 
					 
					
						
						
						
						
							
						
						
							3b372c0041 
							
						 
					 
					
						
						
							
							Update de.json ( #8515 )  
						
						... 
						
						
						
						"was gibt's neues" -> was gibt's Neues 
						
						
					 
					
						2018-08-29 22:39:34 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							171e54eb46 
							
						 
					 
					
						
						
							
							Add opt-in feature to have the spoilers field always on ( fixes   #634 )  
						
						
						
						
					 
					
						2018-08-29 14:29:36 +02:00