Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							1d6152f440 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both. 
						
						
					 
					
						2019-03-20 13:54:00 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9d9b6e3543 
							
						 
					 
					
						
						
							
							Add missing locales (bn, ga, hi) ( #10295 )  
						
						
						
						
					 
					
						2019-03-18 21:55:21 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							0158937fc2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- Dockerfile
  Took upstream version and reverted f13ebd02c91776ddb88b5178bf9015c6e0f1ca80.
  Hopefuly it's not needed anymore.
- app/controllers/api/v1/search_controller.rb
  The conflict was due to us raising the number of results returned.
  Upstream raised it further, so took it.
- config/locales/de.yml
  Took upstream changes to theme translation strings.
- config/locales/gl.yml
  Took upstream changes to theme translation strings.
- config/locales/nl.yml
  Took upstream changes to theme translation strings.
- config/locales/sk.yml
  Took upstream changes to theme translation strings. 
						
						
					 
					
						2019-02-26 17:04:44 +01:00 
						 
				 
			
				
					
						
							
							
								Aditoo17 
							
						 
					 
					
						
						
						
						
							
						
						
							57483f2ffb 
							
						 
					 
					
						
						
							
							I18n: Add language options for Kazakh and Lithuanian ( #10104 )  
						
						
						
						
					 
					
						2019-02-23 22:20:35 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							0e34e91661 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2019-02-12 20:32:48 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c0a564feaa 
							
						 
					 
					
						
						
							
							Add available locales for lv, ms, sq ( #10008 )  
						
						
						
						
					 
					
						2019-02-11 13:19:06 +01:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							cd99255698 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
	app/controllers/oauth/authorizations_controller.rb
Just two changes being too close to one another.
Took both. 
						
						
					 
					
						2018-09-11 16:51:26 +02:00 
						 
				 
			
				
					
						
							
							
								Aditoo17 
							
						 
					 
					
						
						
						
						
							
						
						
							8c96fd4967 
							
						 
					 
					
						
						
							
							Add Czech language option and locale data ( #8594 )  
						
						... 
						
						
						
						* Added Czech language option
* Added Czech language option
* Add Czech locale data
* Delete duplicate locale-data/cs.js
Duplicate locale-data is ignored in Mastodon.
see https://github.com/tootsuite/mastodon/blob/v2.5.0/config/webpack/generateLocalePacks.js#L25-L35  
						
						
					 
					
						2018-09-05 08:50:06 +09: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 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							14a300b428 
							
						 
					 
					
						
						
							
							Enable ro and ta locales in Rails ( #8583 )  
						
						... 
						
						
						
						* Enable ro and ta locales in Rails
* Add Tamil and Romanian to language dropdown 
						
						
					 
					
						2018-09-02 22:31:53 +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 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							562250246c 
							
						 
					 
					
						
						
							
							Add Welsh language option ( #8536 )  
						
						
						
						
					 
					
						2018-08-31 18:16:19 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							bfeac6747a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
	.circleci/config.yml
	app/controllers/authorize_follows_controller.rb
	app/javascript/packs/public.js
Moved new stuff from packs/public.js to core/public.js.
Added appropriate use_pack in new controllers. 
						
						
					 
					
						2018-08-18 18:04:49 +02:00 
						 
				 
			
				
					
						
							
							
								Dachi Natsvlishvili 
							
						 
					 
					
						
						
						
						
							
						
						
							bf1bde5d6a 
							
						 
					 
					
						
						
							
							Add Georgian language translation ( #8250 )  
						
						... 
						
						
						
						* Add Georgian language translation
* i18n-tasks normalize 
						
						
					 
					
						2018-08-18 01:00:01 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							6141c2a035 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2018-07-26 21:22:43 +02:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
						
						
							
						
						
							b62ec00d87 
							
						 
					 
					
						
						
							
							Weblate translations (2018-07-25) ( #8065 )  
						
						... 
						
						
						
						* Translated using Weblate (Italian)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/it/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ 
* Translated using Weblate (Danish)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ 
* Translated using Weblate (Occitan)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ 
* Translated using Weblate (Occitan)
Currently translated at 99.8% (642 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Slovak)
Currently translated at 97.2% (625 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Czech)
Currently translated at 5.1% (5 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (Italian)
Currently translated at 97.5% (80 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ 
* Translated using Weblate (Italian)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ 
* Translated using Weblate (Italian)
Currently translated at 83.5% (537 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ 
* Translated using Weblate (Esperanto)
Currently translated at 99.8% (642 of 643 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 98.7% (81 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ 
* Translated using Weblate (Galician)
Currently translated at 99.8% (661 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Japanese)
Currently translated at 95.1% (78 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ 
* Translated using Weblate (Persian)
Currently translated at 98.9% (655 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Japanese)
Currently translated at 98.7% (654 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 98.9% (655 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 99.0% (656 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 99.2% (657 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Danish)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ 
* Translated using Weblate (Danish)
Currently translated at 77.9% (516 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ 
* Translated using Weblate (Danish)
Currently translated at 74.1% (46 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/ 
* Translated using Weblate (Slovak)
Currently translated at 95.6% (633 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (661 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ 
* Translated using Weblate (Japanese)
Currently translated at 99.3% (658 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Slovak)
Currently translated at 96.2% (637 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ 
* Translated using Weblate (Greek)
Currently translated at 99.8% (661 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Japanese)
Currently translated at 99.5% (659 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 99.5% (659 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Persian)
Currently translated at 99.6% (660 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Occitan)
Currently translated at 99.6% (660 of 662 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Occitan)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ 
* Translated using Weblate (Japanese)
Currently translated at 99.5% (660 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Persian)
Currently translated at 99.6% (661 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Greek)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Occitan)
Currently translated at 99.6% (661 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Galician)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Occitan)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (663 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Added translation using Weblate (Asturian)
* Translated using Weblate (Danish)
Currently translated at 78.1% (518 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ 
* Translated using Weblate (Dutch)
Currently translated at 100.0% (663 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ 
* Translated using Weblate (Greek)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Japanese)
Currently translated at 99.5% (660 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ 
* Translated using Weblate (German)
Currently translated at 95.1% (78 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ 
* Translated using Weblate (Asturian)
Currently translated at 4.0% (27 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/ 
* Translated using Weblate (Asturian)
Currently translated at 19.6% (130 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/ 
* Added translation using Weblate (Asturian)
* Added translation using Weblate (Asturian)
* Added translation using Weblate (Asturian)
* Added translation using Weblate (Asturian)
* Added translation using Weblate (Asturian)
* Translated using Weblate (Italian)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ 
* Translated using Weblate (Arabic)
Currently translated at 94.5% (627 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (German)
Currently translated at 96.9% (643 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ 
* Translated using Weblate (Japanese)
Currently translated at 99.6% (661 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Occitan)
Currently translated at 99.8% (662 of 663 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Czech)
Currently translated at 100.0% (306 of 306 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ 
* Translated using Weblate (Arabic)
Currently translated at 95.1% (78 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Slovenian)
Currently translated at 1.0% (1 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sl/ 
* i18n-tasks normalize && i18n-tasks remove-unused && yarn manage:translations
* Add Asturian 
						
						
					 
					
						2018-07-24 20:47:13 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							d392020da6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/tentative-merge  
						
						... 
						
						
						
						Conflicts:
	README.md
	app/controllers/statuses_controller.rb
	app/lib/feed_manager.rb
	config/navigation.rb
	spec/lib/feed_manager_spec.rb
Conflicts were resolved by taking both versions for each change.
This means the two filter systems (glitch-soc's keyword mutes and tootsuite's
custom filters) are in place, which will be changed in a follow-up commit. 
						
						
					 
					
						2018-07-09 07:13:59 +02:00 
						 
				 
			
				
					
						
							
							
								Renato "Lond" Cerqueira 
							
						 
					 
					
						
						
						
						
							
						
						
							b2051a6256 
							
						 
					 
					
						
						
							
							Weblate translations (2018-07-05) ( #7950 )  
						
						... 
						
						
						
						* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 99.5% (620 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ 
* Translated using Weblate (Chinese (Hong Kong))
Currently translated at 99.6% (306 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (622 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ 
* Translated using Weblate (Slovak)
Currently translated at 97.2% (606 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Swedish)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sv/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 97.5% (608 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Finnish)
Currently translated at 96.6% (602 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ 
* Added translation using Weblate (Danish)
* Added translation using Weblate (Danish)
* Added translation using Weblate (Danish)
* Added translation using Weblate (Danish)
* Added translation using Weblate (Danish)
* Translated using Weblate (Danish)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/da/ 
* Added translation using Weblate (Danish)
* Translated using Weblate (Danish)
Currently translated at 81.6% (58 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ 
* Translated using Weblate (Danish)
Currently translated at 58.0% (36 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/ 
* Translated using Weblate (Danish)
Currently translated at 73.6% (56 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/ 
* Translated using Weblate (Swedish)
Currently translated at 100.0% (623 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ 
* Translated using Weblate (Swedish)
Currently translated at 100.0% (623 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ 
* Translated using Weblate (Swedish)
Currently translated at 100.0% (623 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ 
* Translated using Weblate (Swedish)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ 
* Translated using Weblate (Swedish)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ 
* Added translation using Weblate (Swedish)
* Translated using Weblate (Swedish)
Currently translated at 50.0% (1 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sv/ 
* Translated using Weblate (Swedish)
Currently translated at 100.0% (71 of 71 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ 
* Translated using Weblate (Danish)
Currently translated at 80.7% (248 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ 
* Translated using Weblate (Danish)
Currently translated at 37.2% (232 of 623 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ 
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (632 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (French)
Currently translated at 98.7% (76 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ 
* Translated using Weblate (Danish)
Currently translated at 78.9% (60 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/ 
* Translated using Weblate (Danish)
Currently translated at 87.0% (67 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ 
* Translated using Weblate (Persian)
Currently translated at 98.7% (625 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Danish)
Currently translated at 81.1% (249 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ 
* Translated using Weblate (Slovak)
Currently translated at 94.8% (73 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 97.4% (617 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Arabic)
Currently translated at 96.1% (74 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 97.4% (75 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Korean)
Currently translated at 99.8% (632 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ 
* Translated using Weblate (Korean)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (633 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (634 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ 
* Translated using Weblate (Slovak)
Currently translated at 96.1% (74 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 97.4% (617 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Persian)
Currently translated at 99.6% (631 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ 
* Translated using Weblate (Occitan)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ 
* Translated using Weblate (Occitan)
Currently translated at 99.8% (632 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (German)
Currently translated at 99.3% (629 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ 
* Translated using Weblate (Slovak)
Currently translated at 97.4% (617 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 98.7% (76 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ 
* Translated using Weblate (Danish)
Currently translated at 94.8% (73 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ 
* Translated using Weblate (Danish)
Currently translated at 92.1% (283 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ 
* Translated using Weblate (Danish)
Currently translated at 40.9% (259 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ 
* Translated using Weblate (Italian)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ 
* Translated using Weblate (Italian)
Currently translated at 84.5% (535 of 633 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (634 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ 
* Translated using Weblate (Danish)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ 
* Translated using Weblate (Danish)
Currently translated at 86.8% (66 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/ 
* Translated using Weblate (Slovenian)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sl/ 
* Translated using Weblate (Arabic)
Currently translated at 96.2% (610 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Esperanto)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ 
* Translated using Weblate (Esperanto)
Currently translated at 99.8% (633 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ 
* Translated using Weblate (Slovenian)
Currently translated at 29.0% (18 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sl/ 
* Translated using Weblate (Japanese)
Currently translated at 93.5% (72 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 99.6% (632 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ 
* Translated using Weblate (Catalan)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ 
* Translated using Weblate (Greek)
Currently translated at 98.1% (622 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Danish)
Currently translated at 98.3% (302 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ 
* Translated using Weblate (Greek)
Currently translated at 99.8% (633 of 634 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 (Danish)
Currently translated at 63.4% (402 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ 
* Translated using Weblate (Danish)
Currently translated at 62.9% (39 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 97.4% (618 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Japanese)
Currently translated at 99.8% (633 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 93.5% (72 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ 
* Translated using Weblate (Japanese)
Currently translated at 93.5% (72 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ 
* Added translation using Weblate (Greek)
* Added translation using Weblate (Greek)
* Translated using Weblate (Danish)
Currently translated at 70.6% (448 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ 
* Translated using Weblate (Galician)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ 
* Translated using Weblate (French)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/el/ 
* Translated using Weblate (Greek)
Currently translated at 61.2% (38 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/el/ 
* Translated using Weblate (Danish)
Currently translated at 98.6% (303 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ 
* Translated using Weblate (Greek)
Currently translated at 72.5% (45 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/el/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Slovak)
Currently translated at 97.4% (618 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ 
* Translated using Weblate (Japanese)
Currently translated at 93.5% (72 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ 
* Translated using Weblate (Greek)
Currently translated at 99.8% (633 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/el/ 
* Added translation using Weblate (Greek)
* Translated using Weblate (Greek)
Currently translated at 99.6% (306 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/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 (Portuguese (Brazil))
Currently translated at 99.8% (633 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ 
* Translated using Weblate (Danish)
Currently translated at 66.1% (41 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/el/ 
* Added translation using Weblate (Greek)
* Translated using Weblate (Greek)
Currently translated at 14.2% (11 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ 
* Translated using Weblate (Arabic)
Currently translated at 98.7% (76 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ 
* Translated using Weblate (Arabic)
Currently translated at 96.3% (611 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ 
* Translated using Weblate (Greek)
Currently translated at 53.2% (41 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ 
* Translated using Weblate (Greek)
Currently translated at 55.8% (43 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ 
* Translated using Weblate (Greek)
Currently translated at 57.1% (44 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ 
* Translated using Weblate (Greek)
Currently translated at 61.0% (47 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (77 of 77 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/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 (Greek)
Currently translated at 99.8% (633 of 634 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ 
* Normalize translations
ran yarn build:development && i18n-tasks normalize && yarn
manage:translations && i18n-tasks remove-unused
* Add Danish language 
						
						
					 
					
						2018-07-05 21:50:16 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							ba7ee67498 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge  
						
						
						
						
					 
					
						2018-05-14 20:51:50 +02:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
						
						
							
						
						
							2226d987f9 
							
						 
					 
					
						
						
							
							Add Slovene language ( #7475 )  
						
						
						
						
					 
					
						2018-05-14 12:52:25 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							1c9c0167b7 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/master  
						
						... 
						
						
						
						Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml 
						
						
					 
					
						2018-05-10 00:03:28 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							95595ccd21 
							
						 
					 
					
						
						
							
							Add Corsican localization ( #7390 )  
						
						... 
						
						
						
						* Added Corsican localization
* Declaring Corsican localization
* Fixed activerecord locale
* Added a missing translation and switched to French-style apostrophes
* Fixed a (predictable) mistake made while bulk-replacing apostrophes
* More fixing
* i18n-tasks normalize 
						
						
					 
					
						2018-05-07 01:34:19 +02:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c816701550 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into gs-master  
						
						... 
						
						
						
						Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml 
						
						
					 
					
						2018-05-03 17:23:44 -05:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
						
						
							
						
						
							7495a3470e 
							
						 
					 
					
						
						
							
							Add el and te ( #7332 )  
						
						... 
						
						
						
						* Add el and te
* Add missing locale files 
						
						
					 
					
						2018-05-03 15:54:10 +02:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
						
						
							
						
						
							36b6631c12 
							
						 
					 
					
						
						
							
							Add Basque language support ( #7267 )  
						
						
						
						
					 
					
						2018-04-26 13:56:45 +02:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ed490b781f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into gs-master  
						
						... 
						
						
						
						Conflicts:
 	Gemfile.lock
 	config/application.rb 
						
						
					 
					
						2018-04-13 16:36:46 -05:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
						
						
							
						
						
							50529cbceb 
							
						 
					 
					
						
						
							
							Upgrade Rails to version 5.2.0 ( #5898 )  
						
						
						
						
					 
					
						2018-04-12 14:45:17 +02:00 
						 
				 
			
				
					
						
							
							
								Jenkins 
							
						 
					 
					
						
						
						
						
							
						
						
							e8aeec4fea 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
						
						
						
						
					 
					
						2018-03-20 19:17:20 +00:00 
						 
				 
			
				
					
						
							
							
								Akihiko Odaki 
							
						 
					 
					
						
						
						
						
							
						
						
							61dcb686a8 
							
						 
					 
					
						
						
							
							Fix i18n fallback configuration conflicts with environment configurations ( #6843 )  
						
						
						
						
					 
					
						2018-03-20 16:36:20 +01:00 
						 
				 
			
				
					
						
							
							
								Jenkins 
							
						 
					 
					
						
						
						
						
							
						
						
							df70571bfe 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
						
						
						
						
					 
					
						2018-03-19 20:17:18 +00:00 
						 
				 
			
				
					
						
							
							
								Alexander 
							
						 
					 
					
						
						
						
						
							
						
						
							0306e3e9be 
							
						 
					 
					
						
						
							
							bugfixes and gem update ( #6831 )  
						
						... 
						
						
						
						* update to new version of devise_pam_authenticatable2
* fix behaviour if suffix is nil, fix environment loading, fix user email creation
* code cleanup/fix linter warning 
						
						
					 
					
						2018-03-19 20:08:56 +01:00 
						 
				 
			
				
					
						
							
							
								Jenkins 
							
						 
					 
					
						
						
						
						
							
						
						
							447d7e6127 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
						
						
						
						
					 
					
						2018-03-09 00:17:17 +00:00 
						 
				 
			
				
					
						
							
							
								Akihiko Odaki 
							
						 
					 
					
						
						
						
						
							
						
						
							51d760960c 
							
						 
					 
					
						
						
							
							Set the default locale in config ( #6580 )  
						
						... 
						
						
						
						Previously the default locale was set by Localized concern for controllers,
but it was not enforced for mailers.
config is enforced throughout the application and an appropriate place to
set the default locale. 
						
						
					 
					
						2018-03-04 09:21:35 +01:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1b8fcd4df5 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into merge-upstream  
						
						... 
						
						
						
						Conflicts:
 	README.md
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/serializers/rest/instance_serializer.rb
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/simple_form.ja.yml 
						
						
					 
					
						2018-03-02 21:46:44 -06:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							47bdb9b33b 
							
						 
					 
					
						
						
							
							Fix   #942 : Seamless LDAP login ( #6556 )  
						
						
						
						
					 
					
						2018-02-28 19:04:53 +01:00 
						 
				 
			
				
					
						
							
							
								imncls 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bb6988a7ac 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/tootsuite/mastodon  
						
						... 
						
						
						
						# Conflicts:
#	app/controllers/settings/exports_controller.rb
#	app/models/media_attachment.rb
#	app/models/status.rb
#	app/views/about/show.html.haml
#	docker_entrypoint.sh
#	spec/views/about/show.html.haml_spec.rb 
						
						
					 
					
						2018-02-23 23:28:31 +09:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a7171af0a3 
							
						 
					 
					
						
						
							
							Fix avatar and header issues by using custom geometry detector ( #6515 )  
						
						... 
						
						
						
						* Fix avatar and header issues by using custom geometry detector
Revert a part of #6508 . The file passed to dynamic styles method
was not actually a file, but an instance of Paperclip::Attachment,
which broke all styles by always returning {} from the method.
One problem with GIF avatars was that Paperclip::GeometryDetector
reported wrong dimensions for them, e.g. 120x120 GIF avatar would
for some reason be detected as 120x53. By writing our own geometry
parser, we can use FastImage, which also happens to be faster than
ImageMagick, to detect image dimensions, which are also correct.
Unfortunately, this PR does not implement skipping a `convert`
entirely if the dimensions are already correct, as I found no easy
way to write that behaviour into Paperclip without rewriting the
Paperclip::Thumbnail class.
* Only invoke convert if dimension or format needs to be changed 
						
						
					 
					
						2018-02-21 03:40:12 +01:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							48d79007f6 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into merge-upstream-20180121  
						
						
						
						
					 
					
						2018-01-21 16:26:50 -06:00 
						 
				 
			
				
					
						
							
							
								Norayr Chilingarian 
							
						 
					 
					
						
						
						
						
							
						
						
							48cd6dc6ca 
							
						 
					 
					
						
						
							
							armenian translations initial commit ( #6320 )  
						
						... 
						
						
						
						* adding armenian translations
* updating config files for armenian translations
* armenian translation fix
* fixing spaces 
						
						
					 
					
						2018-01-22 05:02:23 +09:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2ca965c704 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into merge-upstream  
						
						... 
						
						
						
						Conflicts:
	app/javascript/styles/mastodon/components.scss
	app/javascript/styles/mastodon/modal.scss 
						
						
					 
					
						2018-01-19 15:22:10 -06:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
						
						
							
						
						
							238de58e65 
							
						 
					 
					
						
						
							
							Change belongs_to_required_by_default to true ( #5888 )  
						
						
						
						
					 
					
						2018-01-19 20:56:47 +01:00 
						 
				 
			
				
					
						
							
							
								Jenkins 
							
						 
					 
					
						
						
						
						
							
						
						
							933840bebf 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
						
						
						
						
					 
					
						2018-01-03 04:17:11 +00:00 
						 
				 
			
				
					
						
							
							
								Branko Kokanovic 
							
						 
					 
					
						
						
						
						
							
						
						
							21b9da6418 
							
						 
					 
					
						
						
							
							Adding Serbian latin translations ( #6146 )  
						
						... 
						
						
						
						Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation. 
						
						
					 
					
						2018-01-02 20:39:12 +09:00 
						 
				 
			
				
					
						
							
							
								Jenkins 
							
						 
					 
					
						
						
						
						
							
						
						
							fa9b7ece2e 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
						
						
						
						
					 
					
						2017-12-31 09:17:15 +00:00 
						 
				 
			
				
					
						
							
							
								Branko Kokanovic 
							
						 
					 
					
						
						
						
						
							
						
						
							7d376e41be 
							
						 
					 
					
						
						
							
							Adding Serbian translation ( #6133 )  
						
						... 
						
						
						
						* Adding Serbian translation
* i18n-tasks normalize 
						
						
					 
					
						2017-12-31 17:28:20 +09:00 
						 
				 
			
				
					
						
							
							
								Jenkins 
							
						 
					 
					
						
						
						
						
							
						
						
							e7fa7fce25 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
						
						
						
						
					 
					
						2017-12-17 03:17:14 +00:00 
						 
				 
			
				
					
						
							
							
								Peter 
							
						 
					 
					
						
						
						
						
							
						
						
							f38e6a14f2 
							
						 
					 
					
						
						
							
							Add Slovak translation ( #6052 )  
						
						... 
						
						
						
						* Add Slovak translation
* Slovak translation: i18n-normalize 
						
						
					 
					
						2017-12-17 11:26:42 +09:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a057ed5cfe 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'tootsuite/master' into merge-upstream  
						
						
						
						
					 
					
						2017-12-12 02:54:13 -06:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
						
						
							
						
						
							6e3f176b8e 
							
						 
					 
					
						
						
							
							Add Galician language support ( #5955 )  
						
						
						
						
					 
					
						2017-12-10 04:19:07 +01:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
						
						
							
						
						
							42e8c8eb0e 
							
						 
					 
					
						
						
							
							Merge tag 'v2.0.0' into gs-master  
						
						
						
						
					 
					
						2017-10-18 11:52:04 -05:00