a74a7d5fe3 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-09-01 17:23:46 +02:00  
				
					
						
							
							
								 
						
							
								45c0f5433c 
								
							 
						 
						
							
							
								
								Do not show follow button on moved or memorial accounts ( #8546 )  
							
							... 
							
							
							
							This restores the logic from before the public profile redesign. Fixes  #8503  
							
						 
						
							2018-08-31 20:33:01 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								562250246c 
								
							 
						 
						
							
							
								
								Add Welsh language option ( #8536 )  
							
							
							
						 
						
							2018-08-31 18:16:19 +09:00  
				
					
						
							
							
								 
						
							
								53b7bb9d04 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml 
							
						 
						
							2018-08-27 18:09:28 +02:00  
				
					
						
							
							
								 
						
							
								b31449cd77 
								
							 
						 
						
							
							
								
								Better singulars of account followers/toots. ( #8471 )  
							
							
							
						 
						
							2018-08-26 21:30:53 +02:00  
				
					
						
							
							
								 
						
							
								5eb3b8522e 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-08-26 14:39:16 +02:00  
				
					
						
							
							
								 
						
							
								6c9be61f57 
								
							 
						 
						
							
							
								
								Fix regression from  #8439  ( #8455 )  
							
							... 
							
							
							
							Missing no-reduce-motion/reduce-motion body class 
							
						 
						
							2018-08-26 14:29:58 +02:00  
				
					
						
							
							
								 
						
							
								36393e1d2b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
	app/views/layouts/application.html.haml
Edited:
        app/helpers/application_helper.rb
        app/views/admin/domain_blocks/new.html.haml
Conflict wasn't really one, just two changes too close to one another.
Edition was to adapt the class names for themes to class names for
skins and flavours.
Also edited app/views/admin/domain_blocks/new.html.haml to strip the
duplicate admin pack inclusion thing. 
							
						 
						
							2018-08-26 14:23:24 +02:00  
				
					
						
							
							
								 
						
							
								22e46ebad8 
								
							 
						 
						
							
							
								
								Add theme identifier to body classes for easier custom CSS styling ( #8439 )  
							
							... 
							
							
							
							Add forgotten custom CSS admin setting strings 
							
						 
						
							2018-08-25 22:55:25 +02:00  
				
					
						
							
							
								 
						
							
								e70fc059a9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-08-22 20:56:32 +02:00  
				
					
						
							
							
								 
						
							
								56f882aed6 
								
							 
						 
						
							
							
								
								Avoid deleted attributes when building a Status from action log ( fixes   #8371 ) ( #8373 )  
							
							
							
						 
						
							2018-08-22 20:55:50 +02:00  
				
					
						
							
							
								 
						
							
								802cf6a4c5 
								
							 
						 
						
							
							
								
								Improve federated ID validation ( #8372 )  
							
							... 
							
							
							
							* Fix URI not being sufficiently validated with prefetched JSON
* Add additional id validation to OStatus documents, when possible 
							
						 
						
							2018-08-22 20:55:14 +02:00  
				
					
						
							
							
								 
						
							
								88a0395a58 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-08-19 09:27:18 +02:00  
				
					
						
							
							
								 
						
							
								19b07ba260 
								
							 
						 
						
							
							
								
								Make unfollow button light up red when hovered ( #8286 )  
							
							... 
							
							
							
							Fix  #8284  
						
							2018-08-19 03:28:43 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								78fa926ed5 
								
							 
						 
						
							
							
								
								Add remote interaction dialog for toots ( #8202 )  
							
							... 
							
							
							
							* Add remote interaction dialog for toots
* Change AuthorizeFollow into AuthorizeInteraction, support statuses
* Update brakeman.ignore
* Adjust how interaction buttons are display on public pages
* Fix tests 
							
						 
						
							2018-08-18 03:03:12 +02:00  
				
					
						
							
							
								 
						
							
								bf1bde5d6a 
								
							 
						 
						
							
							
								
								Add Georgian language translation ( #8250 )  
							
							... 
							
							
							
							* Add Georgian language translation
* i18n-tasks normalize 
							
						 
						
							2018-08-18 01:00:01 +09:00  
				
					
						
							
							
								 
						
							
								280d7b1df8 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb
Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes). 
							
						 
						
							2018-08-17 17:43:54 +02:00  
				
					
						
							
							
								 
						
							
								106fa28a00 
								
							 
						 
						
							
							
								
								Prevent actions log from crashing when displaying deleted status ( fixes   #8133 ) ( #8219 )  
							
							
							
						 
						
							2018-08-16 20:05:26 +02:00  
				
					
						
							
							
								 
						
							
								84a2587d44 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-08-11 15:45:42 +02:00  
				
					
						
							
							
								 
						
							
								84e2446d26 
								
							 
						 
						
							
							
								
								i18n: fix Slovak language name ( #8169 )  
							
							
							
						 
						
							2018-08-11 14:52:05 +09:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								f2404de871 
								
							 
						 
						
							
							
								
								Public profile endorsements (accounts picked by profile owner) ( #8146 )  
							
							
							
						 
						
							2018-08-09 09:56:53 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								bb71538bb5 
								
							 
						 
						
							
							
								
								Redesign public profiles and toots ( #8068 )  
							
							
							
						 
						
							2018-07-28 19:25:33 +02:00  
				
					
						
							
							
								 
						
							
								6141c2a035 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2018-07-26 21:22:43 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								f26f1145ac 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
	Dockerfile
	app/javascript/packs/common.js
	config/webpack/loaders/sass.js
	config/webpack/shared.js
	db/schema.rb
	package.json
	yarn.lock
A lot of the conflicts come from updating webpack.
Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.
Ported glitch changes to webpack 4.x 
							
						 
						
							2018-07-16 14:50:42 +02:00  
				
					
						
							
							
								 
						
							
								2a176514be 
								
							 
						 
						
							
							
								
								Display full acct on public status pages, always ( #8011 )  
							
							
							
						 
						
							2018-07-14 04:07:47 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								1f6ed4f86a 
								
							 
						 
						
							
							
								
								Add more granular OAuth scopes ( #7929 )  
							
							... 
							
							
							
							* Add more granular OAuth scopes
* Add human-readable descriptions of the new scopes
* Ensure new scopes look good on the app UI
* Add tests
* Group scopes in screen and color-code dangerous ones
* Fix wrong extra scope 
							
						 
						
							2018-07-05 18:31:35 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								b481e4fac1 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
	config/locales/simple_form.ja.yml 
							
						 
						
							2018-05-19 22:41:10 +02:00  
				
					
						
							
							
								 
						
							
								9422b3e0d8 
								
							 
						 
						
							
							
								
								Fix double-encoding of display name in title and e-mails ( #7534 )  
							
							
							
						 
						
							2018-05-18 15:56:57 +02:00  
				
					
						
							
							
								 
						
							
								ba7ee67498 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge  
							
							
							
						 
						
							2018-05-14 20:51:50 +02:00  
				
					
						
							
							
								 
						
							
								2226d987f9 
								
							 
						 
						
							
							
								
								Add Slovene language ( #7475 )  
							
							
							
						 
						
							2018-05-14 12:52:25 +02:00  
				
					
						
							
							
								 
						
							
								0f2fbf7d05 
								
							 
						 
						
							
							
								
								Improvements to toots display in admin view ( #7452 )  
							
							... 
							
							
							
							* Distinguish boosts from original statuses in the admin panel (fixes  #7449 )
* Show the “show more” button in admin view to make CWs clearer (fixes  #7451 )
* Make content warnings swag 
							
						 
						
							2018-05-12 17:44:15 +02:00  
				
					
						
							
							
								 
						
							
								7467361d70 
								
							 
						 
						
							
							
								
								Fetch boosted statuses on behalf of a follower ( fixes   #7426 ) ( #7459 )  
							
							... 
							
							
							
							When an ActivityPub Announce is processed and the boosted toot is not known,
fetch it on behalf of one of the booster's followers. This is to allow
fetching self-boosts of previously-unknown private toots.
If fetching on behalf of a user fails, try fetching it anonymously: the
selected follower of a boosting user may be banned by the boosted toot's
author. 
							
						 
						
							2018-05-12 16:48:32 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								61a9018607 
								
							 
						 
						
							
							
								
								Enable custom emojis in profiles (notes, field values, display names) ( #7374 )  
							
							... 
							
							
							
							Follow-up to #6124  
							
						 
						
							2018-05-06 11:48:51 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								7495a3470e 
								
							 
						 
						
							
							
								
								Add el and te ( #7332 )  
							
							... 
							
							
							
							* Add el and te
* Add missing locale files 
							
						 
						
							2018-05-03 15:54:10 +02:00  
				
					
						
							
							
								 
						
							
								cb5b5cb5f7 
								
							 
						 
						
							
							
								
								Slightly reduce RAM usage ( #7301 )  
							
							... 
							
							
							
							* No need to re-require sidekiq plugins, they are required via Gemfile
* Add derailed_benchmarks tool, no need to require TTY gems in Gemfile
* Replace ruby-oembed with FetchOEmbedService
Reduce startup by 45382 allocated objects
* Remove preloaded JSON-LD in favour of caching HTTP responses
Reduce boot RAM by about 6 MiB
* Fix tests
* Fix test suite by stubbing out JSON-LD contexts 
							
						 
						
							2018-05-02 18:58:48 +02:00  
				
					
						
							
							
								 
						
							
								dc786c0cf4 
								
							 
						 
						
							
							
								
								Support Actors/Statuses with multiple types ( #7305 )  
							
							... 
							
							
							
							* Add equals_or_includes_any? helper in JsonLdHelper
* Support arrays in JSON-LD type fields for actors/tags/objects.
* Spec for resolving accounts with extension types
* Style tweaks for codeclimate 
							
						 
						
							2018-05-02 12:40:24 +02:00  
				
					
						
							
							
								 
						
							
								36b6631c12 
								
							 
						 
						
							
							
								
								Add Basque language support ( #7267 )  
							
							
							
						 
						
							2018-04-26 13:56:45 +02:00  
				
					
						
							
							
								 
						
							
								9d4710ed00 
								
							 
						 
						
							
							
								
								Add RSS feeds for end-users ( #7259 )  
							
							... 
							
							
							
							* Add RSS feed for accounts
* Add RSS feeds for hashtags
* Fix code style issues
* Fix code style issues 
							
						 
						
							2018-04-25 02:10:02 +02:00  
				
					
						
							
							
								 
						
							
								a9c440637c 
								
							 
						 
						
							
							
								
								Improve report layout ( #7188 )  
							
							... 
							
							
							
							* Use table for statuses in report
* Display reported account and reporter in the same table
* Split accounts and general report info into two tables again
* Redesign report statuses table, notes, merge notes and action log
* Remove unused translations
* Fix code style issue
* Fix code style issue
* Fix code style issue 
							
						 
						
							2018-04-20 02:28:48 +02:00  
				
					
						
							
							
								 
						
							
								33c2bbdda7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-04-11 00:50:09 +00:00  
				
					
						
							
							
								 
						
							
								219a4423d8 
								
							 
						 
						
							
							
								
								Feature: Allow staff to change user emails ( #7074 )  
							
							... 
							
							
							
							* Admin: Show unconfirmed email address on account page
* Admin: Allow staff to change user email addresses
* ActionLog: On change_email, log current email address and new unconfirmed email address 
							
						 
						
							2018-04-10 09:16:06 +02:00  
				
					
						
							
							
								 
						
							
								6611100480 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-04-03 19:17:20 +00:00  
				
					
						
							
							
								 
						
							
								e85cffb236 
								
							 
						 
						
							
							
								
								Feature: Report improvements ( #6967 ) ( #7000 )  
							
							... 
							
							
							
							* Implement Assignment of Reports (#6967 )
* Change translation of admin.report.comment.label to "Report Comment" for clarity
As we'll soon add the ability for reports to have comments on them, this clarification makes sense.
* Implement notes for Reports
This enables moderators to leave comments about a report whilst they work on it
* Fix display of report moderation notes
* Allow reports to be reopened / marked as unresolved
* Redirect to reports listing upon resolution of report
* Implement "resolve with note" functionality
* Add inverse relationship for report notes
* Remove additional database querying when loading report notes
* Fix tests for reports
* Fix localisations for report notes / reports 
							
						 
						
							2018-04-02 22:04:14 +02:00  
				
					
						
							
							
								 
						
							
								e7a1716701 
								
							 
						 
						
							
							
								
								Implement the ability for an Administrator or Moderator to remove an account avatar ( #6998 )  
							
							
							
						 
						
							2018-04-02 13:45:07 +02:00  
				
					
						
							
							
								 
						
							
								f61aa8e0f7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							... 
							
							
							
							Conflicts:
 	app/javascript/styles/mastodon/components.scss
 	app/models/media_attachment.rb 
							
						 
						
							2018-03-27 10:26:47 -05:00  
				
					
						
							
							
								 
						
							
								40e5d2303b 
								
							 
						 
						
							
							
								
								Validate HTTP response length while receiving ( #6891 )  
							
							... 
							
							
							
							to_s method of HTTP::Response keeps blocking while it receives the whole
content, no matter how it is big. This means it may waste time to receive
unacceptably large files. It may also consume memory and disk in the
process. This solves the inefficency by checking response length while
receiving. 
							
						 
						
							2018-03-26 14:02:10 +02:00  
				
					
						
							
							
								 
						
							
								837b3804bf 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-03-25 15:17:21 +00:00  
				
					
						
							
							
								 
						
							
								54b273bf99 
								
							 
						 
						
							
							
								
								Close http connection in perform method of Request class ( #6889 )  
							
							... 
							
							
							
							HTTP connections must be explicitly closed in many cases, and letting
perform method close connections makes its callers less redundant and
prevent them from forgetting to close connections. 
							
						 
						
							2018-03-24 12:49:54 +01:00  
				
					
						
							
							
								 
						
							
								ab04be2f84 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							... 
							
							
							
							Conflicts:
 	config/i18n-tasks.yml 
							
						 
						
							2018-03-18 20:21:17 -05:00  
				
					
						
							
							
								 
						
							
								a568e3ca8e 
								
							 
						 
						
							
							
								
								Revert  #6479 , hide sensitive text/images from OpenGraph previews ( #6818 )  
							
							... 
							
							
							
							Display summary of attachments in description, and mark up content
warning if present, e.g.:
    Attached: 3 images · Content warning: Dota 2
When text is not supposed to be hidden, it looks more like:
    Attached: 3 images
    Here is the text of the toot
With #6817 , multilinguagility should be assured... 
							
						 
						
							2018-03-18 20:33:07 +01:00  
				
					
						
							
							
								 
						
							
								447d7e6127 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-03-09 00:17:17 +00:00  
				
					
						
							
							
								 
						
							
								ff44b2e92d 
								
							 
						 
						
							
							
								
								Add missing meta description to profiles, some other SEO stuff ( #6706 )  
							
							... 
							
							
							
							- Add missing meta description to profiles
- Add canonical rel link to landing page
- Remove linebreaks from title tags
- Add username to profile title
- Add toots/following/followers to profile description tags
- Add next/prev rel links to profiles
- Do not index follower/following variants of profiles 
							
						 
						
							2018-03-09 00:35:07 +01:00  
				
					
						
							
							
								 
						
							
								ef44c62d17 
								
							 
						 
						
							
							
								
								Do not default site_title with site_hostname in InstanceHelper ( #6624 )  
							
							... 
							
							
							
							site_title is "Mastodon" by default configuration, and there is no need to
default site_title with site_hostname in InstanceHelper. 
							
						 
						
							2018-03-04 20:29:49 +01:00  
				
					
						
							
							
								 
						
							
								f4b2478af1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into merge-upstream  
							
							... 
							
							
							
							Conflicts:
	app/views/layouts/mailer.html.haml
	config/locales/ko.yml 
							
						 
						
							2018-01-28 22:45:17 -06:00  
				
					
						
							
							
								 
						
							
								79bc3d5845 
								
							 
						 
						
							
							
								
								Add direction tags to HTML e-mails for RTL languages ( #6373 )  
							
							
							
						 
						
							2018-01-29 00:22:20 +01:00  
				
					
						
							
							
								 
						
							
								48d79007f6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into merge-upstream-20180121  
							
							
							
						 
						
							2018-01-21 16:26:50 -06:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								071c2c9c85 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into merge-upstream  
							
							... 
							
							
							
							Conflicts:
	app/javascript/styles/mastodon/components.scss 
							
						 
						
							2018-01-20 10:45:43 -06:00  
				
					
						
							
							
								 
						
							
								45afdf1781 
								
							 
						 
						
							
							
								
								Fix   #6269  - Render LOCAL_DOMAIN as unicode in presentational views ( #6305 )  
							
							
							
						 
						
							2018-01-20 03:49:06 +01:00  
				
					
						
							
							
								 
						
							
								89a9d629f7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							... 
							
							
							
							Conflicts:
	Gemfile.lock 
							
						 
						
							2018-01-15 22:17:48 -06:00  
				
					
						
							
							
								 
						
							
								5276c0a090 
								
							 
						 
						
							
							
								
								HTML e-mails for UserMailer ( #6256 )  
							
							... 
							
							
							
							- premailer gem to turn CSS into inline styles automatically
- rework UserMailer templates
- reword UserMailer templates 
							
						 
						
							2018-01-16 03:29:11 +01:00  
				
					
						
							
							
								 
						
							
								722b3f567f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-08 04:17:11 +00:00  
				
					
						
							
							
								 
						
							
								e4a241abef 
								
							 
						 
						
							
							
								
								Fix bad URL schemes being accepted ( #6219 )  
							
							... 
							
							
							
							* Fix actors accepting invalid URI schemes or different host between URI and URL
* Fix statuses accepting invalid URI scheme or different host to actor
* Adjust tests to new requirements
* Improve readability of mismatching_origin?/invalid_origin? methods 
							
						 
						
							2018-01-08 05:00:23 +01:00  
				
					
						
							
							
								 
						
							
								c69a23ae46 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-04 23:17:11 +00:00  
				
					
						
							
							
								 
						
							
								3c18964256 
								
							 
						 
						
							
							
								
								Fallback default thumbnail in instance status API ( #6177 )  
							
							
							
						 
						
							2018-01-04 15:36:55 +01:00  
				
					
						
							
							
								 
						
							
								02e3e1ec09 
								
							 
						 
						
							
							
								
								Fix nil error in log_target_from_history helper ( #6173 )  
							
							
							
						 
						
							2018-01-04 10:56:23 +09:00  
				
					
						
							
							
								 
						
							
								933840bebf 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-01-03 04:17:11 +00:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								fa9b7ece2e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2017-12-31 09:17:15 +00:00  
				
					
						
							
							
								 
						
							
								7d376e41be 
								
							 
						 
						
							
							
								
								Adding Serbian translation ( #6133 )  
							
							... 
							
							
							
							* Adding Serbian translation
* i18n-tasks normalize 
							
						 
						
							2017-12-31 17:28:20 +09:00  
				
					
						
							
							
								 
						
							
								e7fa7fce25 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2017-12-17 03:17:14 +00:00  
				
					
						
							
							
								 
						
							
								f38e6a14f2 
								
							 
						 
						
							
							
								
								Add Slovak translation ( #6052 )  
							
							... 
							
							
							
							* Add Slovak translation
* Slovak translation: i18n-normalize 
							
						 
						
							2017-12-17 11:26:42 +09:00  
				
					
						
							
							
								 
						
							
								82236a3703 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2017-12-13 18:17:16 +00:00  
				
					
						
							
							
								 
						
							
								ad75ec8b5b 
								
							 
						 
						
							
							
								
								Add filters to admin UI for custom emojis ( #6003 )  
							
							
							
						 
						
							2017-12-13 13:28:31 +01:00  
				
					
						
							
							
								 
						
							
								20a6584d2d 
								
							 
						 
						
							
							
								
								Clean up admin UI for accounts ( #6004 )  
							
							... 
							
							
							
							* Add staff filter to admin UI for accounts, remove obsolete columns
* Only display OStatus section in admin UI for accounts when OStatus data 
							
						 
						
							2017-12-13 12:15:10 +01:00  
				
					
						
							
							
								 
						
							
								a057ed5cfe 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into merge-upstream  
							
							
							
						 
						
							2017-12-12 02:54:13 -06:00  
				
					
						
							
							
								 
						
							
								6e3f176b8e 
								
							 
						 
						
							
							
								
								Add Galician language support ( #5955 )  
							
							
							
						 
						
							2017-12-10 04:19:07 +01:00  
				
					
						
							
							
								 
						
							
								8ca91cef45 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2017-12-06 20:17:13 +00:00  
				
					
						
							
							
								 
						
							
								b21db9bbde 
								
							 
						 
						
							
							
								
								Using double splat operator ( #5859 )  
							
							
							
						 
						
							2017-12-06 11:41:57 +01:00  
				
					
						
							
							
								 
						
							
								933eafdcd3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2017-12-02 14:17:11 +00:00  
				
					
						
							
							
								 
						
							
								74320971e2 
								
							 
						 
						
							
							
								
								Add invite filter ( #5862 )  
							
							
							
						 
						
							2017-12-01 16:40:02 +01:00  
				
					
						
							
							
								 
						
							
								ad46bc9772 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2017-11-30 03:17:12 +00:00  
				
					
						
							
							
								 
						
							
								4c6b5dbe96 
								
							 
						 
						
							
							
								
								Add semi-support for Video/Image objects in ActivityPub ( #5848 )  
							
							... 
							
							
							
							* Add semi-support for Video/Image objects in ActivityPub
Video and Image objects will create corresponding status records
with manually crafted text contents (title + URL)
* Extract html-url-finding logic into JsonLdHelper
* Fallback to id when url missing, extract supported object types 
							
						 
						
							2017-11-30 04:06:20 +01:00  
				
					
						
							
							
								 
						
							
								167fe2ab08 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2017-11-24 01:17:20 +00:00  
				
					
						
							
							
								 
						
							
								e84fecb7e9 
								
							 
						 
						
							
							
								
								Add logging of admin actions ( #5757 )  
							
							... 
							
							
							
							* Add logging of admin actions
* Update brakeman whitelist
* Log creates, updates and destroys with history of changes
* i18n: Update Polish translation (#5782 )
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* Split admin navigation into moderation and administration
* Redesign audit log page
* 🇵🇱  (#5795 )
* Add color coding to audit log
* Change dismiss->resolve, log all outcomes of report as resolve
* Update terminology (e-mail blacklist) (#5796 )
* Update terminology (e-mail blacklist)
imho looks better
* Update en.yml
* Fix code style issues
* i18n-tasks normalize 
							
						 
						
							2017-11-24 02:05:53 +01:00  
				
					
						
							
							
								 
						
							
								b28b405b97 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							
							
						 
						
							2017-11-16 22:52:37 -06:00  
				
					
						
							
							
								 
						
							
								3e90987c8b 
								
							 
						 
						
							
							
								
								Fix some rubocop style issues ( #5730 )  
							
							
							
						 
						
							2017-11-17 10:06:26 +09:00  
				
					
						
							
							
								 
						
							
								35fbdc36f9 
								
							 
						 
						
							
							
								
								Merge tootsuite/master at  3023725936 
							
							
							
						 
						
							2017-11-16 01:21:16 -06:00  
				
					
						
							
							
								 
						
							
								7bb8b0b2fc 
								
							 
						 
						
							
							
								
								Add moderator role and add pundit policies for admin actions ( #5635 )  
							
							... 
							
							
							
							* Add moderator role and add pundit policies for admin actions
* Add rake task for turning user into mod and revoking it again
* Fix handling of unauthorized exception
* Deliver new report e-mails to staff, not just admins
* Add promote/demote to admin UI, hide some actions conditionally
* Fix unused i18n 
							
						 
						
							2017-11-11 20:23:33 +01:00  
				
					
						
							
							
								 
						
							
								b6e2e999bd 
								
							 
						 
						
							
							
								
								Show the local couterpart of emoji when it exists in /admin/custom_emojis ( #5467 )  
							
							... 
							
							
							
							* Show the local couterpart of emoji when it exists in admin/custom_emojis
* Fix indentation
* Fix error
* Add class table-action-link to Overwrite link
* Make it enable to overwrite emojis
* Make Code Climate happy 
							
						 
						
							2017-11-07 14:49:32 +01:00  
				
					
						
							
							
								 
						
							
								870d71b78b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into gs-master  
							
							
							
						 
						
							2017-10-27 09:45:25 -05:00  
				
					
						
							
							
								 
						
							
								0cb329f63a 
								
							 
						 
						
							
							
								
								Allow ActivityPub Note's tag and attachment to be single objects ( #5534 )  
							
							
							
						 
						
							2017-10-27 16:10:36 +02:00  
				
					
						
							
							
								 
						
							
								4fa2f7e82d 
								
							 
						 
						
							
							
								
								Set up /settings/keyword_mutes.   #164 .  
							
							... 
							
							
							
							This should eventually be accessible via the API and the web frontend,
but I find it easier to set up an editing interface using Rails
templates and the like.  We can always take it out if it turns out we
don't need it. 
							
						 
						
							2017-10-21 14:54:36 -05:00  
				
					
						
							
							
								 
						
							
								a2b600428c 
								
							 
						 
						
							
							
								
								Swedish translation ( #5406 )  
							
							... 
							
							
							
							* Swedish file added
* Swedish file added
* Swedish file updated
* Swedish languagefile added
* Add Swedish translation
* Add Swedish translation
* Started the Swedish translation
* Added Swedish lang settings
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Updating Swedish language
* Swedish language completed and added
* Swedish language Simple_form added
* Swedish language Divise added
* Swedish language doorkeeper added
* Swedish language - now all file complete 
							
						 
						
							2017-10-17 13:41:36 +09:00  
				
					
						
							
							
								 
						
							
								633426b261 
								
							 
						 
						
							
							
								
								Add moderation note ( #5240 )  
							
							... 
							
							
							
							* Add moderation note
* Add frozen_string_literal
* Make rspec pass 
							
						 
						
							2017-10-07 20:26:43 +02:00  
				
					
						
							
							
								 
						
							
								63f0979799 
								
							 
						 
						
							
							
								
								Validate id of ActivityPub representations ( #5114 )  
							
							... 
							
							
							
							Additionally, ActivityPub::FetchRemoteStatusService no longer parses
activities.
OStatus::Activity::Creation no longer delegates to ActivityPub because
the provided ActivityPub representations are not signed while OStatus
representations are. 
							
						 
						
							2017-10-04 01:13:48 +02:00  
				
					
						
							
							
								 
						
							
								1e02ba111a 
								
							 
						 
						
							
							
								
								Add emoji autosuggest ( #5053 )  
							
							... 
							
							
							
							* Add emoji autosuggest
Some credit goes to glitch-soc/mastodon#149 
* Remove server-side shortcode->unicode conversion
* Insert shortcode when suggestion is custom emoji
* Remove remnant of server-side emojis
* Update style of autosuggestions
* Fix wrong emoji filenames generated in autosuggest item
* Do not lazy load emoji picker, as that no longer works
* Fix custom emoji autosuggest
* Fix multiple "Custom" categories getting added to emoji index, only add once 
							
						 
						
							2017-09-23 14:47:32 +02:00  
				
					
						
							
							
								 
						
							
								48d77ea1eb 
								
							 
						 
						
							
							
								
								Fix filterable_languages method of SettingsHelper ( #4966 )  
							
							
							
						 
						
							2017-09-16 14:59:41 +02:00  
				
					
						
							
							
								 
						
							
								8f8e677630 
								
							 
						 
						
							
							
								
								Clean up and improve generated OpenGraph tags ( #4901 )  
							
							... 
							
							
							
							- Return all images as og:image
- Return videos as og:image (preview) and og:video
- Return profile:username on profiles 
							
						 
						
							2017-09-12 05:39:38 +02:00  
				
					
						
							
							
								 
						
							
								1caf11ddcc 
								
							 
						 
						
							
							
								
								Fix language filter codes ( #4841 )  
							
							... 
							
							
							
							* Fix language filter codes
CLD3 returns BCP-47 language identifier, filter settings expect
identifiers in the ISO 639-1 format. Convert between formats,
and exclude duplicate languages from filter choices (zh-CN->zh)
* Fix zh name 
							
						 
						
							2017-09-08 12:32:22 +02:00  
				
					
						
							
							
								 
						
							
								6994664a13 
								
							 
						 
						
							
							
								
								swift-enable the paperclip!  📎  ( #2322 )  
							
							
							
						 
						
							2017-09-05 23:17:06 +02:00  
				
					
						
							
							
								 
						
							
								e95bdec7c5 
								
							 
						 
						
							
							
								
								Update status embeds ( #4742 )  
							
							... 
							
							
							
							- Use statuses controller for embeds instead of stream entries controller
- Prefer /@:username/:id/embed URL for embeds
- Use /@:username as author_url in OEmbed
- Add follow link to embeds which opens web intent in new window
- Use redis cache in development
- Cache entire embed 
							
						 
						
							2017-08-30 10:23:43 +02:00  
				
					
						
							
							
								 
						
							
								0d5d11eeff 
								
							 
						 
						
							
							
								
								Add _:inReplyToAtomUri to ActivityPub ( #4702 )  
							
							
							
						 
						
							2017-08-26 19:55:10 +02:00  
				
					
						
							
							
								 
						
							
								00840f4f2e 
								
							 
						 
						
							
							
								
								Add handling of Linked Data Signatures in payloads ( #4687 )  
							
							... 
							
							
							
							* Add handling of Linked Data Signatures in payloads
* Add a way to sign JSON, fix canonicalization of signature options
* Fix signatureValue encoding, send out signed JSON when distributing
* Add missing security context 
							
						 
						
							2017-08-26 13:47:38 +02:00  
				
					
						
							
							
								 
						
							
								5927b43c0f 
								
							 
						 
						
							
							
								
								Ignore empty response in ActivityPub::FetchRemoteStatusService ( #4661 )  
							
							... 
							
							
							
							* Ignore empty response in ActivityPub::FetchRemoteStatusService
This fixes `NoMethodError: undefined method `[]' for nil:NilClass` error.
* Check json.nil? in JsonLdHelper#supported_context? 
							
						 
						
							2017-08-22 20:00:49 +02:00  
				
					
						
							
							
								 
						
							
								72bb3e03fd 
								
							 
						 
						
							
							
								
								Support more variations of ActivityPub keyId in signature ( #4630 )  
							
							... 
							
							
							
							- Tries to avoid performing HTTP request if the keyId is an actor URI
- Likewise if the URI is a fragment URI on top of actor URI
- Resolves public key, returns owner if the owner links back to the key 
							
						 
						
							2017-08-21 22:57:34 +02:00  
				
					
						
							
							
								 
						
							
								10e9a9a3f9 
								
							 
						 
						
							
							
								
								Use URI.join even when S3 enabled ( #4652 )  
							
							
							
						 
						
							2017-08-21 12:42:16 +02:00  
				
					
						
							
							
								 
						
							
								efec02f153 
								
							 
						 
						
							
							
								
								use existing inflections instead of custom helper ( #4624 )  
							
							... 
							
							
							
							* use existing inflections instead of custom helper
* use ActiveSupport versions 
							
						 
						
							2017-08-17 23:20:50 +02:00  
				
					
						
							
							
								 
						
							
								075d6a1e13 
								
							 
						 
						
							
							
								
								Show what protocol is used for accounts in admin/accounts#index ( #4622 )  
							
							... 
							
							
							
							* Show what protocol used for in admin/accounts#index
* Add frozen_string_literal 
							
						 
						
							2017-08-17 17:52:40 +02:00  
				
					
						
							
							
								 
						
							
								ca7ea1aba9 
								
							 
						 
						
							
							
								
								Redesign public profiles ( #4608 )  
							
							... 
							
							
							
							* Redesign public profiles
* Responsive design
* Change public profile status filtering defaults and add options
- No longer displays private/direct toots even if you are permitted access
- By default omits replies
- "With replies" option
- "Media only" option
* Redesign account grid cards
* Fix style issues 
							
						 
						
							2017-08-16 17:12:58 +02:00  
				
					
						
							
							
								 
						
							
								4e75f0d889 
								
							 
						 
						
							
							
								
								Hook up URL-based resource look-up to ActivityPub ( #4589 )  
							
							
							
						 
						
							2017-08-14 02:29:36 +02:00  
				
					
						
							
							
								 
						
							
								dd7ef0dc41 
								
							 
						 
						
							
							
								
								Add ActivityPub inbox ( #4216 )  
							
							... 
							
							
							
							* Add ActivityPub inbox
* Handle ActivityPub deletes
* Handle ActivityPub creates
* Handle ActivityPub announces
* Stubs for handling all activities that need to be handled
* Add ActivityPub actor resolving
* Handle conversation URI passing in ActivityPub
* Handle content language in ActivityPub
* Send accept header when fetching actor, handle JSON parse errors
* Test for ActivityPub::FetchRemoteAccountService
* Handle public key and icon/image when embedded/as array/as resolvable URI
* Implement ActivityPub::FetchRemoteStatusService
* Add stubs for more interactions
* Undo activities implemented
* Handle out of order activities
* Hook up ActivityPub to ResolveRemoteAccountService, handle
Update Account activities
* Add fragment IDs to all transient activity serializers
* Add tests and fixes
* Add stubs for missing tests
* Add more tests
* Add more tests 
							
						 
						
							2017-08-08 21:52:15 +02:00  
				
					
						
							
							
								 
						
							
								bb96ba13cf 
								
							 
						 
						
							
							
								
								Fallback to site_hostname when site_title is empty ( #4394 )  
							
							
							
						 
						
							2017-07-27 15:13:49 +02:00  
				
					
						
							
							
								 
						
							
								a390abdefb 
								
							 
						 
						
							
							
								
								Use the same emoji data on the frontend and backend ( #4284 )  
							
							... 
							
							
							
							* Use the same emoji data on the frontend and backend
* Move emoji.json to repository, add tests
This way you don't need to install node dependencies if you only
want to run Ruby code 
							
						 
						
							2017-07-21 04:27:40 +02:00  
				
					
						
							
							
								 
						
							
								c2c93f8cd6 
								
							 
						 
						
							
							
								
								Fix deprecation warning for non-pipeline assets ( #4267 )  
							
							
							
						 
						
							2017-07-19 12:00:05 +02:00  
				
					
						
							
							
								 
						
							
								8c45cd0e36 
								
							 
						 
						
							
							
								
								Improve ActivityPub representations ( #3844 )  
							
							... 
							
							
							
							* Improve webfinger templates and make tests more flexible
* Clean up AS2 representation of actor
* Refactor outbox
* Create activities representation
* Add representations of followers/following collections, do not redirect /users/:username route if format is empty
* Remove unused translations
* ActivityPub endpoint for single statuses, add ActivityPub::TagManager for better
URL/URI generation
* Add ActivityPub::TagManager#to
* Represent all attachments as Document instead of Image/Video specifically
(Because for remote ones we may not know for sure)
Add mentions and hashtags representation to AP notes
* Add AP-resolvable hashtag URIs
* Use ActiveModelSerializers for ActivityPub
* Clean up unused translations
* Separate route for object and activity
* Adjust cc/to matrices
* Add to/cc to activities, ensure announce activity embeds target status and
not the wrapper status, add "id" to all collections 
							
						 
						
							2017-07-15 03:01:39 +02:00  
				
					
						
							
							
								 
						
							
								1618b68bfa 
								
							 
						 
						
							
							
								
								HTTP signatures ( #4146 )  
							
							... 
							
							
							
							* Add Request class with HTTP signature generator
Spec: https://tools.ietf.org/html/draft-cavage-http-signatures-06 
* Add HTTP signature verification concern
* Add test for SignatureVerification concern
* Add basic test for Request class
* Make PuSH subscribe/unsubscribe requests use new Request class
Accidentally fix lease_seconds not being set and sent properly, and
change the new minimum subscription duration to 1 day
* Make all PuSH workers use new Request class
* Make Salmon sender use new Request class
* Make FetchLinkService use new Request class
* Make FetchAtomService use the new Request class
* Make Remotable use the new Request class
* Make ResolveRemoteAccountService use the new Request class
* Add more tests
* Allow +-30 seconds window for signed request to remain valid
* Disable time window validation for signed requests, restore 7 days
as PuSH subscription duration (which was previous default due to a bug) 
							
						 
						
							2017-07-14 20:41:49 +02:00  
				
					
						
							
							
								 
						
							
								e2685ccc81 
								
							 
						 
						
							
							
								
								Fix   #4149 ,  fix   #1199  - Store emojis as unicode ( #4189 )  
							
							... 
							
							
							
							- Use unicode when selecting emoji through picker
- Convert shortcodes to unicode when storing text input server-side
- Do not convert shortcodes in JS anymore 
							
						 
						
							2017-07-14 19:47:53 +02:00  
				
					
						
							
							
								 
						
							
								2d6128672f 
								
							 
						 
						
							
							
								
								Togglable filter links ( #4021 )  
							
							... 
							
							
							
							* Togglable filter links
* Rename is_selected to selected? 
							
						 
						
							2017-07-07 00:48:09 +02:00  
				
					
						
							
							
								 
						
							
								4cddef1cea 
								
							 
						 
						
							
							
								
								i18n: Add korean translation ( #4064 )  
							
							... 
							
							
							
							* Added Korean Translation (based on japanese)
* Update korean translation
* Update korean translation: fix syntax error
* Updated korean translation
* Update korean translation
* Update ko.json
Translate non-translated parts
* Update ko.yml
Translated missed parts - and fixed some typos
* Create simple_form.ko.yml
* Updated korean translation
* i18n: fix test fails 
							
						 
						
							2017-07-04 16:11:23 +02:00  
				
					
						
							
							
								 
						
							
								92f1c474f3 
								
							 
						 
						
							
							
								
								Add fa-fw class to user agent icon ( #4047 )  
							
							
							
						 
						
							2017-07-03 11:04:35 +02:00  
				
					
						
							
							
								 
						
							
								f7301bd5b9 
								
							 
						 
						
							
							
								
								Add overview of active sessions ( #3929 )  
							
							... 
							
							
							
							* Add overview of active sessions
* Better display of browser/platform name
* Improve how browser information is stored and displayed for sessions overview
* Fix test 
							
						 
						
							2017-06-25 16:54:30 +02:00  
				
					
						
							
							
								 
						
							
								b16b69350e 
								
							 
						 
						
							
							
								
								Fix RTL detection on Ruby side ( #3867 )  
							
							... 
							
							
							
							This fixes below bugs:
* pipe characters being counted as RTL character
* only first word being checked 
							
						 
						
							2017-06-20 18:45:09 +02:00  
				
					
						
							
							
								 
						
							
								ff142eb64d 
								
							 
						 
						
							
							
								
								setting-for-account-deletable ( #3852 )  
							
							
							
						 
						
							2017-06-19 15:12:31 +02:00  
				
					
						
							
							
								 
						
							
								8015fd7600 
								
							 
						 
						
							
							
								
								Improve RTL detection ( #3682 )  
							
							... 
							
							
							
							- Use plaintext
- Strip out URLs
- Strip out mentions
- Strip out hashtags
- Strip out whitespace from "overall" count
- Consistent between JS and Ruby 
							
						 
						
							2017-06-10 15:06:50 +02:00  
				
					
						
							
							
								 
						
							
								0a0b9a271a 
								
							 
						 
						
							
							
								
								Improve RuboCop rules (compatibility to Code Climate) ( #3636 )  
							
							... 
							
							
							
							08f8de84eb/Gemfile.lock (L38) 
						
							2017-06-08 13:24:28 +02:00  
				
					
						
							
							
								 
						
							
								e98559c3ff 
								
							 
						 
						
							
							
								
								Resolve custom application stylesheet with Webpack ( #3373 )  
							
							... 
							
							
							
							This implementation is a bit smaller and still has the following benefits:
* No need of app/javascript/packs/custom.js
For custom stylesheet, it typically has only
"require('../styles/custom.scss')" and is redundant.
* No need to extract vendor stylesheet to another asset
Extracting vendor stylesheet could be forgotten by developers who do not
use custom stylesheet. 
							
						 
						
							2017-06-01 20:56:32 +02:00  
				
					
						
							
							
								 
						
							
								62ca37884a 
								
							 
						 
						
							
							
								
								Fix   #2922  - Load stylesheet from "custom.css" entrypoint when present ( #3332 )  
							
							... 
							
							
							
							* Fix  #2922  - Load stylesheet from "custom.css" entrypoint when present
This is pretty much the same way it worked as before, albeit with
having to create app/javascript/packs/custom.js with
require('../styles/custom.scss') (or whatever you want really), which
will be a blank slate for you to import whatever you want
* Remove old assets directory
* Extract font-awesome into common.css and always load it 
							
						 
						
							2017-05-27 16:55:09 +02:00  
				
					
						
							
							
								 
						
							
								3002a89419 
								
							 
						 
						
							
							
								
								Remove unused style helper ( #3145 )  
							
							
							
						 
						
							2017-05-19 16:54:47 +02:00  
				
					
						
							
							
								 
						
							
								8e4fc5d5d2 
								
							 
						 
						
							
							
								
								Improve how params from controller are permitted in filter helper ( #3129 )  
							
							... 
							
							
							
							The `params` variable here was quite overloaded.
It exists via the controller to hold the request params, and was sometimes being
used in this helper as that object, but other times was being used as a local
variable, or to pass to another method, and this was confusing.
This change renames the args for a method away from `params` for more clarity,
and extracts the actual usage of the controller-provided `params` to a
better-named method for clarity. 
							
						 
						
							2017-05-19 11:43:20 +02:00  
				
					
						
							
							
								 
						
							
								25e5aa645d 
								
							 
						 
						
							
							
								
								Skip asset pipeline for static file in public/ ( #3125 )  
							
							
							
						 
						
							2017-05-19 02:41:56 +02:00  
				
					
						
							
							
								 
						
							
								e89e4355eb 
								
							 
						 
						
							
							
								
								Add filter to AccountFilter ( #2968 )  
							
							
							
						 
						
							2017-05-17 03:00:34 +02:00  
				
					
						
							
							
								 
						
							
								a51c8074df 
								
							 
						 
						
							
							
								
								Add catalan language ( #3084 )  
							
							... 
							
							
							
							* Add Catalan language
* Add Catalan language
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update settings_helper.rb
* Update mastodon.js
* Update index.js
* Update application.rb
* Update ca.yml
* removed extra spaces at line 225 
							
						 
						
							2017-05-17 00:25:10 +02:00  
				
					
						
							
							
								 
						
							
								cb50ecdb07 
								
							 
						 
						
							
							
								
								chore(landing_strip): hide signup path unless the instance allows registration. ( #3055 )  
							
							
							
						 
						
							2017-05-16 00:41:09 +02:00  
				
					
						
							
							
								 
						
							
								cbd673601c 
								
							 
						 
						
							
							
								
								Add Thai langauge ( #2903 )  
							
							... 
							
							
							
							* Updated Thai language
* locale: remove unused translation in Thai
* locale: add Thai to settings menu and application
* locale: fix activerecord.th.yml format 
							
						 
						
							2017-05-08 15:56:00 +02:00  
				
					
						
							
							
								 
						
							
								983593ddf4 
								
							 
						 
						
							
							
								
								Add Turkish yml file ( #2878 )  
							
							... 
							
							
							
							* Add Turkish yml file
* Add translation files for Turkish
* Deleted click_to_edit key and val
Deleted click_to_edit: Düzenlemek için ilgili ayara tıklayınız line 
							
						 
						
							2017-05-07 16:20:53 +02:00  
				
					
						
							
							
								 
						
							
								81584779cb 
								
							 
						 
						
							
							
								
								More robust PuSH subscription refreshes ( #2799 )  
							
							... 
							
							
							
							* Fix  #2473  - Use sidekiq scheduler to refresh PuSH subscriptions instead of cron
Fix an issue where / in domain would raise exception in TagManager#normalize_domain
PuSH subscriptions refresh done in a round-robin way to avoid hammering a single
server's hub in sequence. Correct handling of failures/retries through Sidekiq (see
also #2613 ). Optimize Account#with_followers scope. Also, since subscriptions
are now delegated to Sidekiq jobs, an uncaught exception will not stop the entire
refreshing operation halfway through
Fix  #2702  - Correct user agent header on outgoing http requests
* Add test for SubscribeService
* Extract #expiring_accounts into method
* Make mastodon:push:refresh no-op
* Queues are now defined in sidekiq.yml
* Queues are now in sidekiq.yml 
							
						 
						
							2017-05-05 02:23:01 +02:00  
				
					
						
							
							
								 
						
							
								2ab7dc9a55 
								
							 
						 
						
							
							
								
								Use URI.join for generate asset URL ( #2741 )  
							
							... 
							
							
							
							* Use URI.join for generate asset URL
* to String 
							
						 
						
							2017-05-03 11:31:21 +02:00  
				
					
						
							
							
								 
						
							
								f5bf5ebb82 
								
							 
						 
						
							
							
								
								Replace sprockets/browserify with Webpack ( #2617 )  
							
							... 
							
							
							
							* Replace browserify with webpack
* Add react-intl-translations-manager
* Do not minify in development, add offline-plugin for ServiceWorker background cache updates
* Adjust tests and dependencies
* Fix production deployments
* Fix tests
* More optimizations
* Improve travis cache for npm stuff
* Re-run travis
* Add back support for custom.scss as before
* Remove offline-plugin and babili
* Fix issue with Immutable.List().unshift(...values) not working as expected
* Make travis load schema instead of running all migrations in sequence
* Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of
React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in
<UI />
* Add react definitions to places that use JSX
* Add Procfile.dev for running rails, webpack and streaming API at the same time 
							
						 
						
							2017-05-03 02:04:16 +02:00  
				
					
						
							
							
								 
						
							
								438ce5809f 
								
							 
						 
						
							
							
								
								Add Hebrew interface translation. ( #2573 )  
							
							... 
							
							
							
							* follow the instructions for registering the language as stated on the Tootsuite's docs.
* Added translation strings from latest master
Adding ‏ characters to many strings that are misdirected in the interface.
A tiny grammar fix
Updates of Hebrew strings to v1.3.1
Hebrew translation of the mailer templates.
Fix strings and a missing comma.
Just discovered two string keys were updated. this should lay Travis' mind to rest at last.
Remove mentions before counting characters to decide RTL ratio
Fixes for PR #2573 
updated strings for latest master
Undo RTL counting, moved out to another branch for future consideration... 
							
						 
						
							2017-05-02 08:54:35 -04:00  
				
					
						
							
							
								 
						
							
								8325866c61 
								
							 
						 
						
							
							
								
								Downgrade rubocop 0.48.1 => 0.46.0 ( #2628 )  
							
							... 
							
							
							
							* downgrade rubocop 0.48.1 => 0.46.0
* exclude vendor/**/* from rubocop target files
* add frozen_string_literal comment line
* fix percent literal delimited by ( and )
* fix alignment
* remove comment disabling unknown cop 
							
						 
						
							2017-04-30 00:23:45 +02:00  
				
					
						
							
							
								 
						
							
								9a085e138e 
								
							 
						 
						
							
							
								
								Update settings_helper.rb ( #2556 )  
							
							... 
							
							
							
							Correcting language name arabic = العربية 
							
						 
						
							2017-04-28 01:59:19 +02:00  
				
					
						
							
							
								 
						
							
								b48c9013aa 
								
							 
						 
						
							
							
								
								Bump version, improve how version is stored for better commit history ( #2526 )  
							
							
							
						 
						
							2017-04-27 15:22:19 +02:00  
				
					
						
							
							
								 
						
							
								1736badf28 
								
							 
						 
						
							
							
								
								Added '(dev)' to the title in development mode ( #2524 )  
							
							... 
							
							
							
							* Added different title for dev
* Changed indentation 
							
						 
						
							2017-04-27 15:17:55 +02:00  
				
					
						
							
							
								 
						
							
								88725d6ce8 
								
							 
						 
						
							
							
								
								OEmbed support for PreviewCard ( #2337 )  
							
							... 
							
							
							
							* OEmbed support for PreviewCard
* Improve ProviderDiscovery code failure treatment
* Do not crawl links if there is a content warning, since those
don't display a link card anyway
* Reset db schema
* Fresh migrate
* Fix rubocop style issues
Fix  #1681  - return existing access token when applicable instead of creating new
* Fix test
* Extract http client to helper
* Improve oembed controller 
							
						 
						
							2017-04-27 14:42:22 +02:00  
				
					
						
							
							
								 
						
							
								25cbb8454c 
								
							 
						 
						
							
							
								
								Red favicon for dev ( #2470 )  
							
							... 
							
							
							
							* Set a dev specific favicon
* Consistent spacing
* Add trailing slash for consistency
* Update to remove interpolation 
							
						 
						
							2017-04-26 15:45:27 +02:00  
				
					
						
							
							
								 
						
							
								122d59ac41 
								
							 
						 
						
							
							
								
								Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes. ( #2410 )  
							
							... 
							
							
							
							* Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes.
* Fix code style and test failures for OutboxController.
* Attempt to fix CI errors. 
							
						 
						
							2017-04-25 15:06:06 +02:00  
				
					
						
							
							
								 
						
							
								bb04a9be52 
								
							 
						 
						
							
							
								
								Persian translation ( #2405 )  
							
							... 
							
							
							
							* Persian translation
* adding :fa to make the site use the rtl stylesheet
based on [this comment](https://github.com/tootsuite/mastodon/pull/2405#issuecomment-296721105 )
* fix missing quotes
* add 'fa' locale 
							
						 
						
							2017-04-24 22:39:15 +02:00  
				
					
						
							
							
								 
						
							
								e59f5c8e13 
								
							 
						 
						
							
							
								
								Add an RTL stylesheet for Arabic i18n ( #2378 )  
							
							
							
						 
						
							2017-04-24 18:03:53 +02:00  
				
					
						
							
							
								 
						
							
								55e1e12b7d 
								
							 
						 
						
							
							
								
								Ensure i18n matches options ( #2358 )  
							
							... 
							
							
							
							* Add failing spec showing that human_locales does not match what i18n knows about
* Add missing `ar` key for arabic to human locales
* Remove duplicate `id` key from available locales
* Sort keys in human locales list
* Add spec for human_locale helper 
							
						 
						
							2017-04-23 19:09:52 +02:00  
				
					
						
							
							
								 
						
							
								1cf9e14a41 
								
							 
						 
						
							
							
								
								Test embedded_view related code in a helper ( #2282 )  
							
							... 
							
							
							
							The two methods `StreamEntriesHelper#stream_link_target` and
`StreamEntriesHelper#acct` are based on checking whether we are running
in an embedded view.
This adds some test helper code to make the testing easier. We extracted
some "magic strings" to constants to lower the coupling in the specs. 
							
						 
						
							2017-04-23 06:05:52 +02:00  
				
					
						
							
							
								 
						
							
								0c2fe22bc1 
								
							 
						 
						
							
							
								
								Add test coverage to CSS class generation ( #2285 )  
							
							... 
							
							
							
							The code that generates CSS is based on a lot of boolean conditions.
The possible combinations of these grows exponentially as we add more
conditions.
Since most of the code is conditional on a single boolean, we tested the
following:
1. All `false`
2. All `true`
3. Each individual flag set to `true`
The methods tested are:
* `StreamEntriesHelper#style_classes`
* `StreamEntriesHelper#microformats_classes`
* `StreamEntriesHelper#microformats_h_class` 
							
						 
						
							2017-04-23 06:04:32 +02:00  
				
					
						
							
							
								 
						
							
								66fd8e7821 
								
							 
						 
						
							
							
								
								ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities ( #2197 )  
							
							... 
							
							
							
							* Clean up collapsible components
* Expose user Outboxes and AS2 representations of statuses
* Save work thus far.
* Fix bad merge.
* Save my work
* Clean up pagination.
* First test working.
* Add tests.
* Add Forbidden error template.
* Revert yarn.lock changes.
* Fix code style deviations and use localized instead of hardcoded English text. 
							
						 
						
							2017-04-23 05:21:10 +02:00  
				
					
						
							
							
								 
						
							
								532bec6e56 
								
							 
						 
						
							
							
								
								Clean up flash display in views ( #2336 )  
							
							... 
							
							
							
							* Add flashes partial to DRY up admin/auth layouts
* Further consolidate flash messages 
							
						 
						
							2017-04-23 04:22:34 +02:00  
				
					
						
							
							
								 
						
							
								974ac467de 
								
							 
						 
						
							
							
								
								Add tests for StreamEntriesHelper#rtl? ( #2286 )  
							
							... 
							
							
							
							We used some random Arabic characters to test that the various RTL
conditions got triggered. 
							
						 
						
							2017-04-22 00:13:37 +02:00  
				
					
						
							
							
								 
						
							
								935aecdc32 
								
							 
						 
						
							
							
								
								Add Indonesian (Bahasa Indonesia / id) translation ( #2200 )  
							
							... 
							
							
							
							* add Indonesian (Bahasa Indonesia) translation
add id.jsx
add translations on email views
add devise.id.yml
add doorkeeper.id.yml
add id.yml
add simple_form.id.yml
update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and
application.rb
* add Indonesian (Bahasa Indonesia) translation
add id.jsx
add translations on email views
add devise.id.yml
add doorkeeper.id.yml
add id.yml
add simple_form.id.yml
update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and
application.rb
* fix InvalidLocaleData on a string
* fix InvalidLocaleData on a string
* Fix language keys in Indonesian ruby locale (id)
Use "id" instead of "en" as object keys.
* Removed obsoleted translation (id) 
							
						 
						
							2017-04-21 19:16:26 +02:00  
				
					
						
							
							
								 
						
							
								1714f08d75 
								
							 
						 
						
							
							
								
								Add Ido (io) translation ( #2202 )  
							
							... 
							
							
							
							* Add Ido (io) translation
* Fix mastodon.jsx for io reference
There is no react-intl support for io. Removed the references. 
							
						 
						
							2017-04-21 19:15:25 +02:00  
				
					
						
							
							
								 
						
							
								6c34eafe02 
								
							 
						 
						
							
							
								
								Enables the Polish translation. ( #2235 )  
							
							
							
						 
						
							2017-04-21 03:29:11 +02:00  
				
					
						
							
							
								 
						
							
								66d8f99a30 
								
							 
						 
						
							
							
								
								Admin reports with accounts ( #2092 )  
							
							... 
							
							
							
							* Add a ReportFilter class
* Add reports and targeted_reports relationships to Account
* Use ReportFilter from admin/reports controller
* Link to admin/reports filtered views from admin account show view
* Add indexes to reports.account_id and reports.target_account_id 
							
						 
						
							2017-04-18 19:36:18 +02:00  
				
					
						
							
							
								 
						
							
								0a1b024600 
								
							 
						 
						
							
							
								
								Add Occitan (oc) translation ( #2077 )  
							
							... 
							
							
							
							* Added oc.yml
* Added `config/locales/oc.yml`.
  Translated in General Occitan (Quent-in).
* Added oc.jsx (Occitan translation)
* Written in General Occitan (lengadocian)
* Added `app/assets/javascripts/components/locales/oc.js`
* Added doorkeeper.oc.yml
* Added `config/locales/doorkeeper.oc.yml` (Quent-in)
* Added simple_form.oc.yml
* Added `config/locales/simple_form.oc.yml` (Quent-in).
* Merge en.yml changes into oc.yml
Added new strings for translations
* Fix typo in oc.yml
* Update javascript locale support (oc)
* Update ruby locale list (oc)
* Fix oc.yml
* Remove obsoleted translations
* Moved old translation of `reports` to `admin.reports` 
							
						 
						
							2017-04-18 15:21:16 +02:00  
				
					
						
							
							
								 
						
							
								389f8f8249 
								
							 
						 
						
							
							
								
								Instance helper to replace site title helper ( #2038 )  
							
							... 
							
							
							
							* Move site title helper to instance helper (name change only)
* Remove newline in <title> tag
* Add site_hostname helper method to wrap up local_domain value
* Use site_hostname helper in places that need local_domain value 
							
						 
						
							2017-04-18 00:16:32 +02:00  
				
					
						
							
							
								 
						
							
								6685106daa 
								
							 
						 
						
							
							
								
								Add Brazilian Portuguese and fix European Portuguese ( #1966 )  
							
							... 
							
							
							
							* update portuguese translation
added the missing fields and improved the translation
* pt translations fix
* improve last translation commit
* fix damn quotes
* add pt_br to index.jsx
* add pt-BR to import index.jsx
* add pt-BR to mastodon.jsx
* add pt-BR to settings_helper.rb
* add pt-BR to application.rb
* order alphabetically pt.jsx
* create pt-BR.jsx
* Create devise.pt-BR.yml
* language improvements to devise.pt.yml
* created doorkeeper.pt-BR.yml
* fixes to doorkeeper.pt.yml
* create pt-BR.yml
* improvements to pt.yml
* Create simple_form.pt-BR.yml
* Improvements to simple_form.pt.yml
* improvements to pt.yml 
							
						 
						
							2017-04-17 10:38:27 +02:00  
				
					
						
							
							
								 
						
							
								8ad6722eea 
								
							 
						 
						
							
							
								
								Create hr.jsx ( #1945 )  
							
							... 
							
							
							
							* Create hr.jsx
Start of Croatian translation
* Update settings_helper.rb
* Update application.rb
* Update application.rb
* Update index.jsx 
							
						 
						
							2017-04-17 10:38:13 +02:00  
				
					
						
							
							
								 
						
							
								6afe70db95 
								
							 
						 
						
							
							
								
								Add human locales for zh-tw ( #1984 )  
							
							
							
						 
						
							2017-04-17 10:35:06 +02:00  
				
					
						
							
							
								 
						
							
								3834e1e69b 
								
							 
						 
						
							
							
								
								View spec fix ( #1888 )  
							
							... 
							
							
							
							* Add option to disable verify partial doubles
* Add show_landing_strip? helper method
* Use show_landing_strip? helper in accounts and stream entries views
* Fix naming in view specs 
							
						 
						
							2017-04-16 03:40:33 +02:00  
				
					
						
							
							
								 
						
							
								3d3e32befb 
								
							 
						 
						
							
							
								
								Check for a custom css file to help customization of instances ( #1368 )  
							
							... 
							
							
							
							* User can create a custom.scss to customize their instance without modifying gitted files.
* Add documentation for customization.
* Forgot the helper file
* Fix Style to pass codeclimate
* Requests from maintainer. 
							
						 
						
							2017-04-15 22:47:48 +02:00  
				
					
						
							
							
								 
						
							
								09540192c9 
								
							 
						 
						
							
							
								
								Rename admin/accounts_helper to admin/filter_helper ( #1816 )  
							
							... 
							
							
							
							- Add some spec coverage for both methods
- Add explicit constant call-outs for where the params are from 
							
						 
						
							2017-04-15 03:09:55 +02:00  
				
					
						
							
							
								 
						
							
								8b74aa4217 
								
							 
						 
						
							
							
								
								Admin reports controller improvements ( #1714 )  
							
							... 
							
							
							
							* Simplify admin/reports controller filtering for index
* Rename parameter to resolved
* Fix issue where reports view could not access filter_link_to
* Add coverage for admin/reports controller
* DRY up resolution of related reports for target account
* Clean up admin/reports routes
* Add Report#statuses method
* DRY up current account action taken params
* Rubocop styles 
							
						 
						
							2017-04-14 11:10:28 +02:00  
				
					
						
							
							
								 
						
							
								41c697fd81 
								
							 
						 
						
							
							
								
								Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master  
							
							
							
						 
						
							2017-04-13 22:25:07 +02:00  
				
					
						
							
							
								 
						
							
								efcf9448da 
								
							 
						 
						
							
							
								
								Update settings_helper.rb  
							
							
							
						 
						
							2017-04-13 16:16:39 +02:00  
				
					
						
							
							
								 
						
							
								1206627c59 
								
							 
						 
						
							
							
								
								Add Dutch translation (nl) ( #1682 )  
							
							... 
							
							
							
							* Dutch language files for Ruby code
 * Created RoR translation ymls:
   * config/locales/devise.nl.yml
   * config/locales/doorkeeper.nl.yml
   * config/locales/nl.yml
   * config/locales/simple_form.nl.yml
 * Modified RoR config and helper
   * app/helpers/settings_helper.rb
   * config/application.rb
* Dutch language javascript locale
 * Created javascript locale files:
   * app/assets/javascripts/components/locales/index.jsx
   * app/assets/javascripts/components/locales/nl.jsx
 * Reference the newly created locale files:
   * app/assets/javascripts/components/containers/mastodon.jsx
* Fix syntax error in locale file (nl)
* Fix missing translate in js locale (nl)
* Convert all ruby Dutch locale (nl) file to utf8
Fix yml conversion issues.
* Fix duplicated key in devise.nl.yml
* Fix indentation error in doorkeeper.nl.yml 
							
						 
						
							2017-04-13 16:02:23 +02:00  
				
					
						
							
							
								 
						
							
								905a4faa1c 
								
							 
						 
						
							
							
								
								Update settings_helper.rb  
							
							
							
						 
						
							2017-04-13 15:32:31 +02:00  
				
					
						
							
							
								 
						
							
								5355b7d930 
								
							 
						 
						
							
							
								
								Update settings_helper.rb  
							
							
							
						 
						
							2017-04-13 15:31:38 +02:00  
				
					
						
							
							
								 
						
							
								aa7bf1515c 
								
							 
						 
						
							
							
								
								Fix   #624  - Add localization for Bulgarian ( #645 )  
							
							... 
							
							
							
							* Add translation files and declarations for Bulgarian
* Add a bunch of translations to bg.jsx
* Add rest of translations to bg.jsx
* Add devise translations
* Fix devise translations 
							
						 
						
							2017-04-13 13:16:28 +02:00  
				
					
						
							
							
								 
						
							
								0254ee9795 
								
							 
						 
						
							
							
								
								significant improvement in microformats markup ( #1063 )  
							
							... 
							
							
							
							* significant improvement in microformats markup
This is a huge improvement and I believe will close  #965 .
Had these microformats reviewed by others in the community to help
ensure they are at least correct, if not complete.
I did not want to change the structure of the page, and so there it does
not fully mark up the entire ancestry chain, or reply chain, only the
direct decendants and direct ancestors are correctly associated, but
this is likely fine as the most important bit is to have access to the
urls for those toots which are now correctly fetchable.
* improve code climate
* trying to pass code climate tests
* code climate
* fix p-summary for content warning posts
* fix error introduced when merging via github 
							
						 
						
							2017-04-12 20:04:33 +02:00  
				
					
						
							
							
								 
						
							
								c44a700252 
								
							 
						 
						
							
							
								
								Quick best practice cleanup of views/helpers ( #1546 )  
							
							... 
							
							
							
							* Remove trailing whitespace
* Use query methods instead of explicit .blank? checks 
							
						 
						
							2017-04-12 18:24:18 +02:00  
				
					
						
							
							
								 
						
							
								1f5ff46fd9 
								
							 
						 
						
							
							
								
								Working translation for Norwegian. ( #1611 )  
							
							
							
						 
						
							2017-04-12 17:07:51 +02:00  
				
					
						
							
							
								 
						
							
								13528f50c3 
								
							 
						 
						
							
							
								
								Params compact deprecation warning ( #1580 )  
							
							... 
							
							
							
							* Move filter_link_to class formation to separate method in admin/accounts helper
* Remove deprecated #compact method usage on strong parameters 
							
						 
						
							2017-04-12 16:12:56 +02:00  
				
					
						
							
							
								 
						
							
								dd1ae3b109 
								
							 
						 
						
							
							
								
								Simplify the way the embed view is created ( #1590 )  
							
							... 
							
							
							
							* Add coverage for embedded status view
* Refactor embed view to eliminate @external_links variable 
							
						 
						
							2017-04-12 16:12:42 +02:00  
				
					
						
							
							
								 
						
							
								24eb45425e 
								
							 
						 
						
							
							
								
								Add Traditional Chinese, Hong Kong translation (zh-HK) ( #1544 )  
							
							... 
							
							
							
							* Added Chinese Traditional Hong Kong (zh-HK) for Ruby
* Added translations for Ruby.
* Added Chinese Traditional Hong Kong (zh-HK) for JS
* Added translations for javascript code.
* Rearrange language references in mastodon.jsx
* Break `addLocaleData` into multiple lines. Make future commit more readable.
* Roughly re-sort the languages in alphabetical orders
  (only manually put English on top because it is default).
* Sort application.rb locale with alphabetical order
With exception that English (default language) goes first.
Improve code readability.
* Resort language selection box alphabetically
Sort HUMAN_LOCALES in the alphabetical order of display name
(except English, the default language, come first).
Improve usability. 
							
						 
						
							2017-04-12 08:50:50 +02:00  
				
					
						
							
							
								 
						
							
								6f5268b02d 
								
							 
						 
						
							
							
								
								Add Japanese translation ( #1552 )  
							
							... 
							
							
							
							* add device.ja.yml
* update device.ja.yml
* add file simple_form.ja.yml
* 👍 Added doorkeeper.ja.yml
* add ja.yml
* Update doorkeeper.ja.yml
fixed url to uri
* update ja.yml
* fix some translations
* fix japanese grammar of a translate
* fix some translates
* fix ja.yml
* add ja.jsx
* add Japanese user mail views
* Added japanese translate locales
* Added :ja to available_locales
こっちも
* Added "日本語" to HUMAN_LOCALES
* Imported/Added ja to addLocaleData
* update ja.jsx 
							
						 
						
							2017-04-11 21:52:09 +02:00  
				
					
						
							
							
								 
						
							
								e60286a344 
								
							 
						 
						
							
							
								
								Remove unused methods from StreamEntriesHelper ( #1365 )  
							
							... 
							
							
							
							Removes:
- avatar_for_status_url
- relative_time
- reblogged_by_me_class
- favourited_by_me_class 
							
						 
						
							2017-04-11 19:32:02 +02:00  
				
					
						
							
							
								 
						
							
								53850bce93 
								
							 
						 
						
							
							
								
								Remove unused AtomBuilderHelper ( #1364 )  
							
							... 
							
							
							
							This was used in the views/atom/user_stream.xml.ruby file, which no longer is
used. 
							
						 
						
							2017-04-11 19:31:22 +02:00  
				
					
						
							
							
								 
						
							
								4ada50985a 
								
							 
						 
						
							
							
								
								Pagination improvements ( #1445 )  
							
							... 
							
							
							
							* Replace will_paginate with kaminari
* Use #page instead of #paginate in controllers
* Replace will_paginate.page_gap with pagination.truncate in i18n
* Customize kaminari views to match prior styles
* Set kaminari options to match prior behavior
* Replace will_paginate with paginate in views 
							
						 
						
							2017-04-11 01:11:41 +02:00  
				
					
						
							
							
								 
						
							
								0687ab8ae3 
								
							 
						 
						
							
							
								
								Clean up generation of account webfinger string ( #1477 )  
							
							... 
							
							
							
							* Consolidate webfinger string creation under Account#to_webfinger_s
* Introduce Account#local_username_and_domain for consolidation 
							
						 
						
							2017-04-10 22:58:06 +02:00  
				
					
						
							
							
								 
						
							
								9043b32183 
								
							 
						 
						
							
							
								
								Add Russian translation (ru) ( #1023 )  
							
							... 
							
							
							
							* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency 
							
						 
						
							2017-04-10 12:52:06 +02:00  
				
					
						
							
							
								 
						
							
								ea6c930c04 
								
							 
						 
						
							
							
								
								Helper cleanup ( #1348 )  
							
							... 
							
							
							
							* Remove unused helper files
* Add coverage for application helper
* Add coverage for StreamEntriesHelper #display_name 
							
						 
						
							2017-04-09 17:11:37 +02:00  
				
					
						
							
							
								 
						
							
								ca44c13455 
								
							 
						 
						
							
							
								
								Use Setting.site_title value for `og:site_name` occurrences ( #1194 )  
							
							... 
							
							
							
							* Add helper method to return Setting.site_title
* Use site_title helper in application layout
* Use site_title value for og:site_name 
							
						 
						
							2017-04-08 12:15:40 +02:00  
				
					
						
							
							
								 
						
							
								fef478781d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into master  
							
							
							
						 
						
							2017-04-07 22:21:21 -04:00  
				
					
						
							
							
								 
						
							
								d4c94fa004 
								
							 
						 
						
							
							
								
								DRY up reblog vs original status check  
							
							... 
							
							
							
							Checking reblog vs original status was happening in multiple places
across the app. For views, this logic was encapsulated in a helper
method named `proper_status` but in the other layers of the app, the
logic was duplicated.
Because the logic is used at all layers of the app, we extracted it into
a `Status#proper` method on the model and changed all uses of the logic
to use this method. There is now a single source of truth for this
condition.
We added test coverage to untested methods that got refactored. 
							
						 
						
							2017-04-07 14:18:30 -04:00  
				
					
						
							
							
								 
						
							
								bf7cefa516 
								
							 
						 
						
							
							
								
								Merge branch 'master' into master  
							
							
							
						 
						
							2017-04-05 20:28:58 +02:00  
				
					
						
							
							
								 
						
							
								0700521ef3 
								
							 
						 
						
							
							
								
								added Esperanto (eo)  
							
							
							
						 
						
							2017-04-03 20:22:50 +02:00  
				
					
						
							
							
								 
						
							
								ae95f35fe6 
								
							 
						 
						
							
							
								
								add finnish translation  
							
							... 
							
							
							
							add finnish translation 
							
						 
						
							2017-04-03 13:34:26 +02:00  
				
					
						
							
							
								 
						
							
								efbbd42216 
								
							 
						 
						
							
							
								
								Fix style issue  
							
							
							
						 
						
							2017-03-26 13:13:41 +02:00  
				
					
						
							
							
								 
						
							
								d5d5afff9c 
								
							 
						 
						
							
							
								
								🌐  add simplified chinese language  
							
							
							
						 
						
							2017-03-26 14:13:18 +08:00  
				
					
						
							
							
								 
						
							
								2816b1bf8e 
								
							 
						 
						
							
							
								
								Federate header images, fix open-uri http->https redirection error  
							
							
							
						 
						
							2017-03-18 22:51:20 +01:00  
				
					
						
							
							
								 
						
							
								d180aaa2a7 
								
							 
						 
						
							
							
								
								Fix   #186  - Add RTL support to the compose form textarea and statuses output  
							
							
							
						 
						
							2017-02-28 01:52:31 +01:00  
				
					
						
							
							
								 
						
							
								f2931af61e 
								
							 
						 
						
							
							
								
								Quick fix for avatars with the same URL not being perceived as updated and in need of re-download  
							
							
							
						 
						
							2017-02-17 01:50:01 +01:00  
				
					
						
							
							
								 
						
							
								f722aa8c75 
								
							 
						 
						
							
							
								
								Fix Salmon issue  
							
							
							
						 
						
							2017-02-16 01:59:34 +01:00  
				
					
						
							
							
								 
						
							
								2d8a4c4390 
								
							 
						 
						
							
							
								
								Add "next" link to Atom feeds  
							
							
							
						 
						
							2017-02-13 15:38:45 +01:00  
				
					
						
							
							
								 
						
							
								720ff55262 
								
							 
						 
						
							
							
								
								Adding more unit tests. Fixing Salmon slaps XML  
							
							
							
						 
						
							2017-02-12 17:30:15 +01:00  
				
					
						
							
							
								 
						
							
								50660d54e8 
								
							 
						 
						
							
							
								
								Fix semantics of follow requests another slaps  
							
							
							
						 
						
							2017-02-11 17:13:11 +01:00  
				
					
						
							
							
								 
						
							
								149887a0ff 
								
							 
						 
						
							
							
								
								Make follow requests federate  
							
							
							
						 
						
							2017-02-11 02:58:00 +01:00  
				
					
						
							
							
								 
						
							
								942a2e7d68 
								
							 
						 
						
							
							
								
								Fix reblogs not having content warnings forwarded  
							
							
							
						 
						
							2017-02-08 18:05:46 +01:00  
				
					
						
							
							
								 
						
							
								3beb24ad55 
								
							 
						 
						
							
							
								
								Use <summary> to encode content warnings instead  
							
							
							
						 
						
							2017-01-25 16:53:30 +01:00  
				
					
						
							
							
								 
						
							
								999cde94a6 
								
							 
						 
						
							
							
								
								Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text  
							
							... 
							
							
							
							Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" />
Clean up schema file from accidental development migrations 
							
						 
						
							2017-01-25 01:29:16 +01:00  
				
					
						
							
							
								 
						
							
								bf0f6eb62d 
								
							 
						 
						
							
							
								
								Implement a click-to-view spoiler system  
							
							
							
						 
						
							2017-01-23 21:07:40 -05:00  
				
					
						
							
							
								 
						
							
								b11fdc3ae3 
								
							 
						 
						
							
							
								
								Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings  
							
							... 
							
							
							
							with YAML-defined defaults. Add admin page for editing global settings. Add "site_description"
setting that would show as a paragraph on the frontpage 
							
						 
						
							2017-01-12 20:46:24 +01:00  
				
					
						
							
							
								 
						
							
								23ebf60b95 
								
							 
						 
						
							
							
								
								Improve initialState loading  
							
							
							
						 
						
							2017-01-09 12:37:53 +01:00  
				
					
						
							
							
								 
						
							
								1bfbce7b45 
								
							 
						 
						
							
							
								
								Clean up h-card mess of divs  
							
							
							
						 
						
							2017-01-06 20:24:51 +01:00  
				
					
						
							
							
								 
						
							
								49834a6e7f 
								
							 
						 
						
							
							
								
								Add API for retrieving blocked accounts  
							
							
							
						 
						
							2016-12-29 20:12:32 +01:00  
				
					
						
							
							
								 
						
							
								d7dc84439c 
								
							 
						 
						
							
							
								
								Add ability to use remote follow function on other sites  
							
							
							
						 
						
							2016-12-29 16:54:54 +01:00  
				
					
						
							
							
								 
						
							
								3689c119f0 
								
							 
						 
						
							
							
								
								Replacing follow requests in the settings area with in-UI column  
							
							
							
						 
						
							2016-12-26 21:33:51 +01:00  
				
					
						
							
							
								 
						
							
								004382e4d0 
								
							 
						 
						
							
							
								
								Adding follow requests API  
							
							
							
						 
						
							2016-12-26 19:30:45 +01:00  
				
					
						
							
							
								 
						
							
								b302b9202b 
								
							 
						 
						
							
							
								
								Add page for authorizing/rejecting follow requests  
							
							
							
						 
						
							2016-12-23 00:04:52 +01:00  
				
					
						
							
							
								 
						
							
								c4bc5c8930 
								
							 
						 
						
							
							
								
								Federated profile bio now formatted  
							
							
							
						 
						
							2016-12-21 19:10:19 +01:00  
				
					
						
							
							
								 
						
							
								5ae1b39ec9 
								
							 
						 
						
							
							
								
								Adjusting public display of statuses to look similar to logged-in UI,  
							
							... 
							
							
							
							fix  #361  with rich OEmbed display via iframe, fix  #237  by hiding sensitive
content behind a spoiler on public pages 
						
							2016-12-18 19:47:11 +01:00  
				
					
						
							
							
								 
						
							
								76ec907993 
								
							 
						 
						
							
							
								
								Improved admin UI  
							
							
							
						 
						
							2016-12-13 13:42:10 +01:00  
				
					
						
							
							
								 
						
							
								e90fcb46e3 
								
							 
						 
						
							
							
								
								Sensitive content federates using the "nsfw" hashtag  
							
							
							
						 
						
							2016-12-11 22:49:25 +01:00  
				
					
						
							
							
								 
						
							
								d2ab41aea4 
								
							 
						 
						
							
							
								
								Declare Ukrainian  
							
							... 
							
							
							
							Closes : #345  
						
							2016-12-08 18:57:58 +02:00  
				
					
						
							
							
								 
						
							
								f763e844e8 
								
							 
						 
						
							
							
								
								Do not use expiring links after all  
							
							
							
						 
						
							2016-12-04 13:02:43 +01:00  
				
					
						
							
							
								 
						
							
								24e692b0cf 
								
							 
						 
						
							
							
								
								Set a specific S3 expiration time so that files can be cached  
							
							
							
						 
						
							2016-12-04 12:58:35 +01:00  
				
					
						
							
							
								 
						
							
								80c44ed9c1 
								
							 
						 
						
							
							
								
								Do not autoplay videos, display play button instead. Use expiring links when using S3. Do not keep originals  
							
							... 
							
							
							
							for avatars/headers, resize avatars down to 120x120 instead of 300x300. Set cache headers on S3 stuff, also
make it private (aka only accessible via expiring links to prevent hotlinking) 
							
						 
						
							2016-12-04 12:28:10 +01:00  
				
					
						
							
							
								 
						
							
								1d0321fc45 
								
							 
						 
						
							
							
								
								Fix pt translations, improve pre-cache queries, removing will_paginate  
							
							... 
							
							
							
							from accounts/tags because it's a terribly inefficient way to paginate
large sets of data 
							
						 
						
							2016-12-01 16:26:25 +01:00  
				
					
						
							
							
								 
						
							
								6ff93845d5 
								
							 
						 
						
							
							
								
								Add basic OEmbed provider API,  fix   #247  
							
							
							
						 
						
							2016-11-30 23:01:03 +01:00  
				
					
						
							
							
								 
						
							
								14bd46946d 
								
							 
						 
						
							
							
								
								Per-status control for unlisted mode, also federation for unlisted mode  
							
							... 
							
							
							
							Fix  #233 , fix  #268  
						
							2016-11-30 21:34:59 +01:00  
				
					
						
							
							
								 
						
							
								356d3874eb 
								
							 
						 
						
							
							
								
								Normalize localizations, add stub for admin/accounts  
							
							
							
						 
						
							2016-11-30 15:32:26 +01:00  
				
					
						
							
							
								 
						
							
								ff21ff1489 
								
							 
						 
						
							
							
								
								Make User#current_sign_in_at actually track when user was last active,  
							
							... 
							
							
							
							by updating it at least every 24h if the user visits the site 
							
						 
						
							2016-11-30 15:17:03 +01:00  
				
					
						
							
							
								 
						
							
								5973ca3d11 
								
							 
						 
						
							
							
								
								Upgrade Paperclip to 5, AWS-SDK to 2, do not generate medium/small versions of avatars  
							
							
							
						 
						
							2016-11-29 14:20:15 +01:00  
				
					
						
							
							
								 
						
							
								27fc49d745 
								
							 
						 
						
							
							
								
								Add simple admin overview of PuSH subscriptions  
							
							
							
						 
						
							2016-11-28 18:45:13 +01:00  
				
					
						
							
							
								 
						
							
								66ab0d0d56 
								
							 
						 
						
							
							
								
								Enabling portuguese and hungarian translations, which are awfully incomplete  
							
							
							
						 
						
							2016-11-28 13:55:03 +01:00  
				
					
						
							
							
								 
						
							
								115ce90578 
								
							 
						 
						
							
							
								
								Adding French locale to settings_helper.rb  
							
							
							
						 
						
							2016-11-22 10:20:28 +01:00  
				
					
						
							
							
								 
						
							
								39533190c2 
								
							 
						 
						
							
							
								
								Display human names of locales in dropdown  
							
							
							
						 
						
							2016-11-19 00:19:57 +01:00  
				
					
						
							
							
								 
						
							
								01e43c3e57 
								
							 
						 
						
							
							
								
								Adding react-intl i18n to the frontend. No translations yet  
							
							
							
						 
						
							2016-11-16 17:20:52 +01:00  
				
					
						
							
							
								 
						
							
								3ce6ac0ce2 
								
							 
						 
						
							
							
								
								Adding some localizations  
							
							
							
						 
						
							2016-11-15 23:02:57 +01:00  
				
					
						
							
							
								 
						
							
								fdc17bea58 
								
							 
						 
						
							
							
								
								Fix rubocop issues, introduce usage of frozen literal to improve performance  
							
							
							
						 
						
							2016-11-15 16:56:29 +01:00  
				
					
						
							
							
								 
						
							
								d14967e1c8 
								
							 
						 
						
							
							
								
								Fix URL configuration when S3 is enabled  
							
							
							
						 
						
							2016-11-06 20:43:16 +01:00  
				
					
						
							
							
								 
						
							
								48b9619439 
								
							 
						 
						
							
							
								
								Adding hashtags  
							
							
							
						 
						
							2016-11-05 17:13:14 +01:00  
				
					
						
							
							
								 
						
							
								6c05e3063a 
								
							 
						 
						
							
							
								
								Include <id> (identical value to <uri>) on person-type objects in Atom  
							
							... 
							
							
							
							This might help with GS compatibility 
							
						 
						
							2016-10-17 15:36:37 +02:00  
				
					
						
							
							
								 
						
							
								f0f791bb76 
								
							 
						 
						
							
							
								
								Don't preload timelines as props, load them when timeline component is mounted  
							
							... 
							
							
							
							This prevents the bug where if you go "back" to the UI after navigating to
another page it loads with the old set of statuses 
							
						 
						
							2016-10-16 19:23:17 +02:00  
				
					
						
							
							
								 
						
							
								7a6d95f70c 
								
							 
						 
						
							
							
								
								E-mail preferences page  
							
							
							
						 
						
							2016-10-14 02:28:49 +02:00  
				
					
						
							
							
								 
						
							
								dd5e724c3f 
								
							 
						 
						
							
							
								
								Fix reblog mentions Atom  
							
							
							
						 
						
							2016-10-10 15:08:24 +02:00  
				
					
						
							
							
								 
						
							
								f249a8c187 
								
							 
						 
						
							
							
								
								Include mentions and media attachments of reblogged posts in Atom  
							
							
							
						 
						
							2016-10-10 14:22:09 +02:00  
				
					
						
							
							
								 
						
							
								1f650d327d 
								
							 
						 
						
							
							
								
								Adding public timeline  
							
							
							
						 
						
							2016-10-07 16:00:11 +02:00  
				
					
						
							
							
								 
						
							
								b3c7c8700d 
								
							 
						 
						
							
							
								
								Fix most pages on small screens  
							
							
							
						 
						
							2016-10-03 16:17:28 +02:00  
				
					
						
							
							
								 
						
							
								927333f4f8 
								
							 
						 
						
							
							
								
								Improve code style  
							
							
							
						 
						
							2016-09-29 21:28:21 +02:00  
				
					
						
							
							
								 
						
							
								e63aebff7a 
								
							 
						 
						
							
							
								
								Adding landing page  
							
							
							
						 
						
							2016-09-27 23:12:33 +02:00  
				
					
						
							
							
								 
						
							
								4f9b7432dd 
								
							 
						 
						
							
							
								
								Fix   #52  - Add API versioning (v1)  
							
							
							
						 
						
							2016-09-27 16:59:08 +02:00  
				
					
						
							
							
								 
						
							
								7e14eefc81 
								
							 
						 
						
							
							
								
								Replace logo,  fix   #57  - delete/unreblog/unfavourite API,  fix   #45  - app  
							
							... 
							
							
							
							registration API 
							
						 
						
							2016-09-26 23:56:53 +02:00  
				
					
						
							
							
								 
						
							
								2e7aac793a 
								
							 
						 
						
							
							
								
								Adding sense of self to the UI, cleaning up routing, adding third (detail) column  
							
							
							
						 
						
							2016-09-13 02:24:40 +02:00  
				
					
						
							
							
								 
						
							
								3cc47beb6e 
								
							 
						 
						
							
							
								
								Refactored generation of unique tags, URIs and object URLs into own classes,  
							
							... 
							
							
							
							as well as formatting of content 
							
						 
						
							2016-09-09 20:04:34 +02:00  
				
					
						
							
							
								 
						
							
								735b4cc62e 
								
							 
						 
						
							
							
								
								Probably  fixes   #31  
							
							
							
						 
						
							2016-09-09 15:29:41 +02:00  
				
					
						
							
							
								 
						
							
								85d89b472d 
								
							 
						 
						
							
							
								
								Optimized n+1 queries in accounts Atom and HTML views  
							
							... 
							
							
							
							Added stack trace for SQL queries in development
Removed badly thought out accounts/lookup API 
							
						 
						
							2016-09-08 20:36:01 +02:00  
				
					
						
							
							
								 
						
							
								87576e1ab1 
								
							 
						 
						
							
							
								
								Fixing atom feeds for accounts, adding tests that would catch such bugs in future  
							
							
							
						 
						
							2016-09-08 00:33:07 +02:00  
				
					
						
							
							
								 
						
							
								1d9c886518 
								
							 
						 
						
							
							
								
								Adding enclosures to Atom and statuses JSON  
							
							
							
						 
						
							2016-09-05 18:57:59 +02:00  
				
					
						
							
							
								 
						
							
								eec0dc46a6 
								
							 
						 
						
							
							
								
								PostStatusService can attach media to status, ProcessFeedService likewise  
							
							
							
						 
						
							2016-09-05 18:39:53 +02:00  
				
					
						
							
							
								 
						
							
								ae1fac0062 
								
							 
						 
						
							
							
								
								Add API to upload media attachments  
							
							
							
						 
						
							2016-09-05 17:46:36 +02:00  
				
					
						
							
							
								 
						
							
								35dfc0fbcb 
								
							 
						 
						
							
							
								
								Fixed more case-sensitivity issues  
							
							
							
						 
						
							2016-09-04 21:15:52 +02:00  
				
					
						
							
							
								 
						
							
								1022d682dc 
								
							 
						 
						
							
							
								
								Normalized data in Redux, fix for asset URLs when rendered outside request  
							
							
							
						 
						
							2016-09-04 14:04:26 +02:00  
				
					
						
							
							
								 
						
							
								039e6f951c 
								
							 
						 
						
							
							
								
								Fix issue with unresolvable usernames  
							
							
							
						 
						
							2016-03-27 23:38:46 +02:00  
				
					
						
							
							
								 
						
							
								882c94a6bf 
								
							 
						 
						
							
							
								
								Cleaning up status partial  
							
							
							
						 
						
							2016-03-26 14:42:05 +01:00  
				
					
						
							
							
								 
						
							
								f2da848a3e 
								
							 
						 
						
							
							
								
								Add alternate link to entries Atom  
							
							
							
						 
						
							2016-03-26 01:10:18 +01:00  
				
					
						
							
							
								 
						
							
								a08e724476 
								
							 
						 
						
							
							
								
								Fix subscriptions:clear task, refactor feeds, refactor streamable activites  
							
							... 
							
							
							
							and atom feed generation to some extent, as well as the way mentions are
stored 
							
						 
						
							2016-03-25 02:13:30 +01:00  
				
					
						
							
							
								 
						
							
								c8999a116e 
								
							 
						 
						
							
							
								
								Sanitize remote html in atom feeds, API (not just UI), use cached mention  
							
							... 
							
							
							
							relations on Status#mentions 
							
						 
						
							2016-03-24 12:43:55 +01:00  
				
					
						
							
							
								 
						
							
								7cd3de3494 
								
							 
						 
						
							
							
								
								Do display top-level content on remote shared notices  
							
							
							
						 
						
							2016-03-24 12:34:32 +01:00  
				
					
						
							
							
								 
						
							
								921f40c187 
								
							 
						 
						
							
							
								
								Omit empty tags in Atom feed  
							
							
							
						 
						
							2016-03-22 20:20:37 +01:00  
				
					
						
							
							
								 
						
							
								12d1d9dd80 
								
							 
						 
						
							
							
								
								Reblogs in Atom feeds now have published, updated, and activity:verb. Still related to  #20  
							
							
							
						 
						
							2016-03-22 09:49:54 +01:00  
				
					
						
							
							
								 
						
							
								78137929e6 
								
							 
						 
						
							
							
								
								Fix   #20 , reblogs in Atom should be formatted correctly now  
							
							
							
						 
						
							2016-03-22 09:03:03 +01:00  
				
					
						
							
							
								 
						
							
								f14f462eaf 
								
							 
						 
						
							
							
								
								Adding Turbolinks, adding status posting form on homepage  
							
							
							
						 
						
							2016-03-21 18:26:47 +01:00  
				
					
						
							
							
								 
						
							
								9d55529318 
								
							 
						 
						
							
							
								
								Fix text color in dashboard inputs, sanitize remote status content in UI,  
							
							... 
							
							
							
							simplify FanOutOnWriteService, add /api/accounts/lookup method 
							
						 
						
							2016-03-21 17:02:16 +01:00  
				
					
						
							
							
								 
						
							
								7e00a21ea6 
								
							 
						 
						
							
							
								
								Small optimizations in Atom feeds  
							
							
							
						 
						
							2016-03-21 10:31:20 +01:00  
				
					
						
							
							
								 
						
							
								19a259915e 
								
							 
						 
						
							
							
								
								Security update  
							
							
							
						 
						
							2016-03-21 10:08:19 +01:00  
				
					
						
							
							
								 
						
							
								253ab26520 
								
							 
						 
						
							
							
								
								Adding more tests for helpers  
							
							
							
						 
						
							2016-03-20 13:50:22 +01:00  
				
					
						
							
							
								 
						
							
								71ae4dd3d2 
								
							 
						 
						
							
							
								
								Adding public following and followers pages,  fix   #3  
							
							
							
						 
						
							2016-03-19 14:02:30 +01:00  
				
					
						
							
							
								 
						
							
								47d1cb4e21 
								
							 
						 
						
							
							
								
								TIL a return from a block seems to return from the whole method rather than  
							
							... 
							
							
							
							the block, even though the last line of a block is an implicit return. I am
confused to say the least 
							
						 
						
							2016-03-19 00:23:46 +01:00  
				
					
						
							
							
								 
						
							
								071f64d317 
								
							 
						 
						
							
							
								
								Fix   #13 , Atom feeds now contain formatted post content  
							
							
							
						 
						
							2016-03-19 00:16:04 +01:00  
				
					
						
							
							
								 
						
							
								a9db42a956 
								
							 
						 
						
							
							
								
								Validations for local profiles  
							
							
							
						 
						
							2016-03-16 11:18:09 +01:00  
				
					
						
							
							
								 
						
							
								5c99e304e5 
								
							 
						 
						
							
							
								
								Deleting statuses, deletion propagation  
							
							
							
						 
						
							2016-03-16 10:58:58 +01:00  
				
					
						
							
							
								 
						
							
								6fec8afc3f 
								
							 
						 
						
							
							
								
								Bind oauth applications to users  
							
							
							
						 
						
							2016-03-14 17:49:13 +01:00  
				
					
						
							
							
								 
						
							
								3441361568 
								
							 
						 
						
							
							
								
								Adding simple_form, adding profile settings, header image  
							
							
							
						 
						
							2016-03-12 20:47:22 +01:00  
				
					
						
							
							
								 
						
							
								1aa477ac2f 
								
							 
						 
						
							
							
								
								Customized more doorkeeper views, only logged in users can create oauth apps  
							
							
							
						 
						
							2016-03-12 19:46:06 +01:00  
				
					
						
							
							
								 
						
							
								447cfef62d 
								
							 
						 
						
							
							
								
								Improving feed queries, switching API to doorkeeper authentication  
							
							
							
						 
						
							2016-03-11 16:47:36 +01:00  
				
					
						
							
							
								 
						
							
								ab6696e855 
								
							 
						 
						
							
							
								
								Adding doorkeeper, adding a REST API  
							
							... 
							
							
							
							POST /api/statuses                  Params: status (text contents), in_reply_to_id (optional)
GET  /api/statuses/:id
POST /api/statuses/:id/reblog
GET  /api/accounts/:id
GET  /api/accounts/:id/following
GET  /api/accounts/:id/followers
POST /api/accounts/:id/follow
POST /api/accounts/:id/unfollow
POST /api/follows                  Params: uri (e.g. user@domain)
OAuth authentication is currently disabled, but the API can be used with HTTP Auth. 
							
						 
						
							2016-03-07 12:42:33 +01:00  
				
					
						
							
							
								 
						
							
								3824c58853 
								
							 
						 
						
							
							
								
								Adding GNU Public license, adding home timeline, reblog/favourite counters  
							
							
							
						 
						
							2016-03-06 17:52:23 +01:00  
				
					
						
							
							
								 
						
							
								ab80ebdeec 
								
							 
						 
						
							
							
								
								Adjusting design of profile and entry pages, linkify mentions in statuses  
							
							
							
						 
						
							2016-03-05 23:42:40 +01:00  
				
					
						
							
							
								 
						
							
								7e93da3f8d 
								
							 
						 
						
							
							
								
								Removing grape and adding devise  
							
							
							
						 
						
							2016-03-05 13:12:24 +01:00  
				
					
						
							
							
								 
						
							
								23d08c6749 
								
							 
						 
						
							
							
								
								Changing the use of config constants to the Rails configuration object  
							
							
							
						 
						
							2016-02-29 20:06:39 +01:00  
				
					
						
							
							
								 
						
							
								0e8f59c16f 
								
							 
						 
						
							
							
								
								Refactoring Grape API methods into normal controllers & other things  
							
							
							
						 
						
							2016-02-29 19:42:08 +01:00  
				
					
						
							
							
								 
						
							
								11ff92c9d7 
								
							 
						 
						
							
							
								
								Adding a test for ReblogService, fixing mentions for remote statuses  
							
							
							
						 
						
							2016-02-28 21:22:56 +01:00  
				
					
						
							
							
								 
						
							
								47d50b0e39 
								
							 
						 
						
							
							
								
								A lot of fixes from a live test  
							
							
							
						 
						
							2016-02-28 15:46:29 +01:00  
				
					
						
							
							
								 
						
							
								ad5ae3f60e 
								
							 
						 
						
							
							
								
								Update profile information and download avatar of remote accounts  
							
							
							
						 
						
							2016-02-28 14:26:26 +01:00  
				
					
						
							
							
								 
						
							
								2825991e09 
								
							 
						 
						
							
							
								
								Improving status display design, including replies and threads  
							
							
							
						 
						
							2016-02-28 14:02:53 +01:00  
				
					
						
							
							
								 
						
							
								2c70f0ecaa 
								
							 
						 
						
							
							
								
								Adding paperclip for avatars, fixing design of the public pages  
							
							
							
						 
						
							2016-02-28 00:02:59 +01:00  
				
					
						
							
							
								 
						
							
								f16b31f077 
								
							 
						 
						
							
							
								
								Adding a bunch of tests  
							
							
							
						 
						
							2016-02-26 15:28:08 +01:00  
				
					
						
							
							
								 
						
							
								44c5958203 
								
							 
						 
						
							
							
								
								Fixed small bugs and code style offences  
							
							
							
						 
						
							2016-02-25 00:22:46 +01:00  
				
					
						
							
							
								 
						
							
								8da8387afe 
								
							 
						 
						
							
							
								
								Add shared statuses to the database  
							
							
							
						 
						
							2016-02-24 17:23:59 +01:00  
				
					
						
							
							
								 
						
							
								79baf2fd99 
								
							 
						 
						
							
							
								
								Process favourites, reblogs and replies from Salmon  
							
							
							
						 
						
							2016-02-24 00:57:47 +01:00  
				
					
						
							
							
								 
						
							
								fa33750105 
								
							 
						 
						
							
							
								
								Adding reblogs, favourites, improving atom generation  
							
							
							
						 
						
							2016-02-23 19:17:37 +01:00  
				
					
						
							
							
								 
						
							
								3b0bc18db9 
								
							 
						 
						
							
							
								
								Improved Atom rendering templates, added README  
							
							
							
						 
						
							2016-02-23 13:08:01 +01:00  
				
					
						
							
							
								 
						
							
								1dad72bf13 
								
							 
						 
						
							
							
								
								Fixes and general progress  
							
							
							
						 
						
							2016-02-22 18:10:30 +01:00  
				
					
						
							
							
								 
						
							
								709c6685a9 
								
							 
						 
						
							
							
								
								Made some progress  
							
							
							
						 
						
							2016-02-22 16:00:20 +01:00  
				
					
						
							
							
								 
						
							
								9c4856bdb1 
								
							 
						 
						
							
							
								
								Initial commit  
							
							
							
						 
						
							2016-02-20 22:53:20 +01:00