Thibaut Girka 
							
						 
					 
					
						
						
							
						
						84a2587d44 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						 
						
						
						
						
					 
					
						2018-08-11 15:45:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						acb3d5b7aa 
					 
					
						
						
							
							Don't prevent opening links in tabs with keyboard modifiers  
						
						 
						
						... 
						
						
						
						Ctrl+click usually allows opening a link in a new tab. This
was prevented for hashtag or user links in toots. 
						
						
					 
					
						2018-08-11 15:29:08 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mélanie Chauvel (ariasuni) 
							
						 
					 
					
						
						
							
						
						7b5ea7270d 
					 
					
						
						
							
							Fix crash when clicking “Show more/less for all” when a toot is not visible ( #8118 )  
						
						 
						
						
						
						
					 
					
						2018-08-11 11:52:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
							
						
						e8b7f3f3e2 
					 
					
						
						
							
							Weblate translations (2018-08-11) ( #8167 )  
						
						 
						
						... 
						
						
						
						* Translated using Weblate (Japanese)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 98.5% (657 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 98.5% (657 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 99.8% (666 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 98.5% (657 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 99.8% (666 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/cs/ 
* Translated using Weblate (Czech)
Currently translated at 61.2% (38 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/ 
* Translated using Weblate (Ukrainian)
Currently translated at 51.2% (42 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/uk/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/ 
* Translated using Weblate (Galician)
Currently translated at 99.8% (666 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (666 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (667 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Ukrainian)
Currently translated at 99.6% (306 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/uk/ 
* Translated using Weblate (Czech)
Currently translated at 67.0% (55 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ 
* Translated using Weblate (Ukrainian)
Currently translated at 97.0% (647 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/ 
* Translated using Weblate (Ukrainian)
Currently translated at 97.1% (648 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ 
* Translated using Weblate (Czech)
Currently translated at 18.3% (18 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/ 
* Translated using Weblate (Danish)
Currently translated at 79.3% (529 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ 
* Translated using Weblate (Czech)
Currently translated at 61.2% (60 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% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/ 
* Translated using Weblate (Occitan)
Currently translated at 99.7% (667 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (German)
Currently translated at 96.5% (646 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ 
* Translated using Weblate (Japanese)
Currently translated at 99.7% (667 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Czech)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ 
* Translated using Weblate (Corsican)
Currently translated at 99.3% (305 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ 
* Translated using Weblate (Corsican)
Currently translated at 92.2% (617 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ 
* Translated using Weblate (Telugu)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/ 
* Translated using Weblate (Arabic)
Currently translated at 91.4% (75 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 92.9% (622 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Danish)
Currently translated at 92.8% (91 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/ 
* Translated using Weblate (Greek)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Danish)
Currently translated at 82.0% (549 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Korean)
Currently translated at 98.2% (657 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ 
* Translated using Weblate (German)
Currently translated at 97.7% (654 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ 
* Translated using Weblate (Corsican)
Currently translated at 98.5% (659 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ 
* Translated using Weblate (Corsican)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/ 
* Translated using Weblate (Corsican)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ 
* Translated using Weblate (Corsican)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/co/ 
* Translated using Weblate (French)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ 
* Translated using Weblate (Basque)
Currently translated at 96.2% (644 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ 
* Translated using Weblate (Basque)
Currently translated at 90.2% (74 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ 
* Translated using Weblate (Basque)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ 
* Translated using Weblate (Czech)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/cs/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (Asturian)
Currently translated at 29.8% (200 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/ 
* Translated using Weblate (Greek)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/ 
* Translated using Weblate (German)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/de/ 
* 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 96.3% (79 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ 
* Translated using Weblate (German)
Currently translated at 99.7% (667 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ 
* Translated using Weblate (German)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ 
* Translated using Weblate (German)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/de/ 
* Translated using Weblate (French)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/ 
* Translated using Weblate (German)
Currently translated at 97.5% (80 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ 
* Translated using Weblate (French)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ 
* Translated using Weblate (French)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ 
* Translated using Weblate (German)
Currently translated at 98.7% (81 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ 
* Translated using Weblate (German)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ 
* Translated using Weblate (German)
Currently translated at 98.7% (81 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ 
* Translated using Weblate (German)
Currently translated at 98.7% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ 
* i18n-tasks normalize && i18n-tasks remove-unused
* yarn manage:translations
* re-add simple_form.uk.yml
* remove ar.simple_form.hints.defaults.*.one 
						
						
					 
					
						2018-08-11 14:51:30 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcin Mikołajczak 
							
						 
					 
					
						
						
							
						
						3d7979c2ca 
					 
					
						
						
							
							i18n: Update Polish translation ( #8155 )  
						
						 
						
						... 
						
						
						
						* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in >
* i18n-tasks normalize && yarn manage:translations 
						
						
					 
					
						2018-08-11 07:52:36 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evgeny Petrov 
							
						 
					 
					
						
						
							
						
						d2e0818d5a 
					 
					
						
						
							
							[RU] Updated translation ( #8164 )  
						
						 
						
						
						
						
					 
					
						2018-08-11 06:39:52 +09:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						7067b64de3 
					 
					
						
						
							
							Implement public profile endorsements in glitch-soc  
						
						 
						
						... 
						
						
						
						Port WebUI changes from f2404de871  to glitch-soc 
						
						
					 
					
						2018-08-10 16:25:46 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						4e66e0ac04 
					 
					
						
						
							
							Merge upstream SCSS changes for /about, /about/more and /terms  
						
						 
						
						... 
						
						
						
						Port various commits to glitch-soc, mainly commits
0dcc1950d1  and
5b8603879f . 
						
						
					 
					
						2018-08-10 16:22:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						16a4a333a2 
					 
					
						
						
							
							Merge upstream styling for public profile endorsements  
						
						 
						
						... 
						
						
						
						Port the SCSS part of f2404de871  to glitch-soc 
						
						
					 
					
						2018-08-10 16:22:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						e5a603206d 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						 
						
						... 
						
						
						
						Conflicts:
	app/controllers/accounts_controller.rb
	app/javascript/mastodon/locales/pl.json
	app/views/about/more.html.haml
Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.
Conflicts in `pl.json` resolved by taking upstream's changes.
Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes. 
						
						
					 
					
						2018-08-10 16:22:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						5b8603879f 
					 
					
						
						
							
							Adjust responsive design for /about/more and /terms ( #8158 )  
						
						 
						
						... 
						
						
						
						Follow-up to #8142  
						
						
					 
					
						2018-08-10 06:43:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						0dcc1950d1 
					 
					
						
						
							
							Update /terms and /about/more to use public layout ( #8142 )  
						
						 
						
						
						
						
					 
					
						2018-08-09 12:58:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						f2404de871 
					 
					
						
						
							
							Public profile endorsements (accounts picked by profile owner) ( #8146 )  
						
						 
						
						
						
						
					 
					
						2018-08-09 09:56:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Evgeny Petrov 
							
						 
					 
					
						
						
							
						
						80176a3814 
					 
					
						
						
							
							[RU] Translation update: ( #8147 )  
						
						 
						
						... 
						
						
						
						* [RU] Translation update:
• Added translation to Welcome timeline
• Doorkeeper: changed date format to more common in Russia
• Doorkeeper: added translation to scopes
• Added translation to Dashboard settings (I didn't have a chance to test it on Live server, so some strings may be a bit incorrect)
• Added translation to Relays settings
• Added translation to Filters settings
• Some other small fixes and improvements
* Quoted string for "joined" key to avoid mapping error
* [RU] Changed "повторить" (repeat) to "исправить" (change, fix) for a more correct translation.
* i18n-tasks normalize 
						
						
					 
					
						2018-08-09 08:50:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						d974c94478 
					 
					
						
						
							
							Remove protocol handler registration ( #8127 )  
						
						 
						
						... 
						
						
						
						Browser UI too confusing / scares people, protocol URIs not used much 
						
						
					 
					
						2018-08-08 21:12:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						7d1dd59496 
					 
					
						
						
							
							Good bye, CW rainbows  
						
						 
						
						... 
						
						
						
						Accessibility issues largely outweigh the joke and consistency with upstream. 
						
						
					 
					
						2018-08-07 18:49:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						c700778922 
					 
					
						
						
							
							Scroll to linked status in public status view  
						
						 
						
						
						
						
					 
					
						2018-08-07 16:58:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ThibG 
							
						 
					 
					
						
						
							
						
						1ab8b4b8ea 
					 
					
						
						
							
							Scroll to linked status in public status view ( fixes   #7884 ) ( #8130 )  
						
						 
						
						... 
						
						
						
						When there is a single detailed status on a public page, scroll to it and
replace the history state to not scroll back on refresh (simulates # anchors). 
						
						
					 
					
						2018-08-06 15:16:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						617c3a8006 
					 
					
						
						
							
							Restore glitch-soc's 500 characters limit for bios ( fixes   #625 )  
						
						 
						
						
						
						
					 
					
						2018-08-06 08:20:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						5e6cec4a40 
					 
					
						
						
							
							Import upstream's emojify function in settings.js  
						
						 
						
						... 
						
						
						
						This fixes updating the profile preview when changing display name. 
						
						
					 
					
						2018-08-05 12:57:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcin Mikołajczak 
							
						 
					 
					
						
						
							
						
						23b22d0dff 
					 
					
						
						
							
							i18n: Make Polish translation more gender neutral + update ( #8119 )  
						
						 
						
						... 
						
						
						
						Signed-off-by: Marcin Mikołajczak <me@m4sk.in > 
						
						
					 
					
						2018-08-03 00:09:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						ed69117048 
					 
					
						
						
							
							Fix styling of toot prepended text on public profiles  
						
						 
						
						... 
						
						
						
						Fixes how “Pinned toot”, “… boosted” etc. are styled on public profiles. 
						
						
					 
					
						2018-08-02 12:43:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						a0d0111979 
					 
					
						
						
							
							Fix toot styling on public pages  
						
						 
						
						... 
						
						
						
						The public pages now use CSS from the WebUI to style toots, but the glitch-soc
UI is widely different. Hack around that for now by hardcoding upstream-like
values. 
						
						
					 
					
						2018-08-01 00:18:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						7ab46b73bd 
					 
					
						
						
							
							Reintroduce glitch-soc avatar styling in public pages  
						
						 
						
						
						
						
					 
					
						2018-08-01 00:18:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						a3dd2deda3 
					 
					
						
						
							
							[Glitch] Do not hide hashtag timeline in mobile view, make it full-window  
						
						 
						
						... 
						
						
						
						Port 13ac8ca66a  to glitch-soc 
						
						
					 
					
						2018-08-01 00:18:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						175c2155a9 
					 
					
						
						
							
							[Glitch] Compensate for scrollbar disappearing when media modal  
						
						 
						
						... 
						
						
						
						Port 60df87f6f0  to glitch-soc 
						
						
					 
					
						2018-08-01 00:18:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						d2b3eebe00 
					 
					
						
						
							
							[Glitch] Show media modal on public timeline  
						
						 
						
						... 
						
						
						
						Port e0b1e17bd0  to glitch-soc 
						
						
					 
					
						2018-08-01 00:18:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						5cd7fe21bf 
					 
					
						
						
							
							[Glitch] Add missing formatting to the text in hero widget  
						
						 
						
						... 
						
						
						
						Port 1d773b3a46  to glitch-soc 
						
						
					 
					
						2018-08-01 00:18:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						d894cdc93f 
					 
					
						
						
							
							Port profile redesign to glitch-soc  
						
						 
						
						... 
						
						
						
						Port bb71538bb5  to glitch-soc 
						
						
					 
					
						2018-08-01 00:18:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						c1c514ca70 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						 
						
						... 
						
						
						
						Manually-resolved conflicts:
	.circleci/config.yml
	app/controllers/accounts_controller.rb
	app/controllers/auth/passwords_controller.rb
	app/controllers/statuses_controller.rb
	app/javascript/packs/public.js
	app/models/media_attachment.rb
	app/views/stream_entries/_content_spoiler.html.haml
	app/views/stream_entries/_media.html.haml
	config/locales/en.yml
	config/locales/ja.yml
	config/locales/pl.yml
	lib/mastodon/version.rb
Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.
Translation strings for glitch-soc's keyword mutes were dropped.
Everything else was mostly “take both”. 
						
						
					 
					
						2018-08-01 00:18:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						88b593a63f 
					 
					
						
						
							
							Drop glitch-style account bio fields  
						
						 
						
						... 
						
						
						
						Upstream's implementation has been merged a while ago and is the preferred
way to set fields, as it is the only one compatible with upstream and is
more user-friendly.
This commit deletes the legacy glitch-soc FrontMatter functionality in order
to clean up the code and make it easier to maintain. 
						
						
					 
					
						2018-07-31 16:26:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						13ac8ca66a 
					 
					
						
						
							
							Do not hide hashtag timeline in mobile view, make it full-window ( #8093 )  
						
						 
						
						
						
						
					 
					
						2018-07-31 02:54:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						60df87f6f0 
					 
					
						
						
							
							Compensate for scrollbar disappearing when media modal visible ( #8100 )  
						
						 
						
						... 
						
						
						
						* Compensate for scrollbar disappearing when media modal visible
Make auth pages backgrounds lighter
* Fix typo 
						
						
					 
					
						2018-07-31 01:14:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						1bae4c4f83 
					 
					
						
						
							
							[Glitch] Resize images by area instead of fixed dimensions  
						
						 
						
						... 
						
						
						
						Port WebUI part of 0fb0037ca7  to glitch-soc 
						
						
					 
					
						2018-07-30 19:30:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						5f1bdca4c8 
					 
					
						
						
							
							Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream  
						
						 
						
						... 
						
						
						
						Merge upstream changes right before the public profile redesign. 
						
						
					 
					
						2018-07-30 14:39:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						b02bfe86ce 
					 
					
						
						
							
							Don't reset scroll position when opening a modal  
						
						 
						
						
						
						
					 
					
						2018-07-30 14:32:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						5d060cb6e4 
					 
					
						
						
							
							Allow modals to be closed by pressing “back”  
						
						 
						
						
						
						
					 
					
						2018-07-30 14:32:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						3eb3c21327 
					 
					
						
						
							
							Treat the App Setting link as a proper link ( fixes   #375 )  
						
						 
						
						
						
						
					 
					
						2018-07-30 14:31:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						88b7ccc2ca 
					 
					
						
						
							
							[Glitch] Improve WebUI account action bar  
						
						 
						
						... 
						
						
						
						Mostly a port of 2ccef52a4f  to glitch-soc 
						
						
					 
					
						2018-07-30 14:24:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						4cf7cfd9e0 
					 
					
						
						
							
							[Glitch] Fix accounts' display name/bio not being set from initial state  
						
						 
						
						... 
						
						
						
						Port 20d1be18af  to glitch-soc 
						
						
					 
					
						2018-07-30 14:24:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
							
						
						18831acc10 
					 
					
						
						
							
							Weblate translations (2018-07-30) ( #8096 )  
						
						 
						
						... 
						
						
						
						* 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 (Czech)
Currently translated at 4.8% (4 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ 
* Translated using Weblate (Czech)
Currently translated at 29.5% (196 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Czech)
Currently translated at 30.1% (200 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Telugu)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/ 
* Translated using Weblate (Czech)
Currently translated at 49.4% (328 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Japanese)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* 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 (Czech)
Currently translated at 70.4% (467 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Ukrainian)
Currently translated at 92.3% (612 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/ 
* Translated using Weblate (Telugu)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ 
* Translated using Weblate (Czech)
Currently translated at 71.6% (475 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ 
* Translated using Weblate (Czech)
Currently translated at 95.0% (630 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ 
* Translated using Weblate (Korean)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ 
* Translated using Weblate (Danish)
Currently translated at 79.3% (526 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ 
* Translated using Weblate (Czech)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/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 (Czech)
Currently translated at 50.0% (31 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/ 
* yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused 
						
						
					 
					
						2018-07-30 03:43:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
							
						
						06c83527f5 
					 
					
						
						
							
							Do not scroll up when modal is opened ( #8095 )  
						
						 
						
						
						
						
					 
					
						2018-07-29 16:52:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eugen Rochko 
							
						 
					 
					
						
						
							
						
						1d773b3a46 
					 
					
						
						
							
							Add missing formatting to the text in hero widget ( #8089 )  
						
						 
						
						
						
						
					 
					
						2018-07-28 23:52:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						d8544e7003 
					 
					
						
						
							
							Use same margin for navbar and column for consistency  
						
						 
						
						
						
						
					 
					
						2018-07-28 23:26:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						69ea4a01e1 
					 
					
						
						
							
							Hide navigation bar text so it can fit on small screens  
						
						 
						
						
						
						
					 
					
						2018-07-28 23:26:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						37302c63c3 
					 
					
						
						
							
							Fix glitch-soc columns padding on mobile ( fixes   #561 )  
						
						 
						
						
						
						
					 
					
						2018-07-28 23:26:18 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						93d4e9a58d 
					 
					
						
						
							
							Preserve hashtags in threaded mode ( fixes   #584 )  
						
						 
						
						
						
						
					 
					
						2018-07-28 23:25:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						28a59e4e80 
					 
					
						
						
							
							Move CW field just above main textarea  
						
						 
						
						
						
						
					 
					
						2018-07-28 23:25:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						358e3a4c32 
					 
					
						
						
							
							Get rid of Collapsable, use CSS instead  
						
						 
						
						... 
						
						
						
						Change inspired by 691107263c 
						
						
					 
					
						2018-07-28 23:25:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thibaut Girka 
							
						 
					 
					
						
						
							
						
						d3783b864c 
					 
					
						
						
							
							Refactor reply indicator and show compact list of attachments  
						
						 
						
						
						
						
					 
					
						2018-07-28 23:24:15 +02:00