mastodon

Commit Graph

Author	SHA1	Message	Date
MIYAGI Hikaru	919eef3098	User agent for WebFinger (#7531 ) * User agent for WebFinger * local_domain → web_domain * 'http' is away accidentally...	2018-05-18 01:47:22 +02:00
Thibaut Girka	78ac246b87	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: Gemfile Solved conflicts by using upstream's line for posix-spawn	2018-05-16 21:52:38 +02:00
Evgeny Petrov	5e87c79d25	Russian language for 2.4.0 (#7512 ) * Russian language for 2.4.0 * Russian language for 2.4.0 * bundle exec i18n-tasks normalize * RU: Updated some strings after new commits appeared	2018-05-16 16:25:11 +02:00
Quentí	f60c1d3989	[l10n] Occitan update (#7505 ) * Update oc.json * Update doorkeeper.oc.yml * Update oc.yml * Update simple_form.oc.yml * Update oc.json Accept is the opp. of reject, I think it's better like this. * bundle exec i18n-tasks normalize	2018-05-16 23:18:32 +09:00
nightpool	dbf65e1b76	Update bot preference text (#7507 ) * Update simple_form.en.yml * fix #2	2018-05-16 14:47:29 +02:00
Marcin Mikołajczak	ff84c18e3d	🌍: 🇵🇱⬆️ (#7494 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-05-16 01:20:40 +09:00
Renato "Lond" Cerqueira	1f74c1dbcb	Weblate translations 20180515 (#7496 ) * Translated using Weblate (Catalan) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/ * Translated using Weblate (Dutch) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Italian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Slovak) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Arabic) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Korean) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Dutch) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (French) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Slovak) Currently translated at 95.3% (597 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Korean) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Korean) Currently translated at 99.8% (625 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Slovak) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Added translation using Weblate (Slovenian) * Added translation using Weblate (Slovenian) * Added translation using Weblate (Slovenian) * Added translation using Weblate (Slovenian) * Translated using Weblate (Esperanto) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 99.3% (623 of 627 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 98.4% (63 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/ * Translated using Weblate (Arabic) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 99.6% (294 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Italian) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Galician) Currently translated at 100.0% (76 of 76 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Slovenian) Currently translated at 7.8% (5 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/ * Translated using Weblate (Slovenian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Slovenian) Currently translated at 12.5% (8 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/ * Translated using Weblate (Italian) Currently translated at 100.0% (295 of 295 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Slovenian) Currently translated at 11.9% (75 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Slovenian) Currently translated at 14.1% (89 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Japanese) Currently translated at 99.5% (624 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 99.6% (625 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused * Remove translations causing issues in arabic Related to #6673	2018-05-15 14:25:07 +02:00
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	2018-05-14 20:51:50 +02:00
Akihiko Odaki	d8b3f5fb9a	Limit environment variables to expose to webpack (#7480 )	2018-05-14 17:45:37 +02:00
Yamagishi Kazutoshi	2226d987f9	Add Slovene language (#7475 )	2018-05-14 12:52:25 +02:00
Eugen Rochko	97e43ec5f0	Add GET /api/v1/push/subscription REST API (#7471 ) * Add Api::V1::Push::SubscriptionsController#show * Add to routes	2018-05-13 21:07:31 +02:00
ThibG	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
Thibaut Girka	45fce0e496	Merge branch 'master' into glitch-soc/merge Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml	2018-05-11 18:12:42 +02:00
Eugen Rochko	b4fb766b23	Add REST API for Web Push Notifications subscriptions (#7445 ) - POST /api/v1/push/subscription - PUT /api/v1/push/subscription - DELETE /api/v1/push/subscription - New OAuth scope: "push" (required for the above methods)	2018-05-11 11:49:12 +02:00
Yamagishi Kazutoshi	9a794067f7	Weblate translations (2018-05-10) (#7438 ) * Translated using Weblate (Arabic) Currently translated at 83.6% (523 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.5% (622 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (French) Currently translated at 99.6% (623 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Korean) Currently translated at 99.8% (624 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Catalan) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Persian) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fa/ * Translated using Weblate (Finnish) Currently translated at 95.1% (59 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Finnish) Currently translated at 95.1% (59 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Finnish) Currently translated at 99.6% (293 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Finnish) Currently translated at 96.7% (60 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Finnish) Currently translated at 97.9% (612 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Dutch) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Arabic) Currently translated at 90.8% (568 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Dutch) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ in overeestemming met andere vertalingen * Translated using Weblate (Dutch) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.2% (620 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Japanese) Currently translated at 99.6% (623 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Galician) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 98.3% (61 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (German) Currently translated at 99.2% (620 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.2% (620 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Esperanto) Currently translated at 99.8% (624 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Russian) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ru/ * Translated using Weblate (Russian) Currently translated at 95.1% (59 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ru/ I’m not sure this is the best translation for custom fields, something like «Характеристика» might work better; hopefully someone will review this for second opinions * Translated using Weblate (Persian) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Persian) Currently translated at 99.6% (623 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Dutch) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Persian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Dutch) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (62 of 62 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% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Russian) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ru/ * Translated using Weblate (Dutch) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (German) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (Dutch) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (625 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.3% (621 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Dutch) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Galician) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (64 of 64 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.2% (621 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Japanese) Currently translated at 92.1% (59 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Corsican) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/ * Translated using Weblate (Corsican) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/ * Translated using Weblate (Corsican) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (Corsican) Currently translated at 99.8% (624 of 625 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (Corsican) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/co/ * Translated using Weblate (Corsican) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/co/ * Translated using Weblate (French) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (French) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (French) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Arabic) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 90.8% (569 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Slovak) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 95.2% (596 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Esperanto) Currently translated at 99.8% (625 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Japanese) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Finnish) Currently translated at 99.6% (293 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Persian) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Japanese) Currently translated at 93.7% (60 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (German) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 100.0% (64 of 64 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Added translation using Weblate (Slovenian) * Translated using Weblate (Slovenian) Currently translated at 5.7% (36 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Added translation using Weblate (Slovenian) * Translated using Weblate (Slovenian) Currently translated at 1.3% (4 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (French) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Greek) Currently translated at 29.3% (184 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.3% (184 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.5% (185 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.5% (185 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.8% (187 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.8% (187 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 30.0% (188 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 30.0% (188 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 30.1% (189 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 30.3% (190 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 30.5% (191 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 30.5% (191 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 30.6% (192 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 33.7% (211 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * yarn manage:translations && i18n-tasks normalize && i18n-tasks remove-unused	2018-05-10 14:48:26 +02:00
Thibaut Girka	a8be40933d	Ignore tootsuite-specific theme-related translation strings	2018-05-10 00:03:34 +02:00
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	2018-05-10 00:03:28 +02:00
Marcin Mikołajczak	dc010cc77a	🌍: 🇵🇱⬆️ (#7427 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-05-09 19:20:49 +09:00
Eugen Rochko	42cd363542	Bot nameplates (#7391 ) * Store actor type in database * Add bot nameplate to web UI, add setting to preferences, API, AP Fix #7365 * Fix code style issues	2018-05-07 09:31:07 +02:00
Hugo Gameiro	ea4e243303	Improve OpenStack v3 compatibility (#7392 ) * Update paperclip.rb * Update .env.production.sample * Update paperclip.rb	2018-05-07 02:28:28 +02:00
Eugen Rochko	95595ccd21	Add Corsican localization (#7390 ) * Added Corsican localization * Declaring Corsican localization * Fixed activerecord locale * Added a missing translation and switched to French-style apostrophes * Fixed a (predictable) mistake made while bulk-replacing apostrophes * More fixing * i18n-tasks normalize	2018-05-07 01:34:19 +02:00
Yamagishi Kazutoshi	e571de29bf	Weblate translations (2018-05-06) (#7381 ) * Translated using Weblate (Dutch) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Greek) Currently translated at 28.2% (177 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Occitan) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 98.2% (615 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Occitan) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Occitan) Currently translated at 97.9% (613 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Galician) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 28.5% (179 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 28.5% (179 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.0% (182 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.0% (182 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.2% (183 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.3% (184 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.5% (185 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.7% (186 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.7% (186 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Slovak) Currently translated at 95.3% (597 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 95.2% (597 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 97.6% (612 of 627 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.3% (623 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Polish) Currently translated at 99.8% (626 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Arabic) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 83.7% (525 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Spanish) Currently translated at 99.8% (626 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Italian) Currently translated at 54.7% (343 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Italian) Currently translated at 78.9% (495 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Japanese) Currently translated at 99.8% (626 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * i18n-tasks normalize && i18n-tasks remove-unused && yarn manage:translations	2018-05-06 20:19:56 +09:00
Shuhei Kitagawa	bd10a7e480	Add resend confirmation for admin (#7378 ) * Add confirmations_controller#resend * Add tests for confirmations_controller#resend * Add translations	2018-05-06 10:59:03 +02:00
Eugen Rochko	39efc6d533	Add hint about 7 day cooldown for archive takeout (#7375 )	2018-05-06 10:53:10 +02:00
Eugen Rochko	b611dbac79	Add contact e-mail hint to 2FA login form (#7376 )	2018-05-06 10:52:36 +02:00
Eugen Rochko	c7d1a2e400	Improve admin UI for accounts (#7360 ) * Improve design of account statuses admin UI (consistent with reports) * Make account moderation notes look consistent with report notes * i18n-tasks remove-unused * Fix code style issues * Fix tests	2018-05-05 23:06:29 +02:00
Reto Kromer	80b23a6a85	uniform email rather than e-mail (#7373 )	2018-05-05 21:03:21 +02:00
David Yip	77a92d3260	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: Gemfile.lock	2018-05-04 09:42:31 -05:00
Eugen Rochko	251bbf9728	Show remote reports in admin UI as coming from domain rather than user (#7347 ) Fix #6994	2018-05-04 13:26:25 +02:00
David Yip	da70208b45	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-04 03:23:57 -05:00
David Yip	2d392fb3b8	Remove unused translations.	2018-05-04 03:01:10 -05:00
Shuhei Kitagawa	c61ddd8249	Fix 2fa description in Japanese (#7349 )	2018-05-04 13:58:08 +09:00
David Yip	c816701550	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml	2018-05-03 17:23:44 -05:00
Akihiko Odaki	a7e71bbd08	Add a missing question mark in rack_attack.rb (#7338 )	2018-05-03 18:51:00 +02:00
Akihiko Odaki	b1d4471e36	Throttle media post (#7337 ) The previous rate limit allowed to post media so fast that it is possible to fill up the disk space even before an administrator notices. The new rate limit is configured so that it takes 24 hours to eat 10 gigabytes: 10 * 1024 / 8 / (24 * 60 / 30) = 27 (which rounded to 30) The period is set long so that it does not prevent from attaching several media to one post, which would happen in a short period. For example, if the period is 5 minutes, the rate limit would be: 10 * 1024 / 8 / (24 * 60 / 5) = 4 This long period allows to lift the limit up.	2018-05-03 17:32:00 +02:00
Yamagishi Kazutoshi	7495a3470e	Add el and te (#7332 ) * Add el and te * Add missing locale files	2018-05-03 15:54:10 +02:00
Renato "Lond" Cerqueira	dfa6bccb64	Weblate translations 20180503 (#7325 ) * Translated using Weblate (German) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Slovak) Currently translated at 92.3% (578 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Added translation using Weblate (Greek) * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Added translation using Weblate (Greek) * Added translation using Weblate (Malay) * Translated using Weblate (Greek) Currently translated at 0.6% (2 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 1.3% (4 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 2.0% (6 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 2.3% (7 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 2.7% (8 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 3.0% (9 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 4.3% (27 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 4.7% (30 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 4.7% (30 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 5.1% (32 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 5.2% (33 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Swedish) Currently translated at 95.1% (59 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.3% (622 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Greek) Currently translated at 23.8% (70 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Catalan) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Slovak) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 94.0% (589 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Added translation using Weblate (Telugu) * Translated using Weblate (German) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 98.3% (61 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (Telugu) Currently translated at 0.3% (2 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/te/ * Translated using Weblate (German) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 98.3% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/de/ * Translated using Weblate (German) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/de/ * Translated using Weblate (German) Currently translated at 99.5% (623 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Spanish) Currently translated at 93.2% (584 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 93.2% (584 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 93.2% (584 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 93.2% (584 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 99.8% (625 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Slovak) Currently translated at 95.0% (595 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Greek) Currently translated at 24.1% (71 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 24.1% (71 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (French) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Italian) Currently translated at 54.6% (342 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Slovak) Currently translated at 95.3% (597 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 99.8% (625 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (German) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Slovak) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Galician) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Swedish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Swedish) Currently translated at 99.5% (623 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused * Add back file removed by weblate	2018-05-03 19:12:09 +09:00
Eugen Rochko	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
Yamagishi Kazutoshi	16468bdf1b	[i18n] Occitan update (#7294 ) * Translated new strings + few changes * First update * Almost complet Missing the changes in the privacy policy * Update simple_form.oc.yml * bundle exec i18n-tasks normalize * bundle exec i18n-tasks remove-unused	2018-04-30 13:14:50 +02:00
Marcin Mikołajczak	fc01ae31c6	🌍: 🇵🇱⬆️ (#7275 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-04-27 15:12:14 +02:00
Eugen Rochko	63553c6b5c	Add support for separate Redis for cache (#7272 ) * Add support for separate Redis for cache CACHE_REDIS_URL to allow using a different Redis server for cache purposes, with cache-specific configuration such as key eviction * Fix code style issues	2018-04-27 01:37:59 +02:00
Yamagishi Kazutoshi	36b6631c12	Add Basque language support (#7267 )	2018-04-26 13:56:45 +02:00
Renato "Lond" Cerqueira	3afdd6a17b	Weblate translations 20180426 (#7266 ) * Translated using Weblate (Swedish) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Slovak) Currently translated at 92.0% (576 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Dutch) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Swedish) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Swedish) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Translated using Weblate (Japanese) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.3% (622 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Galician) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.2% (621 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Basque) Currently translated at 32.2% (20 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Arabic) Currently translated at 99.6% (293 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 82.4% (516 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Slovak) Currently translated at 92.1% (577 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Catalan) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Basque) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Slovak) Currently translated at 92.3% (578 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ https://sustatu.eus/1380226549995 * Translated using Weblate (Catalan) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused	2018-04-26 18:58:22 +09:00
Stefan Midjich	fa5b28df8a	Better phrasing in swedish translation (#7263 ) * more sane phrasing in 🇸🇪 translation * another small issue in 🇸🇪 translation * better phrasing in 🇸🇪 translation	2018-04-26 07:36:52 +09:00
MIYAGI Hikaru	f58dcbc981	HTTP proxy support for outgoing request, manage access to hidden service (#7134 ) * Add support for HTTP client proxy * Add access control for darknet Supress error when access to darknet via transparent proxy * Fix the codes pointed out * Lint * Fix an omission + lint * any? -> include? * Change detection method to regexp to avoid test fail	2018-04-25 02:14:49 +02:00
Stefan Midjich	bfc41711dd	more sane phrasing in 🇸🇪 translation (#7256 ) * more sane phrasing in 🇸🇪 translation * another small issue in 🇸🇪 translation	2018-04-25 01:54:24 +02:00
Renato "Lond" Cerqueira	7681ad8044	Weblate translations (2018-04-24) (#7252 ) * Translated using Weblate (Dutch) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (French) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Dutch) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Japanese) Currently translated at 99.6% (287 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.5% (623 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Galician) Currently translated at 99.8% (625 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (French) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.6% (624 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.5% (631 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Korean) Currently translated at 99.8% (633 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (French) Currently translated at 99.6% (632 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * 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 (Dutch) Currently translated at 100.0% (634 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (634 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Japanese) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Added translation using Weblate (Basque) * Added translation using Weblate (Basque) * Translated using Weblate (Galician) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Added translation using Weblate (Basque) * Added translation using Weblate (Basque) * Added translation using Weblate (Basque) * Added translation using Weblate (Basque) * Translated using Weblate (Galician) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Galician) Currently translated at 99.8% (633 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Basque) Currently translated at 0.3% (1 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 50.0% (1 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/eu/ * Translated using Weblate (Basque) Currently translated at 1.6% (1 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eu/ * Translated using Weblate (Basque) Currently translated at 1.3% (1 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/ * Translated using Weblate (Basque) Currently translated at 1.6% (1 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Catalan) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * 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 (Catalan) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * 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 (Catalan) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Japanese) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Arabic) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Slovak) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Japanese) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Slovak) Currently translated at 99.6% (287 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 88.4% (561 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 90.3% (573 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Korean) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Italian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/it/ * Translated using Weblate (Italian) Currently translated at 3.2% (2 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (288 of 288 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 32.4% (206 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/it/ * Translated using Weblate (Arabic) Currently translated at 81.3% (516 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Italian) Currently translated at 51.2% (325 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Slovak) Currently translated at 91.6% (581 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Italian) Currently translated at 51.8% (329 of 634 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Normalize translations Ran yarn build:development && i18n-tasks normalize && yarn manage:translations * Remove unused translations Ran i18n-tasks remove-unused	2018-04-24 11:48:11 +02:00
Emelia Smith	60b871d56c	Implement the ability for instances to define a list of disallowed hashtags (#7176 ) The goal here isn't to prevent these hashtags from existing, but just to strongly curtail their usage; The hashtags may still exist in the database via federated status, or from being created prior to this feature.	2018-04-23 23:52:58 +02:00
Marcin Mikołajczak	3ccca6cece	🌍: Make 🇵🇱 translation more consistent (#7239 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-04-23 18:49:03 +09:00
Yamagishi Kazutoshi	9613a53cb3	Update dependencies for Ruby (2018-04-23) (#7237 ) * Update annotate to version 2.7.3 * Update aws-sdk-s3 to version 1.9.2 * Update browser to version 2.5.3 * Update capistrano to version 3.10.2 * Update domain_name to version 0.5.20180417 * Update http to version 3.2.0 * Update lograge to version 0.10.0 * Update oj to version 3.5.1 * Update parallel_tests to version 2.21.3 * Update puma to version 3.11.4 * Update rubocop to version 0.55.0 * Update scss_lint to version 0.57.0 * Update simplecov to version 0.16.1 * Update tty-command to version 0.8.0 * Update tty-prompt to version 0.16.0 * Update pkg-config to version 1.3.0 * Update fog-local to version 0.5.0 * Update fog-openstack to version 0.1.25 * Update devise-two-factor to version 3.0.3 * bundle update	2018-04-23 11:29:17 +02:00
jumoru	b305a23933	Fix: Use "exportierten" instead of "exportieren" in translation (#7186 ) Spotted when looking at https://metalhead.club/@thomas/99881521526619858	2018-04-22 14:46:19 +02:00
Matthias Beyer	3fa3161472	Fix: Use "welches" instead of "dass" in translation (#7185 )	2018-04-22 12:28:12 +09:00
Lynx Kotoura	a4a36d994b	Separate high contrast theme (#7213 )	2018-04-21 21:35:55 +02:00
Eugen Rochko	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
David Yip	16d5217502	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json	2018-04-18 18:48:12 -05:00
Marcin Mikołajczak	1957209efd	i18n: Update Polish translation (#7181 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-04-19 00:14:21 +09:00
Kaito Sinclaire	156b916caf	Direct messages column (#4514 ) * Added a timeline for Direct statuses * Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL * Changes to match other timelines in 2.0	2018-04-18 13:09:06 +02:00
luzi82	aedfea3554	zh-HK translation (#7177 ) * zh-HK translation * zh-HK fix * zh-HK translation * add missing zh-HK translate * fix translate * i18n-tasks normalize	2018-04-18 14:28:26 +09:00
Emelia Smith	204d72fbe4	Feature: add count of account notes to reports (#7130 ) * Reports: Colocate account details with reports * Reports: Add count of account moderation notes Sometimes an account will be left with a note instead of the report, this adds a way to quickly see from a given report if this is the case.	2018-04-17 14:58:11 +02:00
Yamagishi Kazutoshi	7c43ed04fe	Weblate translations (2018-04-15) (#7141 ) * Translated using Weblate (Galician) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Arabic) Currently translated at 76.4% (449 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Polish) Currently translated at 98.9% (581 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (585 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Persian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (French) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Arabic) Currently translated at 76.6% (450 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Slovak) Currently translated at 92.6% (544 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Arabic) Currently translated at 82.9% (487 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 98.6% (74 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Slovak) Currently translated at 93.6% (550 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 95.4% (560 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/ * Translated using Weblate (Korean) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Korean) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Arabic) Currently translated at 82.9% (487 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.2% (278 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 87.3% (513 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.6% (279 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Finnish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Arabic) Currently translated at 88.0% (517 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Finnish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Japanese) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Spanish) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Finnish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fi/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Slovak) Currently translated at 95.4% (560 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * 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 (Finnish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fi/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Finnish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fi/ * Translated using Weblate (Finnish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fi/ * Translated using Weblate (Finnish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Finnish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Finnish) Currently translated at 25.8% (152 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Finnish) Currently translated at 25.8% (152 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Finnish) Currently translated at 33.0% (194 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Finnish) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Slovak) Currently translated at 95.5% (561 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Galician) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * yarn manage:translations	2018-04-15 16:56:03 +02:00
Marcin Mikołajczak	fed0b5ed04	i18n: Update Polish translation (#7131 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-04-15 14:12:41 +09:00
David Yip	813da6788e	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: db/schema.rb	2018-04-14 09:12:50 -05:00
Eugen Rochko	78ed4ab75f	Add bio fields (#6645 ) * Add bio fields - Fix #3211 - Fix #232 - Fix #121 * Display bio fields in web UI * Fix output of links and missing fields * Federate bio fields over ActivityPub as PropertyValue * Improve how the fields are stored, add to Edit profile form * Add rel=me to links in fields Fix #121	2018-04-14 12:41:08 +02:00
Jenkins	e3d0d72b29	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-04-14 09:17:23 +00:00
David Yip	d66192f21c	Merge remote-tracking branch 'glitchsoc/master' into gs-master Conflicts: db/schema.rb	2018-04-14 03:50:31 -05:00
David Yip	b7804028c2	Merge pull request #419 from ThibG/glitch-soc/features/bookmarks Bookmarks	2018-04-13 16:38:15 -05:00
David Yip	ed490b781f	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: Gemfile.lock config/application.rb	2018-04-13 16:36:46 -05:00
mayaeh	85ab30abf7	i18n: Add Japanese translations for privacy policy and more (#7049 ) * Update Japanese translations. * Update Japanese translations. * Update Japanese translations. * Update Japanese translations. * Add Japanese translations for #6984, #7040, #7072. Update Japanese translations for privacy policy. * Add Japanese translations for #7032, #7074, #7089. * Proofreading Japanese translations for privacy policy.	2018-04-13 20:11:26 +09:00
Yamagishi Kazutoshi	50529cbceb	Upgrade Rails to version 5.2.0 (#5898 )	2018-04-12 14:45:17 +02:00
David Yip	a817f084ea	Merge remote-tracking branch 'tootsuite/master' Conflicts: app/controllers/statuses_controller.rb	2018-04-12 03:30:57 -05:00
Alexander	8e88a18316	update gem, test pam authentication (#7028 ) * update gem, test pam authentication * add description for test parameters * fix inclusion of optional group	2018-04-11 21:40:38 +02:00
Thibaut Girka	50eb8f1f61	Add backend support for bookmarks Bookmarks behave like favourites, except they aren't shared with other users and do not have an associated counter.	2018-04-11 20:40:29 +02:00
Jenkins	33c2bbdda7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-04-11 00:50:09 +00:00
Emelia Smith	d9b62e34da	Feature: Improve reports ui (#7032 ) * Further improvements to Reports UI - Clean up notes display - Clean up add new note form - Simplify controller - Allow reopening a report with a note - Show created at date for reports - Fix report details table formatting * Show history of report using Admin::ActionLog beneath the report * Fix incorrect log message when reopening a report * Implement fetching of all ActionLog items that could be related to the report * Ensure adding a report_note updates the report's updated_at * Limit Report History to actions that happened between the report being created and the report being resolved * Fix linting issues * Improve report history builder Thanks @gargron for the improvements	2018-04-10 20:27:59 +02:00
Eugen Rochko	49bbef1202	Use RAILS_LOG_LEVEL to set log level of Sidekiq, too (#7079 ) Fix #3565 (oops)	2018-04-10 16:08:28 +02:00
Emelia Smith	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
Eugen Rochko	80a944c882	Log rate limit hits (#7096 ) Fix #7095	2018-04-10 01:20:18 +02:00
Marcin Mikołajczak	07d90b0414	i18n: Update Polish translation (#7085 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-04-09 17:28:53 +09:00
David Yip	67e77f230e	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.	2018-04-08 19:05:02 -05:00
ThibG	1364e9e4ae	Fix follow/unfollow buttons on public profile (fixes #7036 ) (#7040 ) * Fix follow/unfollow buttons on public profile - Present non-logged users with web+mastodon:// URLs for remote accounts - Present logged-in users with appropriate links (authorize_follows and remote_unfollows) for remote accounts * Do not cache rendered cards if user is logged in	2018-04-08 13:40:22 +02:00
Eugen Rochko	d4de2239b0	Add a circuit breaker for ActivityPub deliveries (#7053 )	2018-04-07 21:36:58 +02:00
Hisham Muhammad	4a9becfca2	i18n: improve "Welcome" translation in Portuguese (#7068 ) * i18n: update gender-neutral language for pt and pt-BR Instead of using "bem-vindo(a)" (a masculine form of "Welcome" with a "(a)" in the end to mean "bem-vinda" for the feminine form), use "boas-vindas", which is a gender-neutral form of "Welcome"). There is already precedent for using "boas-vindas" in the Brazilian Portuguese localization, in `config/locales/pt-BR.yml`. European Portuguese dictionary Priberam also registers it as a valid form: https://www.priberam.pt/dlpo/boas-vindas * i18n: pt-BR minor orthography fix The form "a bordo" does not take an accent. http://oredator.com.br/curso-de-redacao/uncategorized/a-bordo-ou-a-bordo	2018-04-07 21:36:03 +02:00
Eugen Rochko	f1867a7388	Adjust privacy policy (#6666 ) * Adjust privacy policy to be more specific to Mastodon Fix #6613 * Change data retention of IP addresses from 5 years to 1 year * Add even more information * Remove all (now invalid) translations of the privacy policy * Add information about archive takeout, remove pointless consent section * Emphasis on DM privacy * Improve wording * Add line about data use for moderation purposes	2018-04-04 21:47:39 +02:00
David Yip	3ab6a8b8be	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: spec/views/about/show.html.haml_spec.rb	2018-04-04 13:56:58 -05:00
Marcin Mikołajczak	1c1042556d	i18n: Update Polish translation (#7037 ) * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-04-04 20:13:43 +02:00
Eugen Rochko	07176fed37	Add contact account to landing page ("Administered by") (#6984 )	2018-04-04 01:11:26 +02:00
Jenkins	6611100480	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-04-03 19:17:20 +00:00
ThibG	d8d4217959	Fix french wording of reblogged toots in public views, matching the wording of reblogged_by (#7029 )	2018-04-03 21:09:14 +02:00
mayaeh	1c293086a1	i18n: Add Japanese translations for #7000 (#7022 ) * run yarn manage:translations. * run i18n-tasks add-missing ja. * Update Japanese translations.	2018-04-03 18:21:33 +09:00
Emelia Smith	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
Emelia Smith	e7a1716701	Implement the ability for an Administrator or Moderator to remove an account avatar (#6998 )	2018-04-02 13:45:07 +02:00
Yamagishi Kazutoshi	3f51c6efaa	Weblate translations (2018-04-02) (#7007 ) * Translated using Weblate (Galician) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Arabic) Currently translated at 76.4% (449 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Polish) Currently translated at 98.9% (581 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (585 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Persian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (French) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Arabic) Currently translated at 76.6% (450 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Slovak) Currently translated at 92.6% (544 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Arabic) Currently translated at 82.9% (487 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 98.6% (74 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Slovak) Currently translated at 93.6% (550 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 95.4% (560 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/ * Translated using Weblate (Korean) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Korean) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Arabic) Currently translated at 82.9% (487 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.2% (278 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 87.3% (513 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.6% (279 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * bundle exec i18n-tasks normalize && yarn manage:translations * revert	2018-04-02 13:43:30 +02:00
Evgeny Petrov	b04f73ce66	Russian language updated (#7005 ) * Russian language updated * Small fixes for RU language * bundle exec i18n-tasks normalize	2018-04-02 19:49:06 +09:00
luzi82	24611d8deb	i18n: update zh-HK translation (#7004 ) * i18n: update zh-HK translation * i18n: update zh-HK translation * i18n-tasks normalize	2018-04-02 19:11:37 +09:00
David Yip	eb39db7f93	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml	2018-04-01 20:24:50 -05:00
luzi82	993ce0e5a7	improve zh-HK localization by referring zh-TW and zh-CN (#6988 )	2018-04-01 21:57:26 +09:00
David Yip	d2cdc2b5a3	Merge remote-tracking branch 'origin/master' into gs-master	2018-03-27 10:44:12 -05:00
Akihiko Odaki	ca42f9b0eb	Cache media (#6902 )	2018-03-27 12:32:30 +02:00
Jenkins	837b3804bf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-25 15:17:21 +00:00
Marcin Mikołajczak	85a395fab6	i18n: Update Polish translation (#6903 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-03-25 23:33:07 +09:00
Yamagishi Kazutoshi	28384c1771	Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807 )" (#6808 ) This reverts commit `40871caa4b`.	2018-03-24 12:52:45 +01:00
Akihiko Odaki	fa310695fa	Note if the user is already following the target when authorizing follow (#6325 )	2018-03-24 12:50:41 +01:00
Jeroen	580835ab69	Invites: Add '1 week' as expire option (#6872 ) * Invites: Add '1 week' as expire option IMO a max. of 1 day is too short. Not everyone has the time and motivation to use an invite in a 24 hour period. 1 week as a max. is I think a good compromise between convenience and security. * Invites: Add '1 week' as expire option IMO a max. of 1 day is too short. Not everyone has the time and motivation to use an invite in a 24 hour period. 1 week as a max. is I think a good compromise between convenience and security. * Update en.yml	2018-03-24 12:50:14 +01:00
Yamagishi Kazutoshi	65c10c0bc8	Weblate translations (2018-03-23) (#6874 ) * Translated using Weblate (Galician) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Arabic) Currently translated at 76.4% (449 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Polish) Currently translated at 98.9% (581 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (585 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * bundle exec i18n-tasks normalize && yarn manage:translations	2018-03-24 01:04:02 +01:00
Jenkins	03b2f701e7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-23 10:17:18 +00:00
Quentí	ecdc5957a3	[i18n] Occitan update (#6869 ) * Update oc.yml * Update simple_form.oc.yml * Update oc.json * Update oc.yml * bundle exec i18n-tasks normalize	2018-03-23 18:52:25 +09:00
Jenkins	e8aeec4fea	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-20 19:17:20 +00:00
Eugen Rochko	ac49c7932d	Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845 ) Fix #6816, fix #6790	2018-03-20 19:41:51 +01:00
Akihiko Odaki	61dcb686a8	Fix i18n fallback configuration conflicts with environment configurations (#6843 )	2018-03-20 16:36:20 +01:00
Jenkins	df70571bfe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-19 20:17:18 +00:00
Alexander	33ee347c99	rename pam email environment variable to something more understandable and default to LOCAL_DOMAIN (better fallback) (#6833 )	2018-03-19 20:09:26 +01:00
Alexander	0306e3e9be	bugfixes and gem update (#6831 ) * update to new version of devise_pam_authenticatable2 * fix behaviour if suffix is nil, fix environment loading, fix user email creation * code cleanup/fix linter warning	2018-03-19 20:08:56 +01:00
Renato "Lond" Cerqueira	f7c46fc113	Weblate translations 20180319 (#6827 ) * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Spanish) Currently translated at 99.6% (579 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Japanese) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (French) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Spanish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Spanish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Indonesian) Currently translated at 94.6% (71 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Arabic) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Dutch) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Arabic) Currently translated at 75.5% (439 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 76.2% (443 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Russian) Currently translated at 95.8% (557 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Translated using Weblate (Finnish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 91.7% (533 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Dutch) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Spanish) Currently translated at 99.8% (580 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Finnish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Spanish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Swedish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Finnish) Currently translated at 93.1% (54 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Arabic) Currently translated at 76.7% (446 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Slovak) Currently translated at 93.2% (542 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Arabic) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations	2018-03-19 15:12:06 +01:00
David Yip	ab04be2f84	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: config/i18n-tasks.yml	2018-03-18 20:21:17 -05:00
Eugen Rochko	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
Eugen Rochko	40871caa4b	Revert "Upgrade Paperclip to version 6.0.0" (#6807 ) * Revert "Bump version to 2.3.2rc1" This reverts commit `cdf8b92fea`. * Revert "Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806)" This reverts commit `0074cad44f`. * Revert "Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)" This reverts commit `4a0a19fe54`. * Revert "Correct the reference to user's password in mastodon:add_user task (#6800)" This reverts commit `338bff8b93`. * Revert "Upgrade Paperclip to version 6.0.0 (#6754)" This reverts commit `b88fcd53f7`.	2018-03-17 14:20:35 +01:00
Yamagishi Kazutoshi	b88fcd53f7	Upgrade Paperclip to version 6.0.0 (#6754 )	2018-03-17 12:37:58 +01:00
Jenkins	d75a6054a0	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-13 18:17:20 +00:00
Renato "Lond" Cerqueira	03119c857b	Weblate translations (2018-03-13) (#6777 ) * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Spanish) Currently translated at 99.6% (579 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Japanese) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (French) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Spanish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Spanish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Indonesian) Currently translated at 94.6% (71 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Arabic) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Dutch) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Arabic) Currently translated at 75.5% (439 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 76.2% (443 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Russian) Currently translated at 95.8% (557 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations	2018-03-13 16:16:51 +01:00
David Yip	f8e934f955	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: README.md	2018-03-12 17:52:19 -05:00
Yamagishi Kazutoshi	8b14726f5b	Weblate translations (2018-03-11) (#6742 ) * Translated using Weblate (Japanese) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Finnish) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Finnish) Currently translated at 25.1% (146 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Slovak) Currently translated at 91.2% (530 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Arabic) Currently translated at 67.6% (393 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Swedish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (581 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Translated using Weblate (Finnish) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Finnish) Currently translated at 92.0% (69 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fi/ * Translated using Weblate (Finnish) Currently translated at 60.3% (35 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Swedish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Arabic) Currently translated at 68.3% (397 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.2% (274 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Slovak) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Arabic) Currently translated at 73.8% (429 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Slovak) Currently translated at 91.2% (530 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * bundle exec i18n-tasks normalize && yarn manage:translations	2018-03-11 16:21:26 +01:00
Jenkins	e553905ba7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-09 12:17:22 +00:00
Yamagishi Kazutoshi	4c16ddf588	Change avatar size on form hints (#6707 )	2018-03-09 10:57:33 +01:00
Renato "Lond" Cerqueira	5ba4c36f95	Weblate translations (2018-03-09) (#6708 ) * Translated using Weblate (Galician) Currently translated at 100.0% (580 of 580 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (580 of 580 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Japanese) Currently translated at 99.8% (579 of 580 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Dutch) Currently translated at 100.0% (581 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (French) Currently translated at 99.8% (580 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (German) Currently translated at 99.3% (577 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.3% (577 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (580 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Japanese) Currently translated at 99.8% (580 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (German) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Catalan) Currently translated at 100.0% (581 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (French) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.8% (580 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Polish) Currently translated at 99.8% (580 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (581 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (581 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Slovak) Currently translated at 90.3% (525 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 99.8% (580 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Galician) Currently translated at 100.0% (581 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations	2018-03-09 18:38:13 +09:00
Jenkins	447d7e6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-09 00:17:17 +00:00
Eugen Rochko	5acd5315f2	Improve styling of closed registrations message, rename button (#6695 ) * Improve styling of closed registrations message, rename button "Sign up on another server" Fix #6683 * Adjust styling of closed registrations message	2018-03-08 11:10:37 +01:00
Yamagishi Kazutoshi	1085ef3836	Weblate translations (2018-03-08) (#6690 ) * Translated using Weblate (French) Currently translated at 99.8% (578 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 99.8% (578 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 99.8% (578 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (275 of 275 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Slovak) Currently translated at 85.3% (494 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (275 of 275 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (275 of 275 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (275 of 275 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% (578 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Japanese) Currently translated at 100.0% (275 of 275 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Arabic) Currently translated at 99.2% (273 of 275 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Japanese) Currently translated at 100.0% (275 of 275 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Arabic) Currently translated at 66.8% (387 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 93.1% (54 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (French) Currently translated at 99.8% (578 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Slovak) Currently translated at 87.7% (508 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (275 of 275 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * bundle exec i18n-tasks normalize && yarn manage:translations * Remove ar.simple_form.hints.defaults.{display_name,note}	2018-03-08 06:59:34 +01:00
Effy Elden	dd9d00d293	Add additional first_name and last_name SAML attribute statement options, and modify Omniauthable concern to use full_name or first_name + last_name if not available (#6669 )	2018-03-07 06:19:10 +01:00
Sylvhem	cb74c0cfe4	Add headings to the security settings page (#6661 ) * Changes the headings' rank of the security settings section This commit changes the existing headings' rank of the security settings section from level 6 to level 4. * Renames the auth.change_password string into auth.security The "Security" preferences' section used to be called "Change password". When it was renamed, the string name wasn't changed. This commits changes auth.change_password to auth.security. * Adds a heading to the password change form There was previously no heading for the part of the "Security" page that contain the password change form. This commit adds a rank 4 heading to this section and reintroduces an "auth.change_password" string to be used inside it. * Removes useless HR elements The various sections of the "Security" settings page were previously separated by HR elements. Now that there is proper headings, they're not required anymore. * Updates CSS This commit updates CSS in such a way that the same style is applied to all the H4 elements of the settings. * Correct a mistake A character went missing on one of the previous commits, broking the CSS. This new commit fixes it.	2018-03-07 01:39:40 +01:00
Renato "Lond" Cerqueira	bd40574476	Weblate translations (05-03-2018) (#6640 ) * Translated using Weblate (French) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Japanese) Currently translated at 98.9% (572 of 578 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Catalan) Currently translated at 98.4% (569 of 578 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (578 of 578 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (579 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (577 of 578 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% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (French) Currently translated at 99.8% (577 of 578 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Esperanto) Currently translated at 99.6% (576 of 578 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Arabic) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Slovak) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 74.5% (431 of 578 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Dutch) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Japanese) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Dutch) Currently translated at 100.0% (578 of 578 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (579 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Arabic) Currently translated at 99.6% (271 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Japanese) Currently translated at 98.9% (573 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (578 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Arabic) Currently translated at 66.6% (386 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Galician) Currently translated at 100.0% (579 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * 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 (Slovak) Currently translated at 75.4% (437 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Polish) Currently translated at 99.8% (578 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Slovak) Currently translated at 83.5% (484 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations	2018-03-06 00:27:50 +09:00
Marcin Mikołajczak	3b2e783c1f	i18n: Update Polish translation (#6632 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-03-05 16:05:52 +09:00
Akihiko Odaki	c110fa62ac	Provide default OTP_SECRET value for development environment (#6617 )	2018-03-04 20:28:24 +01:00
Akihiko Odaki	51d760960c	Set the default locale in config (#6580 ) Previously the default locale was set by Localized concern for controllers, but it was not enforced for mailers. config is enforced throughout the application and an appropriate place to set the default locale.	2018-03-04 09:21:35 +01:00
Eugen Rochko	9110db41c5	Federate pinned statuses over ActivityPub (#6610 ) * Federate pinned statuses over ActivityPub * Display pinned toots in web UI Fix #6117 * Fix migration * Fix tests * Update outbox_serializer.rb * Update remove_serializer.rb * Update add_serializer.rb * Update fetch_featured_collection_service.rb	2018-03-04 09:19:11 +01:00
Jeong Arm	c82a2358bd	Translate Korean (#6608 )	2018-03-04 01:53:55 +09:00
David Yip	1b8fcd4df5	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml	2018-03-02 21:46:44 -06:00
Yamagishi Kazutoshi	ecf06d7e82	Change "or" translatable (#6597 )	2018-03-02 19:03:21 +01:00
Alexander	42fe05dea1	fix logic for pam_controlled_service (#6599 )	2018-03-02 19:02:50 +01:00
Yamagishi Kazutoshi	0963b6fd22	Weblate translations (2018-03-02) (#6588 ) * Translated using Weblate (Galician) Currently translated at 100.0% (57 of 57 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (57 of 57 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Swedish) Currently translated at 100.0% (57 of 57 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Catalan) Currently translated at 100.0% (57 of 57 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Slovak) Currently translated at 100.0% (57 of 57 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Dutch) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Arabic) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Arabic) Currently translated at 98.2% (55 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Slovak) Currently translated at 61.1% (342 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Swedish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sv/ * Translated using Weblate (Portuguese) Currently translated at 96.4% (54 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (264 of 264 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% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/ * Translated using Weblate (Japanese) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Arabic) Currently translated at 98.2% (55 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 79.0% (49 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Arabic) Currently translated at 52.9% (296 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Slovak) Currently translated at 61.1% (342 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Dutch) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (57 of 57 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Galician) Currently translated at 100.0% (565 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (565 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Japanese) Currently translated at 99.2% (561 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 60.5% (342 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Polish) Currently translated at 99.1% (560 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 62.4% (353 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Swedish) Currently translated at 100.0% (565 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Translated using Weblate (Japanese) Currently translated at 99.2% (561 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Catalan) Currently translated at 99.1% (560 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Finnish) Currently translated at 99.6% (263 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Slovak) Currently translated at 62.6% (354 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (French) Currently translated at 99.1% (560 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Japanese) Currently translated at 93.1% (54 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Galician) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Polish) Currently translated at 99.2% (561 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Polish) Currently translated at 99.8% (564 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 72.5% (45 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Finnish) Currently translated at 99.6% (263 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Finnish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Finnish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Catalan) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 99.8% (564 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Dutch) Currently translated at 100.0% (565 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Arabic) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Slovak) Currently translated at 62.8% (355 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Arabic) Currently translated at 99.6% (263 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Finnish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Polish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ * Translated using Weblate (Arabic) Currently translated at 96.0% (72 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Slovak) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Arabic) Currently translated at 98.2% (57 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (German) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (Catalan) Currently translated at 99.8% (564 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Finnish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (German) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/de/ * Translated using Weblate (French) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * 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 (Slovak) Currently translated at 63.7% (360 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Arabic) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Slovak) Currently translated at 64.9% (367 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Arabic) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/ar/ * Translated using Weblate (Arabic) Currently translated at 98.6% (74 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Catalan) Currently translated at 99.8% (564 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (565 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (565 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Slovak) Currently translated at 69.5% (393 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 99.2% (561 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Arabic) Currently translated at 88.7% (55 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Arabic) Currently translated at 92.0% (69 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Slovak) Currently translated at 70.6% (399 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Slovak) Currently translated at 74.1% (419 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Arabic) Currently translated at 67.6% (382 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (French) Currently translated at 99.4% (562 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese) Currently translated at 95.3% (539 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Slovak) Currently translated at 75.3% (426 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Croatian) Currently translated at 58.0% (36 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/hr/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/hu/ * Translated using Weblate (Esperanto) Currently translated at 58.6% (34 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Occitan) Currently translated at 96.8% (547 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Slovak) Currently translated at 76.2% (431 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (French) Currently translated at 99.6% (263 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Arabic) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 77.8% (440 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (565 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (565 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eo/	2018-03-02 04:36:16 +01:00
mayaeh	e7d741ece3	i18n: Update Japanese translations (#6581 ) * yarn manage:translations * Update Japanese translations.	2018-03-02 07:48:17 +09:00
Marcin Mikołajczak	51b7a22ea7	i18n: Update Polish translation (#6578 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-03-01 18:26:51 +09:00
Eugen Rochko	47bdb9b33b	Fix #942 : Seamless LDAP login (#6556 )	2018-02-28 19:04:53 +01:00
beatrix	4072b68686	remove Uglifier call from production.rb (#6568 )	2018-02-27 05:48:11 +01:00
imncls	041df1a5a7	i18n normalize data	2018-02-26 12:53:02 +09:00
Ian McCowan	c33931b613	Fix prev/next links on public profile page (#6497 ) * Fix prev/next links on public profile page * Don't make pagination urls if no available statuses * Fix empty check method * Put left chevron before prev page link * Add scope for pagination "starting at" a given id * Status pagination try 2: s/prev/older and s/next/newer "older" on left, "newer" on right Use new scope for "newer" link Extract magic 20 page size to constant Remove max_id from feed pagination as it's not respected * Reinstate max_id for accounts atom stream * normalize	2018-02-26 03:31:28 +01:00
imncls	e591b3fe38	Add missing Japanese translate	2018-02-26 11:12:55 +09:00
Akihiko Odaki	2e8a492e88	Raise Mastodon::HostValidationError when host for HTTP request is private (#6410 )	2018-02-24 19:16:11 +01:00
mayaeh	4d8c0d9959	i18n: Update Japanese translations (#6550 ) * Update Japanese translations. * Add quotation marks.	2018-02-25 01:27:03 +09:00
imncls	bb6988a7ac	Merge branch 'master' of https://github.com/tootsuite/mastodon # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb	2018-02-23 23:28:31 +09:00
Ghislain Loaec	e668180044	New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540 )	2018-02-23 01:16:17 +01:00
Marcin Mikołajczak	3e46f12340	i18n: Update Polish translation (#6539 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-02-22 23:31:41 +01:00
Ghislain Loaec	3084fe4959	New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538 )	2018-02-22 23:31:25 +01:00
Eugen Rochko	c71aa468b5	Redesign landing page (again) (#6486 ) * Redesign landing page (again) * Move login form in small version to the right column * Display closed registrations message * Add site setting for the hero image * Fix test * Increase spacing, maximum width, change call to action section	2018-02-22 01:03:48 +01:00
Eugen Rochko	61ed133fea	Account archive download (#6460 ) * Fix #201: Account archive download * Export actor and private key in the archive * Optimize BackupService - Add conversation to cached associations of status, because somehow it was forgotten and is source of N+1 queries - Explicitly call GC between batches of records being fetched (Model class allocations are the worst offender) - Stream media files into the tar in 1MB chunks (Do not allocate media file (up to 8MB) as string into memory) - Use #bytesize instead of #size to calculate file size for JSON (Fix FileOverflow error) - Segment media into subfolders by status ID because apparently GIF-to-MP4 media are all named "media.mp4" for some reason * Keep uniquely generated filename in Paperclip::GifTranscoder * Ensure dumped files do not overwrite each other by maintaing directory partitions * Give tar archives a good name * Add scheduler to remove week-old backups * Fix code style issue	2018-02-21 23:21:32 +01:00
Eugen Rochko	a7171af0a3	Fix avatar and header issues by using custom geometry detector (#6515 ) * Fix avatar and header issues by using custom geometry detector Revert a part of #6508. The file passed to dynamic styles method was not actually a file, but an instance of Paperclip::Attachment, which broke all styles by always returning {} from the method. One problem with GIF avatars was that Paperclip::GeometryDetector reported wrong dimensions for them, e.g. 120x120 GIF avatar would for some reason be detected as 120x53. By writing our own geometry parser, we can use FastImage, which also happens to be faster than ImageMagick, to detect image dimensions, which are also correct. Unfortunately, this PR does not implement skipping a `convert` entirely if the dimensions are already correct, as I found no easy way to write that behaviour into Paperclip without rewriting the Paperclip::Thumbnail class. * Only invoke convert if dimension or format needs to be changed	2018-02-21 03:40:12 +01:00
Eugen Rochko	02856073f7	Fix #6509 : Use pull queue for chewy jobs (#6513 )	2018-02-20 17:25:16 +01:00
Jenkins	1445ba1703	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-19 15:17:14 +00:00
Akihiko Odaki	9b8a448477	Isolate each specs for cache store (#6450 ) The cache store is explicitly used by some specs, but they were not isolated and therefore not reliable. This fixes the issue by clearing the cache after each specs.	2018-02-17 22:35:05 +01:00
David Yip	3d033a4687	Merge remote-tracking branch 'tootsuite/master' into merge-upstream Conflicts: Gemfile config/locales/simple_form.pl.yml	2018-02-17 00:02:37 -06:00
Simó Albert i Beltran	c770b503c0	Fix Spanish translation of remote_follow acct (#6475 )	2018-02-17 03:53:38 +09:00
Simó Albert i Beltran	ffdf0f2ff6	Fix Catalan translation of remote_follow acct (#6476 )	2018-02-16 19:15:56 +01:00
Eugen Rochko	9dbae6e8a1	Save video metadata and improve video OpenGraph tags (#6481 ) * Save metadata from video attachments, put correct dimensions into OG tags * Add twitter:player for videos * Fix code style and test	2018-02-16 07:22:20 +01:00
Marcin Mikołajczak	ba8ec4eed6	i18n: Update Polish translation (#6470 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-02-14 07:55:45 +09:00
Jenkins	e9052ceaaf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-11 23:17:11 +00:00
Daniel King	6ef3874b2e	Fix URLs incorrectly having trailing hyphen removed (#6465 ) In cases where a URL has a trailing hyphen the FetchLinkCardService incorrectly removes the hyphen when it is parsed The hyphen is not a reserved character in the URI spec https://tools.ietf.org/html/rfc3986#section-2.2	2018-02-11 23:49:18 +01:00
Eugen Rochko	e20700fe8f	Fix Chewy trying to update index with the wrong strategy (#6464 )	2018-02-11 22:59:44 +01:00
Jenkins	efc9ffcb80	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-11 04:10:16 +00:00
Eugen Rochko	3ebc0ad4d3	Full-text search for authorized statuses (#6423 ) * Add full-text search for authorized statuses - Search API will return statuses that match the query - Only for logged in users - Only if you are author of the status, - Or you were mentioned in it - Or you favourited or reblogged it - Configuration over `ES_ENABLED`, `ES_HOST`, `ES_PORT`, `ES_PREFIX` - Run `rails chewy:deploy` to create & populate index Fix #5880 Fix #4293 Fix #1152 * Add commented out docker-compose configuration for ES container * Optimize index import, filter search results * Add basic normalization to the index * Add better stemming and normalization to the index * Skip webfinger request if search query includes both @ and a space * Fix code style * Visually separate search result sections * Fix code style issues	2018-02-09 23:04:47 +01:00
David Yip	b8efc3fc0b	Normalize simple_form.en.yml.	2018-02-09 09:41:57 -06:00
David Yip	020b40efdb	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml	2018-02-09 09:25:53 -06:00
Eugen Rochko	76f3d5d16b	Add preference to always display sensitive media (#6448 )	2018-02-09 00:26:57 +01:00
David Yip	a6fb1c58ee	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb	2018-02-04 16:36:19 -06:00
Eugen Rochko	38e0133e1b	Make PAM gem optional, allow configuration over environment (#6415 )	2018-02-04 15:05:53 +01:00
Renato "Lond" Cerqueira	4e4f1b0dcb	Add option to show only local toots in timeline preview (#6292 ) * Add option to show only local toots in timeline preview Right know, toots from all the known fediverse are shown in the main page of an instance. That however doesn't reflect the instance itself. With this option the admin may choose to display only local toots so that users checking the instance get a better idea of internal conversations. * Fix issues pointed by codeclimate and eslint * Add default message for community timeline * Update pl.yml	2018-02-04 06:00:10 +01:00
Eugen Rochko	26f21fd5a0	CAS + SAML authentication feature (#6425 ) * Cas authentication feature * Config * Remove class_eval + Omniauth initializer * Codeclimate review * Codeclimate review 2 * Codeclimate review 3 * Remove uid/email reconciliation * SAML authentication * Clean up code * Improve login form * Fix code style issues * Add locales	2018-02-04 05:42:13 +01:00
beatrix	fa361ccc5e	change referrer policy to same-origin	2018-02-03 14:49:00 -05:00
David Yip	4c1fd9a19c	Merge remote-tracking branch 'tootsuite/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	2018-02-02 08:39:52 -06:00
Alexander	04fef7b888	pam authentication (#5303 ) * add pam support, without extra column * bugfixes for pam login * document options * fix code style * fix codestyle * fix tests * don't call remember_me without password * fix codestyle * improve checks for pam usage (should fix tests) * fix remember_me part 1 * add remember_token column because :rememberable requires either a password or this column. * migrate db for remember_token * move pam_authentication to the right place, fix logic bug in edit.html.haml * fix tests * fix pam authentication, improve username lookup, add comment * valid? is sometimes not honored, return nil instead trying to authenticate with pam * update devise_pam_authenticatable2 and adjust code. Fixes sideeffects observed in tests * update devise_pam_authenticatable gem, fixes for codeconventions, fix finding user * codeconvention fixes * code convention fixes * fix idention * update dependency, explicit conflict check * fix disabled password updates if in pam mode * fix check password if password is present, fix templates * block registration if account is maintained by pam * Revert "block registration if account is maintained by pam" This reverts commit 8e7a083d650240b6fac414926744b4b90b435f20. * fix identation error introduced by rebase * block usernames maintained by pam * document pam settings better * fix code style	2018-02-02 10:18:55 +01:00
Jenkins	ad3a2dfb66	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-31 23:17:13 +00:00
Evgeny Petrov	3ed194b67d	Russian language updated (#6397 )	2018-02-01 07:33:54 +09:00
David Yip	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
Eugen Rochko	97dcfb0f50	ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372 )	2018-01-29 01:06:39 +01:00
Renato "Lond" Cerqueira	106efba800	Weblate translations (#6370 ) * Translated using Weblate (German) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/ * Translated using Weblate (Slovak) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Arabic) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 69.6% (39 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Japanese) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Galician) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Arabic) Currently translated at 67.7% (42 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Arabic) Currently translated at 71.4% (40 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Dutch) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Japanese) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Spanish) Currently translated at 70.9% (44 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/es/ * Translated using Weblate (Spanish) Currently translated at 92.1% (515 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Spanish) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/es/ * Translated using Weblate (French) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/ * Translated using Weblate (French) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (German) Currently translated at 89.0% (498 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/no/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/no/ * Translated using Weblate (Swedish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/no/ * Translated using Weblate (Hungarian) Currently translated at 37.5% (21 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/hu/ * Translated using Weblate (German) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/de/ * Translated using Weblate (German) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/de/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/ * Translated using Weblate (French) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Esperanto) Currently translated at 93.3% (70 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt/ * Translated using Weblate (German) Currently translated at 90.3% (505 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Portuguese) Currently translated at 91.4% (511 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Spanish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/es/ * Added translation using Weblate (Spanish) * Translated using Weblate (Spanish) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/es/ * Translated using Weblate (French) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Korean) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Korean) Currently translated at 99.6% (557 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (German) Currently translated at 90.8% (508 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 91.0% (509 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 91.9% (514 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 91.9% (514 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 92.6% (518 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 92.8% (519 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Spanish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/es/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/ * Translated using Weblate (Swedish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Arabic) Currently translated at 85.7% (48 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Esperanto) Currently translated at 90.3% (56 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eo/ * Translated using Weblate (Esperanto) Currently translated at 97.3% (73 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/ * Translated using Weblate (Finnish) Currently translated at 25.9% (145 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Portuguese) Currently translated at 96.2% (538 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Portuguese) Currently translated at 92.8% (52 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Spanish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Spanish) Currently translated at 99.4% (556 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ * Translated using Weblate (Esperanto) Currently translated at 87.5% (49 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Slovak) Currently translated at 59.7% (334 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (French) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Korean) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Korean) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.2% (555 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Hungarian) Currently translated at 67.9% (380 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ * Translated using Weblate (Hungarian) Currently translated at 72.2% (404 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ Sajnos nem találtam magyar megfelelőt * Translated using Weblate (Hungarian) Currently translated at 96.0% (537 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ * Translated using Weblate (Hungarian) Currently translated at 66.0% (37 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/hu/ * Translated using Weblate (Catalan) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Finnish) Currently translated at 83.9% (47 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Catalan) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Swedish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 96.9% (542 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Japanese) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Esperanto) Currently translated at 60.2% (337 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ [eo] Tiu parto de la frazo jam estas tradukita aliloke ☺ * Translated using Weblate (Slovak) Currently translated at 60.8% (340 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 70.9% (44 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations * Add back translations weblate removed	2018-01-28 22:48:09 +09:00
Quenty31	bd8d8ad894	l10n Occitan update (#6367 ) * Final point missing + s'acabar => expirar * Update oc.yml * Update oc.json	2018-01-27 08:51:03 +09:00
Jenkins	0e10667fbe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-24 19:17:11 +00:00
Quenty31	7650506b39	l10n Occitan language update (#6346 ) * Small changes * update for email templates * Digest changed * Update oc.yml waiting to finish * Update oc.yml * Update oc.yml * Update oc.yml * Update oc.json	2018-01-24 13:29:03 +01:00
Eugen Rochko	b1daa71da5	Fix #6311 : Replace relative URLs in CSS only for Premailer (#6335 )	2018-01-24 02:57:14 +01:00
Renato "Lond" Cerqueira	b7f6ddeaf1	Weblate translations (#6323 ) * Translated using Weblate (Galician) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (543 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Galician) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (543 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 95.2% (517 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 99.6% (259 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Dutch) Currently translated at 97.1% (543 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Galician) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Japanese) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (French) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Polish) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Catalan) Currently translated at 94.6% (529 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 95.3% (533 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Dutch) Currently translated at 98.2% (55 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 98.3% (550 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 95.3% (533 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Japanese) Currently translated at 0.0% (0 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 1.7% (1 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 1.7% (52 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Galician) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Polish) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ * Translated using Weblate (Catalan) Currently translated at 99.6% (260 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Japanese) Currently translated at 99.6% (260 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.6% (260 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (French) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/ * Translated using Weblate (French) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/ * Translated using Weblate (French) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.2% (555 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/ * Translated using Weblate (French) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations * Add back values removed by weblate	2018-01-22 14:20:58 +01:00
Jeong Arm	143fb54ab9	Korean translation (#6322 ) Related to #6273	2018-01-22 08:49:57 +09:00
David Yip	48d79007f6	Merge remote-tracking branch 'origin/master' into merge-upstream-20180121	2018-01-21 16:26:50 -06:00
Norayr Chilingarian	48cd6dc6ca	armenian translations initial commit (#6320 ) * adding armenian translations * updating config files for armenian translations * armenian translation fix * fixing spaces	2018-01-22 05:02:23 +09:00
David Yip	1253279feb	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb	2018-01-21 13:36:10 -06:00
ThibG	d613dda91d	Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319 ) Since `872a0d5bd8`, assets URL are absolute and not relative. Unfortunately, the domain used to build such URLs is the wrong one: LOCAL_DOMAIN, and not WEB_DOMAIN, where the assets are stored.	2018-01-21 13:22:31 +01:00
David Yip	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
SerCom_KC	80b3ca0f6f	Update Simplified Chinese translations (#6306 ) * i18n: (zh-CN) Add translations of #6251 * i18n: (zh-CN) Improve translations for #6291 * Fix en.json * i18n: (zh-CN) Update translations for #6303 * i18n: (zh-CN) Add translations of #6273 with minor adjustment * Minor fix * Minor fix	2018-01-21 00:11:21 +09:00
Eugen Rochko	872a0d5bd8	Improve HTML e-mails based on Litmus tests (#6301 ) * Use PNG images in HTML e-mails * Make webpack use URLs with host so fonts load inside HTML e-mails Convert this back to a relative URL in the premailer CSS loader since local requests are quicker * Improve responsive design * Add missing PNG icon	2018-01-20 01:32:21 +01:00
David Yip	2ca965c704	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss	2018-01-19 15:22:10 -06:00
Yamagishi Kazutoshi	238de58e65	Change belongs_to_required_by_default to true (#5888 )	2018-01-19 20:56:47 +01:00
Marcin Mikołajczak	852b48295f	i18n: Update Polish translation (#6297 )	2018-01-19 21:49:25 +09:00
Eugen Rochko	d799921c75	Replace tutorial modal with welcome e-mail (#6273 ) * Remove onboarding modal * Welcome e-mail * Send welcome e-mail after confirmation * Remove obsolete translations	2018-01-18 19:17:25 +01:00
David Yip	201e82686f	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	2018-01-17 18:37:09 -06:00
Renato "Lond" Cerqueira	59797ee233	Weblate translations (#6284 ) * Translated using Weblate (French) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Catalan) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (260 of 260 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% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ * Translated using Weblate (Dutch) Currently translated at 100.0% (529 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Galician) Currently translated at 100.0% (529 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (527 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (528 of 529 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% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Slovak) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 37.2% (197 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Russian) Currently translated at 99.0% (526 of 531 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Translated using Weblate (Catalan) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/ * Translated using Weblate (Catalan) Currently translated at 99.8% (530 of 531 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Japanese) Currently translated at 92.8% (52 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 75.8% (47 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/ * Translated using Weblate (Polish) Currently translated at 77.4% (48 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ * Translated using Weblate (Slovak) Currently translated at 38.3% (204 of 532 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/ * Translated using Weblate (Catalan) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/ * Translated using Weblate (Polish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ * Translated using Weblate (Russian) Currently translated at 96.8% (525 of 542 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Translated using Weblate (Japanese) Currently translated at 99.0% (537 of 542 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Polish) Currently translated at 99.8% (541 of 542 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Japanese) Currently translated at 99.0% (538 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Dutch) Currently translated at 97.4% (529 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations	2018-01-18 07:00:23 +09:00
Jenkins	aa2bf07281	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-17 16:17:10 +00:00
SerCom_KC	fb16c37d2a	Update Simplified Chinese translations (#6280 ) * i18n: (zh-CN) Update translation for #6252 * e-mail -> email * i18n: (zh-CN) Update translations for #6256 * i18n: (zh-CN) Minor Improvements * i18n: (zh-CN) Update translations for #6263 * i18n: (zh-CN) Update translations for #6279	2018-01-17 16:47:25 +01:00
Jeong Arm	acb982fc66	Korean translate (#6277 ) * Translate Korean * Translate Korean #6263	2018-01-17 12:42:11 +01:00
mayaeh	eed7484cd6	Change mailer image url (#6279 ) * Change image URL in mailer to full path * Add application_mailer.view_profile localization.	2018-01-17 12:41:24 +01:00
Eugen Rochko	02194838dd	HTML e-mails for NotificationMailer (#6263 ) * HTML e-mails for NotificationMailer (except digest) * Add HTML template for digest * Fix build	2018-01-16 20:20:15 +01:00
SerCom_KC	3323b4173e	Change disclaimer in email according to #5817 (#6266 )	2018-01-16 06:44:57 +01:00
David Yip	89a9d629f7	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: Gemfile.lock	2018-01-15 22:17:48 -06:00
Eugen Rochko	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
Jenkins	0c7dc6c781	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-15 06:17:15 +00:00
Patrick Figel	537d2939b1	Suppress CSRF token warnings (#6240 ) CSRF token checking was enabled for API controllers in #6223, producing "Can't verify CSRF token authenticity" log spam. This disables logging of failed CSRF checks. This also changes the protection strategy for PushSubscriptionsController to use exceptions, making it consistent with other controllers that use sessions.	2018-01-15 06:51:23 +01:00
Jeong Arm	dcc614f869	Add some browsers (#6246 ) Related: #6165	2018-01-15 06:50:29 +01:00
Eugen Rochko	ed867eca9d	Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252 )	2018-01-15 04:34:28 +01:00
Marcin Mikołajczak	ee7217bc94	i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-01-12 23:08:51 +01:00
David Yip	991371af5f	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: db/schema.rb	2018-01-09 14:16:45 -06:00
Eugen Rochko	921b781909	Increase rate limit on protected paths (#6229 ) Previously each protected path had a separate rate limit. Now they're all in the same bucket, so people are more likely to hit one with register->login. Increasing to 25 per 5 minutes should be fine.	2018-01-09 17:07:54 +01:00
Evgeny Petrov	eec6095e02	Russian language update (#6227 ) * Russian language update New strings translated, except "terms" key. Should this be translated? Can it be changed by end user? * Removed double quotes in "terms" -> "title" key	2018-01-09 14:59:19 +01:00
Jenkins	e780d5951b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-09 12:17:16 +00:00
Renato "Lond" Cerqueira	9f04b0d4b1	Weblate translations (#6228 ) * Translated using Weblate (Catalan) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (523 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Dutch) Currently translated at 100.0% (525 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Arabic) Currently translated at 80.3% (45 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 83.9% (47 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Persian) Currently translated at 87.6% (460 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Japanese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Catalan) Currently translated at 99.2% (521 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ * Translated using Weblate (Portuguese) Currently translated at 47.2% (248 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 48.0% (252 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Persian) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Dutch) Currently translated at 100.0% (525 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Japanese) Currently translated at 99.0% (520 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Persian) Currently translated at 90.4% (475 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Polish) Currently translated at 99.8% (524 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Polish) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ * Translated using Weblate (Persian) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Polish) Currently translated at 99.8% (524 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Persian) Currently translated at 99.8% (524 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Portuguese) Currently translated at 48.3% (254 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Portuguese) Currently translated at 56.5% (297 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 59.4% (312 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ * Translated using Weblate (Arabic) Currently translated at 91.0% (51 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Portuguese) Currently translated at 59.6% (313 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Arabic) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.6% (523 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Portuguese) Currently translated at 67.6% (355 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Arabic) Currently translated at 98.2% (55 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Arabic) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Galician) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Arabic) Currently translated at 51.1% (22 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Galician) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/ * Added translation using Weblate (Galician) * Added translation using Weblate (Galician) * Translated using Weblate (Galician) Currently translated at 50.0% (1 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/ * Added translation using Weblate (Galician) * Translated using Weblate (Galician) Currently translated at 24.0% (126 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Added translation using Weblate (Portuguese) * Translated using Weblate (Arabic) Currently translated at 55.2% (290 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Galician) Currently translated at 42.6% (224 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Portuguese) Currently translated at 80.9% (425 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Arabic) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Arabic) Currently translated at 62.7% (27 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Arabic) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/pt/ * Translated using Weblate (Portuguese) Currently translated at 81.3% (427 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Galician) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/ * Translated using Weblate (Galician) Currently translated at 99.8% (524 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Portuguese) Currently translated at 93.7% (492 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 95.4% (501 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (525 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Galician) Currently translated at 99.8% (524 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (525 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Portuguese) Currently translated at 96.0% (504 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Arabic) Currently translated at 69.7% (30 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Portuguese) Currently translated at 97.9% (514 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (523 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations * Add back simple_forms removed by weblate Weblate for some reason removed this files, add back to their previous versions * Remove linebreak on doorkeeper.pt.yml PR review	2018-01-09 20:30:28 +09:00
Jenkins	f839ac694c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 10:17:15 +00:00
Eugen Rochko	dbda87c31f	Revert #5772 (#6221 )	2018-01-08 10:57:52 +01:00
Jenkins	c2e1bfd9ae	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-07 15:17:13 +00:00
SerCom_KC	c4d36d024c	Update Simplified Chinese translations (#6215 ) * i18n: (zh-CN) Add translations of #6125 * i18n: (zh-CN) Add translations of #6132 * i18n: (zh-CN) Add translations of #6099 * i18n: (zh-CN) Add translations of #6071 * i18n: (zh-CN) Improve translations	2018-01-07 17:32:50 +09:00
beatrix-bitrot	b75a1ce326	tighten csp	2018-01-06 18:49:03 +00:00
Jenkins	f6adb409fd	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-05 22:17:12 +00:00
Naoki Kosaka	8d51ce4290	Fix enforce HTTPS in production. (#6180 )	2018-01-05 20:04:22 +01:00
beatrix	f41b33eb01	Merge pull request #243 from m4sk1n/glitch-pl i18n: 🇵🇱	2018-01-05 12:36:53 -05:00
Yamagishi Kazutoshi	9a61b0ef22	Fix RFC 5646 Regular Expression (#6190 )	2018-01-05 04:43:50 +01:00
Jenkins	c69a23ae46	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-04 23:17:11 +00:00
Branko Kokanovic	d872902997	Small translation fixes for Serbian (and sr@Latn too) (#6188 )	2018-01-05 00:16:06 +01:00
Marcin Mikołajczak	c61dd918a2	i18n: Update Polish translation (#6176 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-01-04 23:15:29 +09:00
Marcin Mikołajczak	0f69a90588	i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-01-04 14:42:58 +01:00
muan	89daeb43a8	Improve Traditional Chinese translation (#6166 ) * Improve Traditional Chinese translations * Sort alphabetically	2018-01-04 05:00:50 +01:00
Jenkins	fc884d015a	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-03 20:17:13 +00:00
Quenty31	d907d4352e	l10n OC language (#6169 ) * new strings: hashtag+unlisted, mute, block * Add confirmation step for email changes * Add more instance stats APIs	2018-01-03 21:05:54 +01:00
Akihiko Odaki	161c72d66d	Allow to dereference Follow object for ActivityPub (#5772 ) * Allow to dereference Follow object for ActivityPub * Accept IRI as object representation for Accept activity	2018-01-03 18:08:57 +01:00
Marcin Mikołajczak	53d99ebf4f	i18n: Update Polish translation (#6168 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-01-03 22:45:24 +09:00
Yamagishi Kazutoshi	1001922156	Add Japanese translations #5997 , #6003 , #6004 , #6071 , #6099 , #6125 and #6132 (#6167 ) * yarn manage:translations * Add Japanese translation for #5997 * Add Japanese translation for #6003 * Add Japanese translation for #6004 * Add Japanese translation for #6071 * Add Japanese translation for #6099 * Add Japanese translation for #6125 * Add Japanese translation for #6132	2018-01-03 21:00:39 +09:00
Jenkins	933840bebf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-03 04:17:11 +00:00
Patrick Figel	04ecf44c2f	Add confirmation step for email changes (#6071 ) * Add confirmation step for email changes This adds a confirmation step for email changes of existing users. Like the initial account confirmation, a confirmation link is sent to the new address. Additionally, a notification is sent to the existing address when the change is initiated. This message includes instruction to reset the password immediately or to contact the instance admin if the change was not initiated by the account owner. Fixes #3871 * Add review fixes	2018-01-02 16:55:00 +01:00
Branko Kokanovic	21b9da6418	Adding Serbian latin translations (#6146 ) Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.	2018-01-02 20:39:12 +09:00
Jenkins	fa9b7ece2e	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-31 09:17:15 +00:00
Branko Kokanovic	7d376e41be	Adding Serbian translation (#6133 ) * Adding Serbian translation * i18n-tasks normalize	2017-12-31 17:28:20 +09:00
David Yip	4cca1d1e7e	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/controllers/auth/confirmations_controller.rb	2017-12-30 17:20:07 -06:00
Jeong Arm	f4b80e6511	Translate Korean (#6131 ) Relates to #6125, #6099	2017-12-30 02:44:19 +01:00
Eugen Rochko	38fc1b498d	Add more instance stats APIs (#6125 ) * Add GET /api/v1/instance/peers API to reveal known domains * Add GET /api/v1/instance/activity API * Make new APIs disableable, exclude private statuses from activity stats * Fix code style issue * Fix week timestamps	2017-12-29 19:52:04 +01:00
Jenkins	6d00ca1c71	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-22 04:17:14 +00:00
nightpool	9592b5e31e	enforce LOCAL_HTTPS=true in production (#6061 ) * enforce https in production * note changes in production env sample * typo fix	2017-12-22 02:17:59 +01:00
beatrix	4d34b3495d	Merge pull request #274 from glitch-soc/fix-packs-on-2fa-pages Set packs on 2FA-related pages. Fixes #271.	2017-12-21 08:30:05 -05:00
David Yip	00d1f8eea1	Remove themes.default from i18n-tasks unused check This translation key comes in from tootsuite, but the flavours system does not use it.	2017-12-21 05:24:17 -06:00
David Yip	a1ddc89da6	Remove unused themes.default key in ko locale.	2017-12-20 20:02:50 -06:00
Jenkins	6f11aa8383	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-20 08:17:15 +00:00
Jeong Arm	e52293482e	Update Korean translation (#6050 ) * Update Korean translation * Translate Korean for javascript * Add missing translations on simple_form	2017-12-20 11:45:50 +09:00
Jenkins	e7fa7fce25	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-17 03:17:14 +00:00
Peter	f38e6a14f2	Add Slovak translation (#6052 ) * Add Slovak translation * Slovak translation: i18n-normalize	2017-12-17 11:26:42 +09:00
Jenkins	37254c4f5d	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-15 01:17:12 +00:00
SerCom_KC	573414f728	Improve Chinese (Simplified) Translations (#6024 ) * i18n: (zh-CN) Change `工作人员` (staff) to `管理人员` Suggested by @Gargron at https://github.com/tootsuite/mastodon/pull/6005#discussion_r156678109 * i18n: (zh-CN) Change `协管` to `监察员` * i18n: (zh-CN) Fix all "Are you" questions * i18n: (zh-CN) Various improvements * i18n: (zh-CN) Final clean-up * i18n: (zh-CN) Change translation for 500 * i18n: (zh-CN) Remove spaces between time distances * i18n: (zh-CN) Improve translations	2017-12-14 19:33:29 +01:00
Jeroen	aa273a2718	Last minute Dutch string updates (#6025 ) * Last minute Dutch strinfupdate * Last minute Dutch strings update * Fixing Weblate output errors * Fixing Weblate output errors * Fixing more Weblate rubish Weblate is also changing some " to ' - I think that is not a problem * Fixing more weblate stuff * Fixing * Update nl.yml	2017-12-14 18:45:32 +01:00
Jenkins	82236a3703	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-13 18:17:16 +00:00
Quenty31	72314d26ae	l10n OC and FR updates (#6017 ) * Adjust empty list timeline message (#5997) * Adjust empty list timeline message (#5997) * Add filters to admin UI for custom emojis (#6003) + #6004 * Update fr.yml	2017-12-14 03:17:04 +09:00
Olivier Humbert	ad941f5a21	Update FR translation (#6012 )	2017-12-13 18:00:42 +01:00
Eugen Rochko	fef6625496	Weblate translations (#6011 ) * Translated using Weblate (Dutch) Currently translated at 100.0% (522 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (French) Currently translated at 99.8% (521 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Catalan) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 99.4% (519 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Japanese) Currently translated at 99.4% (519 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Galician) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Japanese) Currently translated at 99.6% (520 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Arabic) Currently translated at 40.0% (209 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Polish) Currently translated at 99.8% (521 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Added translation using Weblate (Galician) * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.0% (517 of 522 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% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Galician) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Added translation using Weblate (Galician) * Translated using Weblate (Galician) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Galician) Currently translated at 22.6% (17 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Portuguese) Currently translated at 66.0% (37 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Japanese) Currently translated at 99.6% (520 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (520 of 522 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% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Arabic) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 48.8% (21 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Arabic) Currently translated at 98.2% (55 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Portuguese) Currently translated at 73.2% (41 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt/ * i18n-tasks normalize && yarn manage:translations * Restore wrongfully deleted files	2017-12-13 16:37:15 +01:00
SerCom_KC	775c3056b6	Update Chinese (Simplified) translations (#6005 ) * i18n: (zh-CN) Remove spaces in time distances * i18n: (zh-CN) Update translations for #5997 * i18n: (zh-CN) Add translation for #6004 also change translation of `staff` from `管理员` to `工作人员` * i18n: (zh-CN) Add translations for #6003 * i18n: (zh-CN) Normalization	2017-12-13 15:52:40 +01:00
Eugen Rochko	ad75ec8b5b	Add filters to admin UI for custom emojis (#6003 )	2017-12-13 13:28:31 +01:00
Yamagishi Kazutoshi	6855baa0c5	Change streaming API URL when remote development (#5942 ) * Change streaming API URL when remote development * Use STREAMING_API_BASE_URL when dev env	2017-12-13 12:43:54 +01:00
Eugen Rochko	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
Eugen Rochko	81923f88ba	Shorten English title for 2FA to avoid line-break (#6001 )	2017-12-13 15:42:22 +09:00
Quenty31	0370ba7b0a	Update: #5985 and #5817 (#5996 )	2017-12-12 20:48:26 +01:00
SerCom_KC	2a61b9f000	Update Chinese (Simplified) translations (#5991 ) * i18n: (zh-CN) Update translations for #5817 * i18n: (zh-CN) Add translation for #5985 * i18n: (zh-CN) Normalization	2017-12-12 15:13:47 +01:00
beatrix	504c3d650f	Merge pull request #264 from KnzkDev/add-ja i18n: Add ja translate	2017-12-12 08:49:19 -05:00
David Yip	be33247235	Remove themes.default from nl and pt-BR locales. This translation has been supplanted by the flavours-related translations.	2017-12-12 03:28:15 -06:00
David Yip	a057ed5cfe	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2017-12-12 02:54:13 -06:00
ncls7615	c0c4526283	add ja for fav conf	2017-12-12 13:05:48 +09:00
Eugen Rochko	30d2ea03b0	Improve public status page title (#5985 )	2017-12-12 03:56:30 +01:00
Eugen Rochko	1356ed72cd	Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983 )	2017-12-12 03:55:39 +01:00
Quenty31	c588fcf4bc	Tiny little change (#5981 )	2017-12-11 20:53:29 +01:00
kibigo!	8aa527434c	Fixed index in webpack config	2017-12-11 10:45:21 -08:00
ncls7615	d8206d1931	add ja	2017-12-12 00:28:33 +09:00
Eugen Rochko	feed07227b	Apply a 25x rate limit by IP even to authenticated requests (#5948 )	2017-12-11 15:32:29 +01:00
kibigo!	dabf66e676	Moved flavour UI into own prefs tab	2017-12-10 20:32:27 -08:00
Sylvhem	84d5bfb35e	Change the disclaimer under the sign up form (#5817 ) * Change the disclaimer below the sign up form Change the disclaimer below the sign up form on the home page. The current text is linking to the /about/more page under "our terms of service" and to the /terms page under "privacy policy". This change intend to make the message more coherent. Change l’avertissement en-dessous du formulaire d’inscription sur la page d’accueil. Le texte actuel redirige vers /about/more sous un lien intitulé "nos conditions d’utilisation" et vers /terms via "notre politique de confidentialité". Ce changement vise à rendre le message plus cohérent. * Second take on the disclaimer A new version of the disclaimer, based on feedback. Une nouvelle version de l’avertissement, basé sur les premiers retours.	2017-12-11 02:30:43 +01:00
cwm	072ab191cc	pulled master, moved locale entry to new location	2017-12-10 15:22:15 -06:00
kibigo!	64b839b769	Removed MORE theme localizns	2017-12-10 11:38:30 -08:00
kibigo!	6b7085a33e	Linting fixes	2017-12-10 11:08:04 -08:00
kibigo!	b28cd6769c	Javascript intl8n flavour support	2017-12-10 11:08:04 -08:00
kibigo!	8394430081	Removed unused theme localization key	2017-12-10 11:08:04 -08:00
kibigo!	d08d0f9f33	Ruby intl8n for themes	2017-12-10 11:08:04 -08:00
goofy-bz	2950de86c6	Update devise.fr.yml (#5963 ) ludicrously tiny but necessary typofix (wrong accent)	2017-12-11 00:24:29 +09:00
Quenty31	7d4ebeecbd	l10n i18n OC: corrections (#5962 ) * filling missing strings * Small changes Better way of saying + removed 2 finals dots * Corrections * Corrections Now with final point or without, just like the EN file * Update oc.json	2017-12-11 00:07:24 +09:00
Yamagishi Kazutoshi	6e3f176b8e	Add Galician language support (#5955 )	2017-12-10 04:19:07 +01:00
ButterflyOfFire	0f8140d26a	Create activerecord.ar.yml (#5951 )	2017-12-09 23:37:18 +01:00
cwm	fbd2a0127c	ran i18n-tasks normalize for simple_form.en.yml	2017-12-09 13:00:07 -06:00
cwm	abe95b614b	add initial components based off of tootsuite pr #1507	2017-12-09 10:26:22 -06:00
Eugen Rochko	a72d03f43c	Weblate translations (#5946 ) * Translated using Weblate (German) Currently translated at 84.2% (439 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (English) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/ * Translated using Weblate (German) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (English) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (French) Currently translated at 84.6% (441 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (German) Currently translated at 86.9% (453 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Korean) Currently translated at 86.3% (450 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (French) Currently translated at 84.8% (442 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 84.8% (442 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 84.8% (442 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese) Currently translated at 36.2% (189 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/he/ * Translated using Weblate (Hebrew) Currently translated at 53.1% (277 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/he/ * Translated using Weblate (Spanish) Currently translated at 75.6% (394 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (French) Currently translated at 86.3% (450 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese) Currently translated at 98.2% (55 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 84.6% (441 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Catalan) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Dutch) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/ * Translated using Weblate (German) Currently translated at 88.2% (460 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Dutch) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 90.2% (470 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (French) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 90.2% (470 of 521 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% (245 of 245 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% (245 of 245 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% (245 of 245 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% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (French) Currently translated at 87.3% (455 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Hebrew) Currently translated at 61.8% (322 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/ * Translated using Weblate (French) Currently translated at 87.3% (455 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 92.3% (481 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (French) Currently translated at 87.3% (455 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 87.5% (456 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 87.7% (457 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Catalan) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Catalan) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Portuguese) Currently translated at 42.4% (221 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 97.3% (73 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ * Translated using Weblate (Catalan) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (German) Currently translated at 90.5% (472 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 90.7% (473 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 90.9% (474 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 91.1% (475 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Dutch) Currently translated at 90.4% (471 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 92.3% (481 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (75 of 75 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% (75 of 75 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% (75 of 75 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% (75 of 75 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% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Dutch) Currently translated at 90.5% (472 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (245 of 245 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% (245 of 245 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% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Arabic) Currently translated at 44.1% (19 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/ * Translated using Weblate (Arabic) Currently translated at 85.7% (48 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 92.0% (69 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Portuguese) Currently translated at 47.7% (249 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Arabic) Currently translated at 29.9% (156 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Spanish) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/es/ * Translated using Weblate (Polish) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (519 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Spanish) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (French) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/ * Translated using Weblate (Spanish) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.2% (517 of 521 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% (245 of 245 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% (245 of 245 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% (245 of 245 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% (245 of 245 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% (245 of 245 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% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Added translation using Weblate (Galician) * Translated using Weblate (Japanese) Currently translated at 99.6% (519 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Japanese) Currently translated at 92.8% (52 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.4% (518 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Japanese) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Galician) Currently translated at 43.6% (107 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Japanese) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/ * Translated using Weblate (Arabic) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.4% (518 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Arabic) Currently translated at 96.4% (54 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 31.2% (163 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Dutch) Currently translated at 91.5% (477 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (French) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Dutch) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Arabic) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Arabic) Currently translated at 98.2% (55 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Dutch) Currently translated at 100.0% (521 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (521 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (French) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Norwegian (old code)) Currently translated at 50.6% (264 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/ * Translated using Weblate (Dutch) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Galician) Currently translated at 64.0% (157 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/no/ * Translated using Weblate (Norwegian (old code)) Currently translated at 97.3% (73 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/no/ * Translated using Weblate (Dutch) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Norwegian (old code)) Currently translated at 96.4% (54 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/no/ * Translated using Weblate (Galician) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (German) Currently translated at 95.2% (496 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 95.2% (496 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * i18n-tasks normalize && yarn manage:translations * Fix things	2017-12-09 15:35:22 +01:00
Naoki Kosaka	4bce376fdc	Missing require 'authorization_decorator'. (#5947 )	2017-12-09 15:12:10 +01:00
Eugen Rochko	a865b62efc	Rate limit by user instead of IP when API user is authenticated (#5923 ) * Fix #668 - Rate limit by user instead of IP when API user is authenticated * Fix code style issue * Use request decorator provided by Doorkeeper	2017-12-09 14:20:02 +01:00
SerCom_KC	84cebad49d	Update Chinese (Simplified) translations (#5937 ) * i18n: (zh-CN) Improve translations for email notifications * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Fix subject * i18n: (zh-CN) Update translations for #5933	2017-12-09 14:19:45 +01:00
Quenty31	3a52c90de1	l10n i18n OC update (#5939 ) * update and corrections * update (invites) * Update oc.yml * Update oc.yml	2017-12-09 14:17:34 +01:00
THE BOSS ♨	17e26f8afe	Fix typo in paperclip.rb (#5936 )	2017-12-09 13:59:59 +09:00
Eugen Rochko	2f4c5f504f	Limit users to 50 lists, remove pagination from lists API (#5933 )	2017-12-09 01:32:29 +01:00
Yamagishi Kazutoshi	b0db4dad79	Revert fog-aws (ref #5604 ) (#5934 )	2017-12-09 00:47:52 +01:00
Jenkins	776867ea73	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-08 13:17:14 +00:00
Eugen Rochko	bca9e2e57a	Weblate translations (#5922 ) * Translated using Weblate (German) Currently translated at 84.2% (439 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (English) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/ * Translated using Weblate (German) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (French) Currently translated at 84.6% (441 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (English) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/ * Translated using Weblate (German) Currently translated at 86.9% (453 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Korean) Currently translated at 86.3% (450 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (French) Currently translated at 84.8% (442 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 84.8% (442 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 84.8% (442 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese) Currently translated at 36.2% (189 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/he/ * Translated using Weblate (Hebrew) Currently translated at 53.1% (277 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/he/ * Translated using Weblate (Spanish) Currently translated at 75.6% (394 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (French) Currently translated at 86.3% (450 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese) Currently translated at 98.2% (55 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 84.6% (441 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Catalan) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Dutch) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/ * Translated using Weblate (German) Currently translated at 88.2% (460 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Dutch) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 90.2% (470 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (French) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 90.2% (470 of 521 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% (245 of 245 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% (245 of 245 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% (245 of 245 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% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (French) Currently translated at 87.3% (455 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Hebrew) Currently translated at 61.8% (322 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/ * Translated using Weblate (French) Currently translated at 87.3% (455 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 92.3% (481 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (French) Currently translated at 87.3% (455 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 87.5% (456 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 87.7% (457 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Catalan) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Catalan) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Portuguese) Currently translated at 42.4% (221 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 97.3% (73 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ * Translated using Weblate (Catalan) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (German) Currently translated at 90.5% (472 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 90.7% (473 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 90.9% (474 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 91.1% (475 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Dutch) Currently translated at 90.4% (471 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 92.3% (481 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (75 of 75 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% (75 of 75 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% (75 of 75 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% (75 of 75 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% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Dutch) Currently translated at 90.5% (472 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (245 of 245 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% (245 of 245 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% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Arabic) Currently translated at 44.1% (19 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/ * Translated using Weblate (Arabic) Currently translated at 85.7% (48 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 92.0% (69 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Portuguese) Currently translated at 47.7% (249 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Arabic) Currently translated at 29.9% (156 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Spanish) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/es/ * Translated using Weblate (Polish) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (519 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Spanish) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (French) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/ * Translated using Weblate (Spanish) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * i18n-tasks normalize * yarn run manage:translations * Restore wrongly removed translations	2017-12-08 01:59:44 +01:00
kibigo!	753535c3c7	Fixed webpack skin folder globbing	2017-12-07 14:33:49 -08:00
SerCom_KC	7fcf15adf3	Improve Chinese (Simplified) translations (#5911 ) * i18n: (zh-CN) Change `管理` (moderation) to `运营` * i18n: (zh-CN) Improve translations	2017-12-07 16:02:52 +01:00
Quenty31	7445f17571	OC language update (#5905 ) * Update * update * Update oc.yml * bundle exec i18n-tasks normalize * Update oc.yml	2017-12-07 15:28:13 +09:00
Jenkins	c63e6c9a2c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-07 00:17:14 +00:00
beatrix	81b0145759	Merge pull request #229 from glitch-soc/glitch-theme Advanced Next-Level Flavours And Skins For Mastodon™	2017-12-06 17:44:07 -05:00
nightpool	9302369aa5	fix weblate for ja (#5906 )	2017-12-07 07:08:22 +09:00
David Yip	f1cbea77a4	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	2017-12-06 15:40:59 -06:00
NCLS	fde91988ab	Update ja.yml	2017-12-07 06:10:15 +09:00
Jenkins	8ca91cef45	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-06 20:17:13 +00:00
Marcin Mikołajczak	a0047fdca0	i18n: 🇵🇱 (#5903 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-12-07 05:04:35 +09:00
Eugen Rochko	42bcbd36b7	Remove rabl dependency (#5894 ) * Remove rabl dependency * Replicate old Oj configuration	2017-12-06 15:04:49 +09:00
SerCom_KC	12cea76634	Update Chinese (Simplified) translations for version 2.1.0rc1 (#5849 ) * i18n: (zh-CN) Add missing translations for multiple PRs. Related PRs: #5838 #5762 #5835 #5837 #5832 #5823 #5814 #5757 * i18n: (zh-CN) Fix translation for #5823 / #5835 * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Change `发送者` to `作者` * i18n: (zh-CN) Add missing translations for #5862 * i18n: (zh-CN) Add missing translation for #5874 * i18n: (zh-CN) Improve translations for keyboard shortcuts	2017-12-06 00:46:04 +09:00
kibigo!	5bed0f10ed	Various fixes	2017-12-04 21:58:10 -08:00
David Yip	d9800a5647	Merge branch 'gs-master' into glitch-theme	2017-12-04 11:07:01 -06:00
kibigo!	1c74ede69e	Fixed a name + localizations	2017-12-04 00:19:39 -08:00
kibigo!	bc4fa6b198	Rename themes -> flavours ? ?	2017-12-03 23:26:40 -08:00
Jenkins	933eafdcd3	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-02 14:17:11 +00:00
mayaeh	51f2eca887	Add Japanese translations for invite filter. (#5869 )	2017-12-02 15:09:56 +01:00
Marcin Mikołajczak	b15482ce71	i18n: 🇵🇱 (#5865 )	2017-12-02 03:19:30 +09:00
Yamagishi Kazutoshi	74320971e2	Add invite filter (#5862 )	2017-12-01 16:40:02 +01:00
kibigo!	541fe9b110	Skins support	2017-11-30 19:29:47 -08:00
Jenkins	d020ed1e05	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-29 22:17:13 +00:00
Marcin Mikołajczak	82ab9736d5	i18n: 🇵🇱 (#5851 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-29 20:51:24 +09:00
mayaeh	a62039df27	Update Japanese translations. (#5844 )	2017-11-29 15:41:21 +09:00
David Yip	3614912be2	Normalize pl translation.	2017-11-28 12:17:36 -06:00
David Yip	95c270f5b1	Merge remote-tracking branch 'origin/master' into gs-master	2017-11-28 11:45:13 -06:00
Yamagishi Kazutoshi	15fab79cfa	Show "expired" in invite index (#5838 ) * Show "expired" in invite index * "Force expire" -> "Deactivate"	2017-11-28 15:41:02 +01:00
nullkal	1b57d4dd3a	Fix account migration feature (#5837 ) * Make removable account migration * Fix error during update of account migration setting * Add notice when update account migration setting	2017-11-28 14:31:23 +01:00
Marcin Mikołajczak	d937a59997	i18n: 🇵🇱 (#5841 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-28 19:30:18 +09:00
David Yip	7463d80ff4	Merge remote-tracking branch 'tootsuite/master'	2017-11-27 22:33:26 -06:00
David Yip	8bad6bdd00	Normalize config/locales/en.yml.	2017-11-27 22:32:31 -06:00
Eugen Rochko	706e534455	Add UI for setting up account migration (#5832 )	2017-11-27 22:47:06 +01:00
Jenkins	63d47e04c4	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-27 20:17:12 +00:00
mayaeh	c6b7c77229	i18n: Update ja translation for consumable invites. (#5829 ) * Add Japanese translation for consumable invites. * Add Japanese translation. * Update Japanese translation.	2017-11-27 20:23:14 +01:00
David Yip	e77c3996a5	Merge remote-tracking branch 'origin/master' into gs-master	2017-11-27 11:29:04 -06:00
Eugen Rochko	740f8a95a9	Add consumable invites (#5814 ) * Add consumable invites * Add UI for generating invite codes * Add tests * Display max uses and expiration in invites table, delete invite * Remove unused column and redundant validator - Default follows not used, probably bad idea - InviteCodeValidator is redundant because RegistrationsController checks invite code validity * Add admin setting to disable invites * Add admin UI for invites, configurable role for invite creation - Admin UI that lists everyone's invites, always available - Admin setting min_invite_role to control who can invite people - Non-admin invite UI only visible if users are allowed to * Do not remove invites from database, expire them instantly	2017-11-27 16:07:59 +01:00
Jenkins	5de42665d7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-27 05:17:11 +00:00
spla	d07983b56d	Updated Catalan strings (#5801 ) * Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml	2017-11-25 23:22:59 +09:00
Jenkins	86f4f8e158	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-25 05:17:15 +00:00
Yamagishi Kazutoshi	662b8eefe8	Change navigation link for moderators (#5812 )	2017-11-25 05:53:54 +01:00
mayaeh	7a45d382ea	i18n: Update ja translations (#5804 ) * Add Japanese translations. * Update Japanese translations. * Fix japanese translation.	2017-11-24 13:14:31 +01:00
Jenkins	167fe2ab08	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-24 01:17:20 +00:00
Eugen Rochko	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
Jenkins	41c71565c2	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-23 02:17:12 +00:00
SerCom_KC	bc4a726c24	i18n: (zh-CN) Add translations for #5746 & #5735 (#5764 )	2017-11-23 02:49:21 +01:00
kibigo!	8812bab687	Minor fixes	2017-11-21 18:17:38 -08:00
Jenkins	2a5af9c10c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-21 17:17:11 +00:00
mayaeh	fc2155019b	Add Japanese translations. (#5769 )	2017-11-21 17:11:33 +01:00
Marcin Mikołajczak	1a07b83c69	i18n: Update Polish translation - back-end (#230 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-21 16:36:22 +01:00
Joan Montané	53b7b81b43	Update and fix Catalan translation (#5773 ) * Update activerecord.ca.yml * Update ca.yml * Update devise.ca.yml * Update doorkeeper.ca.yml * Update simple_form.ca.yml * fix syntax error for ca translation * fix syntax errors in ca translations Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-21 23:17:28 +09:00
kibigo!	bdbbd06dad	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
David Yip	d083f7741a	Merge remote-tracking branch 'tootsuite/master'	2017-11-19 01:30:29 -06:00
mayaeh	08deec4c84	i18n: Update ja translation for moderator badge. (#5731 ) * Update Japanese translation for moderator badge. * Follows English notation	2017-11-19 04:16:56 +01:00
Lynx Kotoura	3d1d3d9a20	Remove translations of default theme (#5741 )	2017-11-19 04:15:50 +01:00
Yamagishi Kazutoshi	bfdcf76a64	Add “staff” badge to admin user pages (#5735 ) * Allow staff badge to change from setting to hidden * i18n: Update Polish translation	2017-11-19 04:13:57 +01:00
beatrix	bcda3f85ce	Merge pull request #226 from glitch-soc/glitch-theme Glitch/Vanilla themes	2017-11-18 20:32:17 -05:00
Marcin Mikołajczak	b380e9d2cb	i18n: Update Polish translation (#5749 )	2017-11-18 21:43:10 +01:00
Eugen Rochko	58cede4808	Profile redirect notes (#5746 ) * Serialize moved accounts into REST and ActivityPub APIs * Parse federated moved accounts from ActivityPub * Add note about moved accounts to public profiles * Add moved account message to web UI * Fix code style issues	2017-11-18 19:39:02 +01:00
Jenkins	eed50514be	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-18 06:17:14 +00:00
SerCom_KC	6be72a3ec6	Updating Chinese (Simplified) translations (#5725 ) * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Change `静音` to `隐藏` * i18n: (zh-CN) Add translations for #5087 & #5669 * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translation for #5728	2017-11-18 14:35:11 +09:00
kibigo!	a618df7998	Sets default theme to glitch	2017-11-17 19:32:04 -08:00
David Yip	1ab12ba38e	Merge remote-tracking branch 'origin/master' into merge-upstream	2017-11-17 17:40:00 -06:00
Eugen Rochko	24cafd73a2	Lists (#5703 ) * Add structure for lists * Add list timeline streaming API * Add list APIs, bind list-account relation to follow relation * Add API for adding/removing accounts from lists * Add pagination to lists API * Add pagination to list accounts API * Adjust scopes for new APIs - Creating and modifying lists merely requires "write" scope - Fetching information about lists merely requires "read" scope * Add test for wrong user context on list timeline * Clean up tests	2017-11-18 00:16:48 +01:00
kibigo!	585758a373	Themed prefetching	2017-11-16 21:37:08 -08:00
David Yip	b28b405b97	Merge remote-tracking branch 'origin/master' into gs-master	2017-11-16 22:52:37 -06:00
Yamagishi Kazutoshi	dc6e031364	Redirect to reports when moderator (#5733 )	2017-11-17 03:26:34 +01:00
Eugen Rochko	2151fd3150	Display moderator badge (green), admin badge changed to red (#5728 )	2017-11-17 01:22:38 +01:00
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at `3023725936`	2017-11-16 01:21:16 -06:00
mayaeh	f6bc6399e2	Add Japanese translation for DM block option. (#5704 )	2017-11-15 03:57:09 +01:00
Eugen Rochko	546257bc7f	Allow specifying STATSD_NAMESPACE (#5700 )	2017-11-15 07:22:43 +09:00
Eugen Rochko	fbef909c2a	Add option to block direct messages from people you don't follow (#5669 ) * Add option to block direct messages from people you don't follow Fix #5326 * If the DM responds to a toot by recipient, allow it through * i18n: Update Polish translation (for #5669) (#5673)	2017-11-14 21:12:57 +01:00
SerCom_KC	c3ec1e87b8	Updating Chinese (Simplified) translations (#5643 ) * i18n: (zh-CN) Bug fix for note-counter. * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add support.array key for better wording * Revert "i18n: (zh-CN) Add support.array key for better wording" This reverts commit 27bf9a946e886213e827cd985d4f62419db57534. Looks like this commit can't get pass the checks, revert it for now. * i18n: (zh-CN) Change `客户端` to `应用` * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations (#5635) * i18n: (zh-CN) Change `两步验证` to `双重认证` * i18n: (zh-CN) Improve translations	2017-11-14 20:44:42 +01:00
Marcin Mikołajczak	8087aa83d4	i18n: Update Polish translation (#5699 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-14 20:36:11 +01:00
mayaeh	249b0fe107	Add Japanese translations for moderator roles and its own admin actions. (#5689 )	2017-11-14 15:53:14 +09:00
Marcin Mikołajczak	a6682a3000	i18n: fix typo in Polish translation (#5688 )	2017-11-14 15:52:32 +09:00
Anna e só	0e6c4cb796	l10n: PT-BR translation updated (#5681 ) * Improved e-mail messages; delted repeated words * pt-BR.json translations updated * Revert "pt-BR.json translations updated" This reverts commit 108c460531196fed6e6d14f93e8d8d047c835ffd. * Updated pt-BR.json * pt-BR.yml updated	2017-11-14 11:07:38 +09:00
KEINOS	252d0fe020	Fix #5652 - Notify too short when abbrev in JA (#5664 ) * Fix #5652 - Notify too short when abbrev in JA Fix #5652 of the notification message to be understandable when abbreviated. * Changed quotes as original Double quote to single and single quote as none. But I am not convinced of this fix. * Added a single quote as YAMLlint's suggestion * `bundle exec i18n-tasks normalize`	2017-11-12 16:51:47 +09:00
Marcin Mikołajczak	fcb9533549	i18n: Update Polish translation (for #5635 ) (#5661 ) * i18n: Update Polish translation (for #5635) * 😑🔫	2017-11-11 22:31:20 +01:00
Eugen Rochko	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
Matt	e5aa4128f6	Update en.yml (#5648 ) Changed "Toots with replies" to read "Toots and replies"	2017-11-10 02:58:33 +01:00
Marcin Mikołajczak	cfd7b7a0b7	i18n: Update Polish translation (#5639 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-09 14:23:06 +01:00
nullkal	36376b5e23	Translate ja (#5637 )	2017-11-09 14:22:55 +01:00
Quenty31	eb97bd8af6	i10n OC: Memorial (#5615 ) + #5467 (#5623 ) * Changed ĩ => ï * Changed ĩ => ï * Add ability to disable login and mark accounts as memorial (#5615)	2017-11-08 15:19:49 +01:00
Eugen Rochko	1032f3994f	Add ability to disable login and mark accounts as memorial (#5615 ) Fix #5597	2017-11-07 19:06:44 +01:00
MitarashiDango	cbbeec05be	Fix spell miss (SWIIFT_OBJECT_URL -> SWIFT_OBJECT_URL) (#5617 )	2017-11-07 19:06:30 +01:00
nullkal	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
Yamagishi Kazutoshi	47b0c61853	Unify file upload to using fog (#5604 )	2017-11-07 14:30:31 +01:00
Marcin Mikołajczak	d48779cf7b	i18n: Improve Polish translation (#5596 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-06 07:06:54 +09:00
Yamagishi Kazutoshi	8a588145d5	Update extract-text-webpack-plugin to version 3.0.2 (#5584 )	2017-11-05 13:07:59 +01:00
beatrix	254b74c71f	add memorial to production.rb in memory of Natalie Nguyen let her name ring through the ether	2017-11-03 12:34:50 -04:00
Quenty31	da3adc0a73	l10n Occitan (#5586 ) * Update OC: time format Correction for time format according to: https://opinion.jornalet.com/conselh-linguistic-de-jornalet/blog/2379/la-notacion-oraria-en-occitan Harmonisation words in menu and confirmation windows * Update for unlisted custum emoji + #5577 * correction subjonctiu It's either siasque or siague * Corrections Any : qual que, in two words, else it means "some". And "siasque" with S even if I don't pronounce it at all. * Update oc.json	2017-11-03 17:42:30 +09:00
MitarashiDango	38d072446b	add account search condition (instance domain) (#5577 )	2017-11-01 14:46:05 +01:00
Yamagishi Kazutoshi	8ae9bd0eea	Upgrade compression-webpack-plugin to version 1.0.1 (#5581 )	2017-11-01 14:42:19 +01:00
Nolan Lawson	0692991b54	Add ServiceWorker caching for static assets (#5524 )	2017-10-31 12:25:51 +01:00
Yamagishi Kazutoshi	a2a4bf4e78	Update dependencies for Ruby (2017-10-30) (#5566 ) * Update better_errors to version 2.4.0 * Update binding_of_caller to version 0.7.3 * Update bootsnap to version 1.1.5 * Update browser to version 2.5.2 * Update capistrano to version 3.10.0 * Update capistrano-bundler to version 1.3.0 * Update capistrano-rbenv to version 2.1.2 * Update capybara to version 2.15.4 * Update cld3 to version 3.2.1 * Update fabrication to version 2.18.0 * Update fog-openstack to version 0.1.22 * Update kaminari to version 1.1.1 * Update lograge to version 0.7.1 * Update nokogiri to version 1.8.1 * Update oj to version 3.3.9 * Update ox to version 2.8.1 * Update parallel_tests to version 2.17.0 * Update pkg-config to version 1.2.8 * Update rspec-rails to version 3.7.1 * Update rubocop to version 0.51.0 * Update scss_lint to version 0.55.0 * Update sidekiq to version 5.0.5 * Update sidekiq-scheduler to version 2.1.10 * Update tzinfo-data to version 1.2017.3 * Update webpacker to version 3.0.2 * bundle update	2017-10-31 12:22:32 +01:00
SerCom_KC	29609fbb6a	Updating Chinese (Simplified) translations (#5508 ) * i18n: (zh-CN) fix punctuations and spaces Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines * i18n: (zh-CN) fix punctuation * i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677 * i18n: (zh-CN) Update missing translations * i18n: (zh-CN) Fixing errors * i18n: (zh-CN) Fix indent error * i18n: (zh-CN) Fix language tag * i18n: (zh-CN) Remove quotes * i18n: (zh-CN) Update translation (#5485) * i18n: (zh-CN) Remove whitespaces, x -> × * i18n: (zh-CN) Rewording on time distance * i18n: (zh-CN) Overall improvements * i18n: (zh-CN) i18n-tasks normalization * i18n: (zh-CN) Add missing translation	2017-10-30 12:34:58 +09:00
Alda Marteau-Hardi	4080569c2d	Fix a grammatical error in the notifications. (#5555 )	2017-10-29 02:08:37 +09:00
Marcin Mikołajczak	2cbb8e8cd1	i18n: Update Polish translation (#5547 )	2017-10-28 12:43:20 +09:00
Akihiko Odaki	e4080772b5	Use contenthash for ExtractTextWebpackPlugin (#5462 ) [hash] is not documented.	2017-10-27 23:54:20 +09:00
David Yip	870d71b78b	Merge branch 'master' into gs-master	2017-10-27 09:45:25 -05:00
nullkal	781105293c	Feature: Unlisted custom emojis (#5485 )	2017-10-27 16:11:30 +02:00
beatrix	a2612d0d38	Merge pull request #179 from glitch-soc/keyword-mute Keyword muting	2017-10-25 17:37:48 -04:00
David Yip	42f2045c21	Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline	2017-10-25 16:01:20 -05:00
Jenkins	5f0268ab84	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-10-25 16:17:14 +00:00
Ratmir Karabut	20fee786b1	Update Russian translation (#5517 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation * Update Russian translation * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line * Update Russian translation (sessions) * Update Russian translation * Update Russian translation * Fix merge conflicts (revert) * Update Russian translation * Update Russian translation (fix) * Update Russian translation (fix quotes) * Update Russian translation (fix quotes) * Update Russian translation (fix) * Update Russian translation * Add quotes * bundle exec i18n-tasks normalize	2017-10-26 00:21:58 +09:00
Anna e só	74777599cf	l10n: PT-BR translation updated (#5530 )	2017-10-25 23:11:03 +09:00
Matthew Walsh	3db80f75a6	Added a timeline for Direct statuses * Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL	2017-10-22 18:35:14 -07:00
David Yip	1a60445a5f	Address unused translation errors.	2017-10-22 01:05:56 -05:00
David Yip	cd04e3df58	Fill in create, edit, update, and destroy for keyword mutes interface. Also add a destroy-all action, which can be useful if you're flushing an old list entirely to start a new one.	2017-10-21 14:54:36 -05:00
David Yip	2e03a10059	Spike out index and new views for keyword mutes controller.	2017-10-21 14:54:36 -05:00
David Yip	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
David Yip	42e8c8eb0e	Merge tag 'v2.0.0' into gs-master	2017-10-18 11:52:04 -05:00
Håkan Eriksson	c710069c12	Some typos and supplementation in sentence structures (#5441 ) * 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 * Swedish - Typos and supplementation in sentence structure * Update simple_form.sv.yml * Update sv.yml * Update sv.yml Rearranged the alphabetical order.	2017-10-18 13:50:52 +02:00
Jeroen	363d0d3a44	Dutch: A few strings I found last minute (#5440 ) * Dutch: A few strings I found last minute * Update simple_form.nl.yml	2017-10-17 23:15:40 +02:00
JeanGauthier	33ea042dec	i18n better wording (OC/CA/FR) + string added in FR (#5438 ) * Update oc.json * Update fr.json * Update ca.json * Update fr.json * Update simple_form.fr.yml * Update ca.json * Update fr.json * Update oc.json * Update oc.json * Update fr.json	2017-10-17 21:49:39 +02:00
Jakob Kramer	e6c9756fa9	Update German translation (#5425 )	2017-10-17 12:02:47 +02:00
Yamagishi Kazutoshi	5050719fac	Add Japanese translations (#5427 ) * yarn manage:translations * Add Japanese translation for #5410 * Add Japanese translation for #5393	2017-10-17 11:47:05 +02:00
Yamagishi Kazutoshi	989553c69a	Normalize locale files (#5429 )	2017-10-17 11:45:59 +02:00
masarakki	0e0c6b1b4b	use-DB_NAME-in-development (#5430 )	2017-10-17 11:45:37 +02:00
Håkan Eriksson	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
Jeroen	df1a9c5ab5	Small update Dutch (nl) strings (#5424 ) * Update Dutch strings * Update Dutch	2017-10-17 01:00:23 +02:00
David Yip	dbb1fce94d	Merge remote-tracking branch 'upstream/master' into gs-master	2017-10-16 09:23:59 -05:00
Marcin Mikołajczak	3c530d95f6	i18n: Update Polish translation (#5416 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-10-16 14:09:51 +02:00
JeanGauthier	1e7b3bf625	i18n ultim hour «More» dropdown title + reduce motion (#5415 ) * Correction fem. form * More dropdown title * More dropdown title * More dropdown title * Add option to reduce motion (#5393)	2017-10-16 14:09:26 +02:00
Nolan Lawson	fa0be3f834	Add option to reduce motion (#5393 ) * Add option to reduce motion * Use HOC to wrap all Motion calls * fix case-sensitive issue * Avoid updating too frequently * Get rid of unnecessary change to _simple_status.html.haml	2017-10-16 09:36:15 +02:00
David Yip	6cd5b3bbe5	Merge remote-tracking branch 'origin/master' into gs-master	2017-10-16 01:29:02 -05:00
voidSatisfaction	3e2f793948	Add up-to-date korean translation on serverside (#5400 ) * chore: add korean translation on ko.yml * feat: add simple form korean translation up-to-date	2017-10-15 23:08:30 +02:00
JeanGauthier	8eb7d30a6c	l10n Occitan: finishing touches (#5404 ) * Update oc.json * Update oc.yml	2017-10-15 23:07:32 +02:00
Yannick A	7fe1428cc4	Update French translation (#5401 )	2017-10-15 21:21:05 +09:00
spla	f63a40e7c2	Updated Catalan strings (#5323 ) * 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 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Update ca.json Removed : <<<<<<< HEAD "getting_started.support": "{faq} • {userguide} • {apps}", ======= >>>>>>> upstream/master * Syncing to master * Added new Catalan strings * removed config.secret_key line * Corrected <sotrong> tag to <strong> Line 515 * Removed extra line * Reverted * yarn.lock reverted * Updated Catalan strings * Updated Catalan strings	2017-10-14 14:40:35 +02:00
Yannick A	c6f76db2e1	Update French translation (#5384 ) Update French translation	2017-10-14 14:30:19 +02:00
Masoud Abkenar	2c704ca9c6	l10n: update Persian translation for 2.0 (#5391 )	2017-10-14 14:28:19 +02:00
Mathias B	c1a2707ecf	Correct some misspellings (#5381 ) * Correct some misspellings Remove some english language and put the proper french words in place. * Forgot some shit Buurps'	2017-10-14 03:34:59 +02:00
Anna e só	ad917cda10	l10n: PT-BR translation updated (#5362 ) * PT-BR translation updated * Testing * Indentation error fixed * More indentation errors fixed	2017-10-13 06:16:43 +09:00
Jeroen	f398ad1994	Updating more Dutch strings for 2.0 (#5359 )	2017-10-12 21:33:37 +02:00
Alda Marteau-Hardi	3cfcc7a50e	Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350 )	2017-10-12 16:31:14 +02:00
JohnD28	691e9112f3	Update fr.yml (#5330 ) * Update fr.yml Update of french translation and reformatting Privacy Policy for better maintenance. * Update fr.yml * Update fr.yml * Update fr.yml Corrections suivant les remarques d'Alda. * Update fr.yml * Update fr.yml * Update fr.yml * Update fr.yml * Update fr.yml I have replaced my proposals with those accepted here to reduce the conflict. https://github.com/tootsuite/mastodon/pull/5340 J'ai remplacé mes propositions par celles acceptées ici pour réduire le conflit. Comment dois-je faire à l'avenir pour éviter ce genre de situations ? * Update fr.yml Conflict reduction.	2017-10-12 15:25:34 +02:00
David Yip	13e05fece2	Merge tag 'v2.0.0rc2' into gs-master	2017-10-12 04:22:59 -05:00
Marcin Mikołajczak	9d84b6e606	i18n: Update Polish translation (#5346 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-10-12 16:56:03 +09:00
JeanGauthier	bf0f7e8846	Moderation notes (#5344 )	2017-10-12 15:28:15 +09:00
nullkal	4817744b87	Update ja.yml (#5342 ) * Update ja.yml * Update simple_form.ja.yml	2017-10-12 12:18:13 +09:00
Sylvhem	3ebe03b729	Fixes and updates for the French translation (#5340 ) * Ajout du support des thèmes multiples Ajoute des traductions pour les nouvelles chaînes permettant le support de thèmes multiples. Add translations for the new strings allowing support for multiple themes. * Mise à jour de la traduction Met à jour les chaînes modifiées et ajoute des traductions pour celle n’en ayant pas. Update modified strings and add new translations for the ones who are missing them. * Remplace « ' » par « ’ » Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019). En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux. Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019). In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both.	2017-10-12 00:58:01 +02:00
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	2017-10-11 10:43:10 -07:00
JohnD28	fe6941e28e	Update doorkeeper.fr.yml (#5317 )	2017-10-11 22:04:36 +09:00
Nolan Lawson	bebaa6eced	Remove prop types from external libraries (#5304 )	2017-10-10 18:44:51 +02:00
Jakob Kramer	616f53eea8	Update German translation (#5302 )	2017-10-10 23:12:18 +09:00
Jeong Arm	9d97054fe6	Remove timestamps on any option (#5282 )	2017-10-09 17:52:02 +02:00
unarist	7fd66cf2fe	Fix migration failure due to StrongMigrations on production env (#5283 )	2017-10-09 10:05:35 +02:00
Eugen Rochko	0717d9b3e6	Set snowflake IDs for backdated statuses (#5260 ) - Rename Mastodon::TimestampIds into Mastodon::Snowflake for clarity - Skip for statuses coming from inbox, aka delivered in real-time - Skip for statuses that claim to be from the future	2017-10-08 17:34:34 +02:00
m4sk1n	f0c939c431	i18n: Update Polish translation (#5270 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-10-08 16:00:55 +09:00
Jeong Arm	ebadfe0ab7	Translate some Esperanto (#5252 ) * Translate some Esperanto * More translation * More Esperanto translation * Esperanto translation * Fix mistaken format	2017-10-08 14:30:14 +09:00
JeanGauthier	94f15338c3	i18n update Occitan (#5263 ) * Update oc.json * Update oc.yml * Update oc.yml * Update oc.json	2017-10-08 14:18:27 +09:00
Nolan Lawson	7de6d269d2	Use ES module build of react-router-dom (#5264 )	2017-10-08 02:55:58 +02:00
DJ Sundog	96ba3482b9	adding support for audio uploads, transcoded to mp4 videos	2017-10-07 19:54:10 +00:00
nullkal	633426b261	Add moderation note (#5240 ) * Add moderation note * Add frozen_string_literal * Make rspec pass	2017-10-07 20:26:43 +02:00
Eugen Rochko	f486ef2666	Redesign public hashtag pages (#5237 )	2017-10-07 20:00:35 +02:00
Eugen Rochko	3a3475450e	Encode custom emojis as resolveable objects in ActivityPub (#5243 ) * Encode custom emojis as resolveable objects in ActivityPub * Improve code style	2017-10-07 17:43:42 +02:00
Jeong Arm	0e0a9e716c	Korean translation (#5244 ) * [i18n] Korean translation Add missing Korean translations. [skip ci] * start ci	2017-10-07 14:16:59 +09:00
m4sk1n	4413d81d7f	i18n: Update Polish translation (#5255 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-10-06 22:43:32 +02:00
Eugen Rochko	eb5ac23434	Clean up code style of Mastodon::TimestampId module (#5232 ) * Clean up code style of Mastodon::TimestampId module * Update brakeman config	2017-10-06 03:42:21 +02:00
Eugen Rochko	49cc0eb3e7	Improve admin UI for custom emojis, add copy/disable/enable (#5231 )	2017-10-05 23:42:05 +02:00
Lynx Kotoura	32e8a87830	adjust public profile pages 2 (#5223 )	2017-10-04 22:49:36 +02:00
Jakob Kramer	636acb5712	Update German translation (#5221 )	2017-10-04 20:03:41 +02:00
utam0k	b3af3f9f8c	Implement EmailBlackList (#5109 ) * Implement BlacklistedEmailDomain * Use Faker::Internet.domain_name * Remove note column * Add frozen_string_literal comment * Delete unnecessary codes * Sort alphabetically * Change of wording * Rename BlacklistedEmailDomain to EmailDomainBlock	2017-10-04 15:16:10 +02:00
Yamagishi Kazutoshi	178f718a9b	Separate notifications preferences from general preferences (#4447 ) * Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications	2017-10-04 10:22:52 +02:00
aschmitz	2076c557c9	Configure webpack to poll for changes in development (#5040 ) * Configure webpack to poll for changes in development Vagrant on Linux/macOS hosts shared files via NFS, which doens't support inotify-based watching of files. This tweak makes webpack check for changes every second, and rebuild if necessary. This removes the need to restart Foreman every time a frontend file changes. Note that rebuilding is still a relatively lengthy process. The polling frequency can be changed to taste. * Only poll in Vagrant This tests for the presence of the VAGRANT environment variable to determine whether or not we're in Vagrant. It is set in .env.vagrant, which is set up to be included in the Vagrantfile.	2017-10-04 09:52:11 +02:00
Yamagishi Kazutoshi	eb6ec3d068	Add missing Japanese translations (#5193 ) * yarn manage:translations * Add Japanese translations for #5170 * Add Japanese translations for #5123 * Add Japanese translations for #5046 * Add Japanese translations for #5099 * Add Japanese translations for #5161 * "項目" -> "絵文字"	2017-10-03 13:10:26 +02:00
Jakob Kramer	395a57d03d	Update German translation (#5189 )	2017-10-03 09:53:18 +09:00
m4sk1n	a767ef85fa	i18n: Update translation files and Polish translation (#5180 ) * Update translation files Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-10-02 23:38:40 +02:00
Jeong Arm	c30e492587	Korean translation (#5185 ) * Add missing Korean translations * Add Korean email confirmation template * Fix Korean typo	2017-10-02 23:26:28 +02:00
JeanGauthier	04fa4eb7f9	l10n Update OC: reorganization pref. page (#5168 )	2017-10-01 19:09:45 +02:00
Eugen Rochko	0b3f1ec62a	Reorganize preferences page (#5161 )	2017-10-01 10:52:39 +02:00
Eugen Rochko	eb605141ff	Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112 )	2017-09-30 22:05:42 +02:00
roikale	1df453aff6	Change wording on landing page. (#4805 ) "Ilmainen" means "gratis", but Mastodon is free as in freedom, libre – "vapaa". https://fi.wikipedia.org/wiki/Vapaa_ohjelmisto	2017-09-30 16:25:14 +02:00
Nishi, Keisuke	83ffc4dc07	Fix Paperclip::Fog always responds Not Found in OpenStack-v2 like ConoHa (#5155 )	2017-09-30 14:28:29 +02:00
Jakob Kramer	1a72813b53	Updated German translation (#5151 ) Translate "about" page, several settings pages, data export/import, sessions overview, authorized followers page, account deletion page. More consistent use of words: - A toot is a Beitrag. - An account is a Konto. Some small improvements.	2017-09-29 21:11:28 +02:00
Yanaken	c3f9c74719	Better Japanese translations (#5142 )	2017-09-29 13:27:31 +09:00
Eugen Rochko	35a8cafa35	Replace self-rolled statsd instrumention with localshred/nsa (#5118 )	2017-09-29 03:16:44 +02:00
Jakob Kramer	d0b4709b2a	Update German translation (#5133 ) Create activerecord.de.yml (50%) Update devise.de.yml Update doorkeeper.de.yml (100%) Update simple_form.de.yml (100%)	2017-09-28 20:45:09 +02:00
JeanGauthier	3406e30526	OC 500 error (#5110 )	2017-09-28 20:22:34 +02:00
Eugen Rochko	4ec1771165	Add ability to specify alternative text for media attachments (#5123 ) * Fix #117 - Add ability to specify alternative text for media attachments - POST /api/v1/media accepts `description` straight away - PUT /api/v1/media/:id to update `description` (only for unattached ones) - Serialized as `name` of Document object in ActivityPub - Uploads form adjusted for better performance and description input * Add tests * Change undo button blend mode to difference	2017-09-28 15:31:31 +02:00
Ondřej Hruška	daad07b1d5	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	2017-09-28 09:20:59 +02:00
Ondřej Hruška	83bda6c1a8	Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream	2017-09-28 09:18:35 +02:00
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	2017-09-28 09:12:17 +02:00
Eugen Rochko	db3ed498b0	When OAuth password verification fails, return 401 instead of redirect (#5111 ) Call to warden.authenticate! in resource_owner_from_credentials would make the request redirect to sign-in path, which is a bad response for apps. Now bad credentials just return nil, which leads to HTTP 401 from Doorkeeper. Also, accounts with enabled 2FA cannot be logged into this way.	2017-09-27 23:42:49 +02:00
Yamagishi Kazutoshi	901fc48aae	Upgrade Webpacker to version 3.0.1 (#5122 )	2017-09-27 14:41:54 +02:00
m4sk1n	9d53a38a44	i18n: Update Polish translation (#5106 ) * i18n: Update Polish translation * i18n: Update Polish translation	2017-09-26 14:19:25 +09:00
kibigo!	f7ca205f38	Fixed webpack config code	2017-09-25 19:35:54 -07:00
kibigo!	86e617a839	Better themeing support!!	2017-09-25 19:24:32 -07:00
Eugen Rochko	e528114c53	Follow-up to #4582 and #5027 , removing dead code (#5101 )	2017-09-26 01:06:27 +02:00
Eugen Rochko	3b60832214	New error page graphic. Other error page improvements (#5099 ) - 500.html generated with admin-set default locale if set - Error page `<title>` includes Mastodon site title - 500 title changed to "This page is not correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>) - 500 content appended with "on our end" to make clear it's not user's fault	2017-09-25 23:05:54 +02:00
Eugen Rochko	2c8e3fbbfb	Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067 )	2017-09-25 04:04:04 +02:00
Eugen Rochko	b982d549f4	Add strong_migrations gem to warn when creating unsafe migrations (#5078 )	2017-09-25 02:11:14 +02:00
Eugen Rochko	293972f716	New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051 )	2017-09-23 01:57:23 +02:00
Lynx Kotoura	8fcfcddc8f	Fix theme translations alphabetically (#5031 )	2017-09-20 19:41:35 +02:00
Eugen Rochko	d68df88d4e	Disable private status federation over OStatus (#5027 )	2017-09-20 19:08:20 +02:00
Lynx Kotoura	f41e70ca38	Better Japanese translations (#5030 )	2017-09-21 01:56:28 +09:00
mayaeh	7b8ecde32d	Add Japanese translations for multiple themes, custom emoji (#5026 ) * Add Japanese translations for multiple themes * Change Japanese translation for custom emoji's created_msg.	2017-09-20 16:09:57 +02:00
JeanGauthier	1607bb445a	l10n Occitan: theme site, custom emoji, Oauth, newcomers follow admins, ... (#5023 ) * Oauto code string * Theme, custom emoji and more * Site theme * added two spaces wierdly gone away * Update oc.yml Changes adviced	2017-09-20 15:00:54 +02:00
mayaeh	33c39784e4	Add japanese translations for custom emoji. (#5007 ) * Add japanese translations for custom emoji. * Remove spaces. * Change destroyed_msg. * Revert "Change destroyed_msg."	2017-09-20 14:57:59 +02:00
m4sk1n	1de6c52545	i18n: Update Polish translation (#5015 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-09-19 23:25:17 +02:00
Andrew	0401a24558	Add support for multiple themes (#4959 ) * Add support for selecting a theme * Fix codeclimate issues * Look up site default style if current user is not available due to e.g. not being logged in * Remove outdated comment in common.js * Address requested changes in themes PR * Fix codeclimate issues * Explicitly check current_account in application controller and only check theme availability if non-nil * codeclimate * explicit precedence with && * Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml * codeclimate: indentation + return	2017-09-19 16:36:23 +02:00
Eugen Rochko	09a94b575e	Admin interface for listing, adding and removing custom emojis (#5002 ) * Admin interface for listing, adding and removing custom emojis * Only display local ones in the list	2017-09-19 03:52:38 +02:00
Eugen Rochko	d43944143a	Run i18n-tasks normalize (#5003 )	2017-09-19 03:27:08 +02:00
BruWalfas	c155d843f4	A few updates to the Spanish translation and some typos fixing (#4997 ) * So Spanish. Much changes. Wow. * Some little fixes * Updated es.yml, and fixed some ortographical errors * Some little changes to simple_form.es.yml * Yeah, so much translations * Spanish e-mail messages * Remove unused message	2017-09-19 07:47:48 +09:00
unarist	6db034a866	Re-allow underscore on valid_url_path_ending_chars (#4999 ) Limiting allowed characters in the last character of the URL is came from twitter-text, but underscore is allowed on there, and Mastodon before #4941.	2017-09-18 21:25:40 +02:00
Lynx Kotoura	4c14ff659b	Oauth code in input form and add description message (#4986 ) * Oauth code in a input form and add description * New authcode description	2017-09-17 15:23:44 +02:00
Patrick Figel	8811778b55	Randomize sidekiq-scheduler cron schedule (#4980 ) SubscriptionsScheduler in particular causes high load across the entire fediverse at 5 AM UTC every day. Randomizing cron schedules and/or adding a random delay is considered best practice to avoid this issue.	2017-09-17 11:58:20 +02:00
Mingye Wang	c8969dca35	Minor Chinese check & jsx addition (#4973 ) * zh-: transition from "like" back to "fav" This commit reverts the translation for the yellow-star "fav" button back to "fav" in Chinese. Some ambuiguity between "like" and "fav" is deliberately used in zh-TW/HK by using the existing phrase "最爱" (favorite (adj.), lit. love-most) instead of "收藏" (favourite (v.), "collect") in some instances. Fixes #3511. zh-: apply suggestions for PR #4557 zh-cn: de-monetize ya account In Chinese two separate characters, 账 and 帐, can be used to spell the word for account (账/帐户). However, the one with a 贝 on the left is evolved from the latter specifically for monetary purposes. Since people usually can't figure out which one to use, it might be a good idea to use the original not-so-money one. * zh-*: complete jsx translation	2017-09-16 18:48:38 +02:00
Eugen Rochko	54edb4b853	When accessing uncached media attachment, redownload it (#4955 ) * When accessing uncached media attachment, redownload it * Prevent re-download of rejected media	2017-09-16 03:01:45 +02:00
Anna e só	e77cc032c2	l10n: PT-BR translation updated (#4953 ) * devise.pt-BR.yml now fully translated * pt-BR.json now fully translated * pt-BR.yml partially translated; 46 lines left * pt-BR.yml now fully translated * simple_form.pt-BR.yml fully translated * doorkeeper.pt-BR.yml now fully translated * E-mail instructions on app/views/user_mailer added and fully translated * PT-BR translation for #4871 * Deleted an unwanted caracter on pt-BR.yml * Fixing typos on pt-BR.yml * Added translation for Pinned toots tab on pt-BR.json * Added missing translation for navigation_bar.pins * Fixed spelling on pt-BR.yml * Update pt-BR.json	2017-09-15 00:02:38 +02:00
sdukhovni	67559361e8	Add scheduled worker to purge old user IPs (#4951 ) * Add scheduled worker to purge old user IPs * Use ruby 1.9 hash syntax	2017-09-14 22:26:38 +02:00
Yamagishi Kazutoshi	bdcc9e2ceb	Add missing Japanese translations (#4947 )	2017-09-14 18:03:34 +02:00
ふぁぼ原	3816943e6b	Enable to recognize most kinds of characters as URL paths (#4941 )	2017-09-14 18:03:20 +02:00
Masoud Abkenar	b39d512ade	l10n: update Persian translation (#4946 )	2017-09-15 00:13:38 +09:00
abcang	1aad015bbb	Revert unique retry job (#4937 ) * Revert "Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)" This reverts commit `6859d4c028`. * Revert "Do not execute the job with the same arguments as the retry job (#4814)" This reverts commit `be7ffa2d75`.	2017-09-14 15:12:43 +02:00
m4sk1n	94fba44eec	i18n: Update Polish translation (#4942 ) * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update pl.yml	2017-09-14 21:58:48 +09:00
Jeroen	721460a59b	Another Dutch language update (#4944 ) * Update nl.json * Update nl.yml * Update nl.json	2017-09-14 21:52:47 +09:00
Quent-in	aad3df6afc	l10n update OC/FR video redesign (#4938 ) * l10n update for Redesign video player (#4911) * Update videp * Update I hope this time format works well. * One missing string * Update time format I'd like the complete name of the month in the Long format and the short one in the short format. I hope it works now	2017-09-14 16:32:14 +09:00
N氏	1023f52eaa	Add Japanese translate for #4913 (#4936 )	2017-09-14 12:25:18 +09:00
Surinna Curtis	70592cdaba	Add a /api/v1/mutes/details route that just returns the array of mutes.	2017-09-13 21:47:30 -05:00
Eugen Rochko	9239e4ce4d	Uploads for admin site settings (#4913 ) * Improve OpenGraph tags for about pages * Add thumbnail admin setting * Fix error * Fix up	2017-09-14 00:04:30 +02:00
m4sk1n	06f26e09b4	i18n: Update Polish translation (#4929 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-09-13 20:57:33 +02:00
Jeroen	331263270b	Updating Dutch translation (#4927 ) * Update doorkeeper.nl.yml * Update nl.yml * Update simple_form.nl.yml * Update nl.json * Update en.json * Update en.json * Update nl.json	2017-09-13 23:12:29 +09:00
Eugen Rochko	56af04dbb4	Fix #4918 - Limit pinned toots to 5 (#4923 )	2017-09-13 11:04:32 +02:00
unarist	af10c9fbff	Add section for protocol specific information on the admin page (#4910 ) This PR adds section for protocol specific information, then always show both of OStatus and ActivityPub. Specifically, this will help admins to check PuSH subscription status and unsubscribe manually, even `protocol` has been changed. This also includes below changes: * Add `overflow: hidden` to prevent float leaking * Add missing fields for ActivityPub	2017-09-12 23:06:10 +02:00
Patrick Figel	3018043fc2	Add OpenStack Keystone V3 support (#4889 ) Keystone V2 is deprecated in favour of V3. This adds the necessary connection parameters for establishing a V3 connection. Connections to V2 endpoints are still possible and the configuration should remain compatible. This also introduces a SWIFT_REGION variable for multi-region OpenStack environments and a SWIFT_CACHE_TTL that controls how long tokens and other meta-data is cached for. Caching tokens avoids rate-limiting errors that would result in media uploads becoming unavailable during high load or when using tasks like media:remove_remote. fog-openstack only supports token caching for V3 endpoints, so a recommendation for using V3 was added.	2017-09-11 15:11:13 +02:00
Anna e só	c2bee07dbc	l10n: Full PT-BR translation (#4882 ) * devise.pt-BR.yml now fully translated * pt-BR.json now fully translated * pt-BR.yml partially translated; 46 lines left * pt-BR.yml now fully translated * simple_form.pt-BR.yml fully translated * doorkeeper.pt-BR.yml now fully translated * E-mail instructions on app/views/user_mailer added and fully translated * PT-BR translation for #4871 * Deleted an unwanted caracter on pt-BR.yml * Fixing typos on pt-BR.yml * Added translation for Pinned toots tab on pt-BR.json * Added missing translation for navigation_bar.pins	2017-09-11 08:40:29 +09:00
Masoud Abkenar	a345479de2	l10n: update Persian translation (#4880 ) * l10n: update Persian translation * l10n: fix missing Persian translation	2017-09-11 08:35:27 +09:00
David Yip	932571fa22	Merge tag 'v1.6.0' into sync/upstream	2017-09-10 13:04:27 -05:00
m4sk1n	08f00df94b	i18n: Update Polish translation (#4881 )	2017-09-11 00:25:39 +09:00
yoshipc	15b886a6f0	Fix Japanese translation (#4876 ) I translated the additional text ( added by #4871)	2017-09-10 20:34:15 +09:00
Eugen Rochko	7d7844a47f	Default follows for new users (#4871 ) When a new user confirms their e-mail, bootstrap their home timeline by automatically following a set of accounts. By default, all local admin accounts (that are unlocked). Can be customized by new admin setting (comma-separated usernames, local and unlocked only)	2017-09-10 09:58:38 +02:00
David Yip	67ad453373	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss	2017-09-09 23:56:21 -05:00
Yamagishi Kazutoshi	3f333a8d31	Set fallback address when empty notification address (#4868 )	2017-09-09 21:31:48 +02:00
David Yip	514fc908a3	Merge tag 'v1.6.0rc3' into sync/upstream	2017-09-09 14:28:08 -05:00
David Yip	b9f7bc149b	Merge branch 'origin/master' into sync/upstream Conflicts: app/javascript/mastodon/components/status_list.js app/javascript/mastodon/features/notifications/index.js app/javascript/mastodon/features/ui/components/modal_root.js app/javascript/mastodon/features/ui/components/onboarding_modal.js app/javascript/mastodon/features/ui/index.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/components.scss app/presenters/instance_presenter.rb app/services/post_status_service.rb app/services/reblog_service.rb app/views/about/more.html.haml app/views/about/show.html.haml app/views/accounts/_header.html.haml config/webpack/loaders/babel.js spec/controllers/api/v1/accounts/credentials_controller_spec.rb	2017-09-09 14:27:47 -05:00
m4sk1n	7c2d84910c	i18n: Update Polish translation (#4845 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-09-08 05:51:48 +09:00
abcang	6859d4c028	Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836 )	2017-09-07 16:44:14 +02:00
Masoud Abkenar	aec5097d44	i18n: update Persian translation (#4822 )	2017-09-06 17:31:54 +02:00
Adam Thurlow	6994664a13	swift-enable the paperclip! 📎 (#2322 )	2017-09-05 23:17:06 +02:00
abcang	be7ffa2d75	Do not execute the job with the same arguments as the retry job (#4814 )	2017-09-05 20:56:20 +02:00
voidSatisfaction	4d67bf18fe	Translation korean added (#4802 )	2017-09-04 20:40:01 +02:00
ButterflyOfFire	f09a250a7c	Update ar.yml (#4810 ) Some little changes to "ar" locale	2017-09-04 19:54:12 +02:00
Eugen Rochko	8b12e3cc7f	Fix short number locales (#4790 ) Overwrite values from rails-i18n by manually overwriting in every locale. We want numbers like 1.5K in every language	2017-09-03 22:17:34 +09:00
Andreas Drop	d3f46a77c3	Make german translation more gender neutral #4755 (#4789 )	2017-09-03 15:17:24 +02:00
Quent-in	8538170c2d	l10n Occitan update for Embed, cancel follow request, ... (#4788 ) * Update: some missing strings * Updates missing strings * New string * Update oc.json * Update oc.yml * Update oc.json	2017-09-03 18:08:37 +09:00
m4sk1n	2c3544eedd	i18n: Improve Polish translation (#4783 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-09-02 20:45:20 +02:00
Yamagishi Kazutoshi	a0294c8880	Add Japanese translate for #4561 (#4771 )	2017-09-02 14:02:29 +02:00
Eugen Rochko	1b1e025b41	Use updated ActivityStreams context (added: sharedInbox) (#4764 )	2017-09-02 14:00:58 +02:00
m4sk1n	0b32338e3f	Add link to 'noscript' message (#4561 ) * Add link to 'noscript' message Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * remove indent	2017-09-02 01:52:28 +02:00
Eugen Rochko	7dc5035031	Make PreviewCard records reuseable between statuses (#4642 ) * Make PreviewCard records reuseable between statuses Warning! Migration truncates preview_cards tablec * Allow a wider thumbnail for link preview, display it in horizontal layout (#4648) * Delete preview cards files before truncating * Rename old table instead of truncating it * Add mastodon:maintenance:remove_deprecated_preview_cards * Ignore deprecated_preview_cards in schema definition * Fix null behaviour	2017-09-01 16:20:16 +02:00
Damien Erambert	1a0df58878	Update FR locales (#4714 ) * Make the fr locales up-to-date with the last changes (new profile view, applications) * Use the same wording for toots in fr.yml and fr.json * Translate the pin related strings * Translate pin-related locales on the front-end * Add missing locales in doorkeeper.fr.yml and remove un-used ones * Change "posts" back to "status" in the /about/more page in fr.yml * Fix typos for "status" in fr.yml * fix typo for "status" in fr.json * Remove duplicate string * Non-breaking space before punctuation * 'Better' translation for "unpin" * Put back 'pouet' where it was already * Fix * Fix	2017-09-01 14:09:01 +02:00
Eugen Rochko	74437c6bff	Refactor Web::PushSubscription, remove welcome message (#4524 ) * Refactor Web::PushSubscription, remove welcome message * Add missing helper * Use locale of the receiver on push notifications (#4519) * Remove unused translations * Fix dir on notifications	2017-09-01 13:35:23 +02:00
Eugen Rochko	d1a78eba15	Embed modal (#4748 ) * Embed modal * Proxy OEmbed requests from web UI	2017-08-31 03:38:35 +02:00
Eugen Rochko	2db9ccaf3e	Add sharedInbox to actors (#4737 )	2017-08-31 00:02:59 +02:00
Eugen Rochko	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
Lynx Kotoura	8f527bd588	Add japanese translations for shorten display of large numbers (#4722 )	2017-08-28 08:16:49 +09:00
Eugen Rochko	15093f9113	Shorten display of large numbers on public profiles (#4711 )	2017-08-27 17:04:45 +02:00
mayaeh	f92d991e52	Add japanese translations for Pinned statuses based on pawoo. (#4717 ) Add japanese translations for pin_errors.	2017-08-28 00:03:27 +09:00
Eugen Rochko	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
Quent-in	04c3fb2189	i18n Updated strings (#4675 - pinned toot) (#4695 ) * Added string for pinned toots * Pinned toot #4675 + missing string Somehow I deleted it "enabled_success" * update after advice	2017-08-25 23:04:52 +09:00
m4sk1n	409051c22c	i18n: Update Polish translation #4675 (#4692 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-08-25 17:58:31 +09:00
Eugen Rochko	9caa90025f	Pinned statuses (#4675 ) * Pinned statuses * yarn manage:translations	2017-08-25 01:41:18 +02:00
Yamagishi Kazutoshi	da172a8b1b	Disable babel-loader cache when development environment (#4684 )	2017-08-24 19:27:52 +02:00
Eugen Rochko	cf615abbf9	Add configuration to disable private status federation over PuSH (#4582 )	2017-08-24 17:51:32 +02:00
Quent-in	e4c761f902	l18n update OC new strings (#4664 ) (#4680 ) * New strings * Update Thin non breaking spaces * Update Thin non breaking spaces * Update Thin non breaking spaces	2017-08-24 16:16:32 +09:00
m4sk1n	829e2e8c5d	Update Polish translation (#4674 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-08-23 17:45:29 +02:00
Yamagishi Kazutoshi	8d23667536	Add Japanese translations for #2758 , #4506 , #4521 , #4600 and #4664 (#4665 ) * Add Japanese translations for #2758, #4506, #4521, #4600 and #4664 * Do not translate Inbox URL and Outbox URL * Remove "あなたの" * Remove "あなたの"	2017-08-23 14:14:22 +02:00
unarist	9846806cb5	Fix Japanese translation (#4669 )	2017-08-23 20:07:29 +09:00
Eugen Rochko	c1b086a538	Fix up the applications area (#4664 ) - Section it into "Development" area - Improve UI of application form, index, and details	2017-08-23 00:59:35 +02:00
Colin Mitchell	871c0d251a	Application prefs section (#2758 ) * Add code for creating/managing apps to settings section * Add specs for app changes * Fix controller spec * Fix view file I pasted over by mistake * Add locale strings. Add 'my apps' to nav * Add Client ID/Secret to App page. Add some visual separation * Fix rubocop warnings * Fix embarrassing typo I lost an `end` statement while fixing a merge conflict. * Add code for creating/managing apps to settings section - Add specs for app changes - Add locale strings. Add 'my apps' to nav - Add Client ID/Secret to App page. Add some visual separation - Fix some bugs/warnings * Update to match code standards * Trigger notification * Add warning about not sharing API secrets * Tweak spec a bit * Cleanup fixture creation by using let! * Remove unused key * Add foreign key for application<->user	2017-08-22 18:33:57 +02:00
Yamagishi Kazutoshi	11a7507318	Add delete account link for French (#4659 )	2017-08-22 18:31:42 +02:00
Eugen Rochko	f391a4673a	Periodically remove expired PuSH subscribers (#4654 )	2017-08-21 22:56:33 +02:00
m4sk1n	4c23544714	i18n: Minor changes in Polish translation (#4649 ) * i18n: Minor changes in Polish translation * i18n: pl	2017-08-21 07:57:28 +09:00
Quent-in	93d4192a67	l10n update OC : Redesign public profiles (#4608 ) (#4646 ) New strings added to be shown on the new profile page	2017-08-20 21:49:12 +09:00
Naoki Kosaka	462c30e26c	Update Japanese Translation. (Redesign public profiles) (#4612 )	2017-08-17 06:19:37 +09:00
m4sk1n	2a04bdc87a	i18n: Update Polish translation (#4613 ) * i18n: Update Polish translation * Update pl.json	2017-08-16 22:14:23 +02:00
Eugen Rochko	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
Quent-in	e33c28a6d8	Update ActivityPub (#4600 ) (#4609 ) Update: new string + more translations for the time in words	2017-08-16 17:21:34 +09:00
unarist	5b9ae7981e	Update /admin/accounts/:id view for ActivityPub (#4600 ) * Add protocol field * Switch protocol specific information according to active protocol * Hide PuSH subscription related buttons if ActivityPub is active	2017-08-14 14:09:00 +02:00
Eugen Rochko	3c6503038e	Add protocol handler. Handle follow intents (#4511 ) * Add protocol handler. Handle follow intents * Add share intent * Improve code in intents controller * Adjust share form CSS	2017-08-14 04:53:31 +02:00
Eugen Rochko	6df8bd277b	Set correct content-type for ActivityPub JSON (#4592 )	2017-08-14 04:16:43 +02:00
Eugen Rochko	40be4ea239	Extend Devise remember_me longevity to 1 year instead of 2 weeks (#4587 ) Force SSL only cookies for remember_me, adjust confirmation expiration time to fit with the user cleanup scheduler	2017-08-12 16:30:59 +02:00
Sylvhem	d0a217eb92	Minor fixes in the French translation (#4580 ) * Ajout de traductions manquantes Ajoute des traductions pour les chaînes n’en ayant pas en version 1.5.1. Add translations for the strings that are missing them in 1.5.1. * Remplace « ' » par « ’ » Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019). En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux. Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019). In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both. * Ajout d’espaces insécables Ajoute des espaces insécables suivant les régles nécessaires en typographie française. Add non-breaking spaces following rules of French typography. * Remplace « status » par « statut » Remplace le mot anglais « status » par sa traduction française « statut ». Replace the English word "status" by its French translation "statut". * Correction de la politique de confidentialité Apporte diverses corrections à la traduction de la politique de confidentialité. Add various fixes to the privacy policy's translation. * Remplace « mentionné » par « mentionné·e » Harmonise la traduction en remplaçant « mentionné » par sa forme épicène. Harmonize the translation by replacing "mentionné" (sure) by its epicene form. * Remplace « Coup d’œil » par « Jeter un coup d’œil… » Remplace la première traduction par une forme plus proche de la version originelle. Replace the first translation by something closer to the original version. * Remplace « Bon Appétoot ! » par « Bon appouetit ! » Remplace « Bon Appétoot ! » par « Bon appouetit ! » pour essayer de conserver le jeu de mot. Replace « Bon Appétoot ! » by « Bon appouetit ! » to keep the pun. * Remplace « Bon Appétoot ! » par « Bon appouetit ! » (2) Remplace « Bon Appétoot ! » par « Bon appouetit ! » pour essayer de conserver le jeu de mot. Replace « Bon Appétoot ! » by « Bon appouetit ! » to keep the pun.f * Corrections Corrige des fautes d’orthographe et change « appouetit » pour « appouétit ». Correct some mistakes and change "appouetit" to "appouétit".	2017-08-12 01:33:30 +02:00
Quent-in	4b8e4dca26	l10n Update OC #4521 (#4577 ) * l10n Update OC #4521 Link => token provider => provesidor + more generalized way of using present participle * Update oc.yml	2017-08-10 22:15:26 +02:00
spla	10cdad3e7d	Added new catalan strings (#4574 ) * 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 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Update ca.json Removed : <<<<<<< HEAD "getting_started.support": "{faq} • {userguide} • {apps}", ======= >>>>>>> upstream/master * Syncing to master * Added new Catalan strings * removed config.secret_key line * Corrected <sotrong> tag to <strong> Line 515 * Removed extra line * Reverted * yarn.lock reverted	2017-08-10 21:52:40 +09:00
m4sk1n	4e1bf082ce	i18n: Improve admin panel translation (pl) (#4559 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-08-09 07:46:21 +09:00
Eugen Rochko	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
unarist	b42c018bb8	Add Content-Type header on throttled response to fix mojibake (#4558 ) application/json only allows Unicode, so this prevents from wrong charset detection.	2017-08-08 15:47:35 +02:00
Ondřej Hruška	7a1ca8b0df	Merge remote-tracking branch 'upstream/master'	2017-08-07 22:43:52 +02:00
m4sk1n	47579ec58c	It makes no sense to try using invalid or expired link again (#4521 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-08-08 00:20:21 +09:00
m4sk1n	3363a05539	i18n: Update Polish translation (#4545 )	2017-08-07 21:55:25 +09:00
Masoud Abkenar	e7a5a188ef	i18n: update Persian translation (#4540 )	2017-08-06 23:50:20 +02:00
Komic	71384b2ef9	Fix #4531 (#4533 ) wrong character, sorry about that~	2017-08-06 21:52:12 +09:00
Komic	d1d465347a	fr.yml update (#4531 ) Translation for https://github.com/tootsuite/mastodon/pull/4523	2017-08-06 17:36:10 +09:00
Daigo 3 Dango	5eba129b0f	Translate 'Signed in as' into Japanese (#4530 )	2017-08-06 03:14:11 +02:00
Quent-in	021a83ead4	l10n OC - Added #4523 "signed in as" (#4529 ) Neutral form used.	2017-08-06 08:10:53 +09:00
Eugen Rochko	df605f0f8b	Add "signed in as" header to some pages (#4523 )	2017-08-05 04:24:58 +02:00
Quent-in	029786442a	l10n update Occitan (#4522 ) Salutation mailer + invalid reset link.	2017-08-05 01:31:27 +02:00
Krzysztof Jurewicz	400616813e	Fix some mistakes in Polish translation (#4495 )	2017-08-04 22:43:28 +09:00
Eugen Rochko	724be2d5fe	Ignore some locale keys that can but do not need to be translated (#4515 )	2017-08-04 04:42:28 +02:00
Jeroen	76da330155	Dutch strings: typo (#4489 )	2017-08-04 07:16:25 +09:00
m4sk1n	0bbd5789b5	i18n: Update Polish translation (#4479 ) * i18n: Update Polish translation * Update Polish translation	2017-08-03 17:49:53 +02:00
Yamagishi Kazutoshi	fae71b653a	Enable cache for babel-loader (#4505 )	2017-08-03 17:46:49 +02:00
nullkal	dfcd2834f9	Redirect to PasswordController#new when reset_password_token is invalid (#4506 )	2017-08-03 17:45:45 +02:00
asria-jp	26ab702304	Update Japanese Translation (authorize_follow) (#4481 ) * Update Japanese Translation * preserve "Unfortunately"("残念ながら") preserve "Unfortunately"("残念ながら")	2017-08-02 11:49:25 +09:00
kibigo!	8150689b48	Merge upstream (#111 )	2017-08-01 13:20:29 -07:00
Masoud Abkenar	4b6cd1dfdb	i18n: update Persian translation (#4470 ) * i18n: update Persian translation * i18n: fix quotes	2017-07-31 19:40:57 +02:00
unarist	155ba8fd3a	Make salutation of email localizable (#4454 )	2017-07-31 00:18:44 +02:00
Gô Shoemake	b61e3daf98	Multiple frontend support (#110 ) * Initial multiple frontend support * Removed unnecessary require() * Moved styles/images out of common	2017-07-30 19:28:21 +02:00
unarist	feadf7553d	Update Japanese translations (#4453 )	2017-07-30 14:14:41 +02:00
Jeroen	990cea471e	Dutch: Small fix (#4441 )	2017-07-29 18:46:40 +02:00
Quent-in	ff9d344d4c	i18n update of OC version (#4425 ) * Correction of misspellings * Improve the OC version * Improve of the OC version * Improvement of OC version	2017-07-29 00:09:38 +09:00
m4sk1n	c7de92e0df	i18n: Update Polish translation (#4414 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-07-28 17:53:44 +09:00
Yamagishi Kazutoshi	f93f306053	Remove hash from chunk filename when dev env (#4411 )	2017-07-28 05:14:01 +02:00
Sorin Davidoi	e67fc997dc	feat(web_push_notifications): Group notifications (#4388 )	2017-07-28 05:06:22 +02:00
Eugen Rochko	6270f9ce34	Fix #3189 - Share CSRF secret between main app and Sidekiq Web (#4383 )	2017-07-28 04:36:42 +02:00
Satoshi KOJIMA	e54cc15cbd	fix #4356 : place sw.js to assets/sw.js (#4357 )	2017-07-28 01:55:52 +02:00
Ratmir Karabut	2654f3be82	Update Russian translation (#4407 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation * Update Russian translation * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line * Update Russian translation (sessions) * Update Russian translation	2017-07-28 08:16:30 +09:00
Yamagishi Kazutoshi	97a48f237d	Add default settings for user (#4393 )	2017-07-27 15:12:51 +02:00
m4sk1n	7905739c2a	s/PubSubHubbub/WebSub/g (#4372 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-07-26 13:47:41 +02:00
Ondřej Hruška	7e5691804d	Merge git://github.com/tootsuite/mastodon into tootsuite-master	2017-07-25 21:36:22 +02:00
Clworld	02744f29ef	Update Japanese translations for landing page (for Mobile). (#4362 )	2017-07-25 22:57:40 +09:00
Jeroen	f52ce92f2b	Update and (almost) completing Dutch strings for 1.5 (#4351 ) * Update and expanding Dutch strings for 1.5 Only privacy policy is not translated, but is included. Hopefully I have time to translate this another time (you can set your own privacy policy now anyway). * Missing file * A few changes cause of changes in another file * Fix * Update Dutch strings for 1.5 * nl * fix don't know how that ended up there * Update nl.yml	2017-07-25 02:12:50 +02:00
Petko Bordjukov	c80046a77b	Update Capistrano lock version in config/deploy.rb (#4352 ) Deployment with Capistrano was failing due to a mismatch between the loaded version of Capistrano and the one specified in the deployment configuration. Bumping the version in config/deploy.rb fixes this issue.	2017-07-25 01:14:01 +02:00
m4sk1n	462b3752e4	i18n: @2374d63 (pl) (#4340 ) * i18n: @2374d63 (pl) * i18n: fixed typo on Polish translation	2017-07-24 17:15:35 +02:00
Eugen Rochko	029f2c4545	Redesign /terms page (#4338 ) * Redesign /terms page * Fix tests * Remove unused keys	2017-07-24 17:15:15 +02:00
Eugen Rochko	467456f7a1	Move clean up of unconfirmed users to sidekiq-scheduler (#4336 ) * Move clean up of unconfirmed users to sidekiq-scheduler * mastodon:daily is now deprecated	2017-07-24 16:17:55 +02:00
Eugen Rochko	2374d63536	Redesign extended information page (#4322 ) * Redesign extended information page * Remove unused keys * Add $ui-base-lighter-color variable to SCSS	2017-07-24 15:09:08 +02:00
Eugen Rochko	de985a30bc	Run i18n-tasks normalize (#4335 )	2017-07-24 14:30:10 +02:00
sdukhovni	06d905f415	Allow domain blocks that only reject media without silencing or suspending (#4325 ) * Allow domain blocks to reject media without silencing or suspending * Fix typo * Hide 'Reject media' button when superfluous, instead of disabling it * Properly hide 'reject media' checkbox on page load if needed This may happen when resubmitting the domain block form after an error. * Don't ask whether undoing a media-only block should be retroactive * Rename :media_only block to :noop * Display :noop block as None in frontend, allow blocks that do nothing * Remove 'coding' line auto-added by emacs	2017-07-24 14:26:55 +02:00
Yamagishi Kazutoshi	ef16089c6d	Redirect user profile page to short URL when HTML format (#4328 )	2017-07-24 08:46:29 +02:00
m4sk1n	4b4ea1f929	i18n: Update Polish translation (#4327 ) * i18n: Update Polish translation * i18n: Update Polish translation	2017-07-23 23:57:13 +02:00
Yamagishi Kazutoshi	45af29912f	Change about_mastodon to about_mastodon_html for all locales (#4326 )	2017-07-23 23:32:53 +02:00
Yamagishi Kazutoshi	43cad817e8	Update Japanese translations for #4313 and #4315 (#4323 ) * Update Japanese translations for #4313 * Update Japanese translations for #4315	2017-07-23 23:04:25 +02:00
Eugen Rochko	3a3b556065	Improve noscript message and style (#4315 )	2017-07-23 20:28:06 +02:00
Quent-in	a677ac8384	i10n Update for Occitan (#4301 ) * Update to translate new strings * Update * Update * Indend added * Update oc.yml	2017-07-23 12:46:40 +02:00
Eugen Rochko	3c515f2cd2	Run yarn run manage:translations and i18n-tasks normalize (#4302 )	2017-07-23 01:14:57 +02:00
Ondřej Hruška	6913426e48	Merge pull request #92 from tootsuite/master tiny upstream merge	2017-07-22 22:20:17 +02:00
Damien Erambert	4cd82d442e	Update French locales (settings, ToS, & co) (#4261 ) * add fr-FR locales to the landing page * moar french locales * terms of service/privacy policy * remove un-used locales in the client (yarn manage:translations) * update french locales in the client * remove duplicate locales in fr.yml * fix typos per PR comments in fr.yml * put back default messages * translate untranslated keys on the client * add "push" after notifications * correctly ident ToS in fr.yml	2017-07-22 20:28:40 +02:00
Sylvhem	cf51e07bde	Mise à jour de la traduction de la page d’accueil (#4294 ) * Mise à jour de la traduction de la page d’accueil Met à jour les traductions et ajoute les chaînes manquantes suite à la refonte de la page d’accueil. Update translations and add the strings introduced by the landing page's redesign. * Correction d’erreurs Corrige l’indentation de certaines clefs et supprime admin.settings.setting qui n’existe plus dans le projet original. Fix some indentations and delete admin.settings.setting, which have been removed upstream.	2017-07-22 14:11:46 +02:00
beatrix-bitrot	984d2d4cb6	Merge that good fresh upstream shit	2017-07-22 01:16:53 +00:00
Eugen Rochko	8d6c3cd48a	Fix sessions being replaced needlessly (#4292 )	2017-07-22 01:09:10 +02:00
Ondřej Hruška	604654ccb4	New notification cleaning mode (#89 ) This PR adds a new notification cleaning mode, super perfectly tuned for accessibility, and removes the previous notification cleaning functionality as it's now redundant. * w.i.p. notif clearing mode * Better CSS for selected notification and shorter text if Stretch is off * wip for rebase ~ * all working in notif clearing mode, except the actual removal * bulk delete route for piggo * cleaning + refactor. endpoint gives 422 for some reason * formatting * use the right route * fix broken destroy_multiple * load more notifs after succ cleaning * satisfy eslint * Removed CSS for the old notif delete button * Tabindex=0 is mandatory In order to make it possible to tab to this element you must have tab index = 0. Removing this violates WCAG and makes it impossible to use the interface without good eyesight and a mouse. So nobody with certain mobility impairments, vision impairments, or brain injuries would be able to use this feature if you don't have tabindex=0 * Corrected aria-label Previous label implied a different behavior from what actually happens * aria role localization & made the overlay behave like a checkbox * checkboxes css and better contrast * color tuning for the notif overlay * fanceh checkboxes etc and nice backgrounds * SHUT UP TRAVIS	2017-07-21 20:33:16 +02:00
beatrix	0efd7e7406	disable about page timeline	2017-07-20 17:26:00 -04:00
Eugen Rochko	4b911fea03	Add button to re-subscribe to all accounts from a domain (#4285 )	2017-07-20 23:07:13 +02:00
beatrix	e7edb4d1ee	Merge pull request #87 from tootsuite/master merge upstream	2017-07-20 11:24:32 -04:00
m4sk1n	9fc082ea81	i18n: @716f4cb (pl) (#4266 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-07-19 10:49:36 +02:00
Damien Erambert	4c7a9adb98	fix missing closing <p> tag in ToS in en.yml (#4262 )	2017-07-19 09:43:46 +02:00
m4sk1n	030e5cec58	Fix missing closing <p> tag in ToS in .yml files (#4264 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-07-19 09:43:10 +02:00
Yamagishi Kazutoshi	716f4cb11c	Add feature to revoke sessions (#4259 )	2017-07-19 04:59:04 +02:00
Eugen Rochko	a5a07da892	Correct OStatus inflection (Ostatus -> OStatus) (#4255 )	2017-07-19 01:37:26 +02:00
kibigo!	0a678cf377	Fix for stylesheet split	2017-07-18 11:28:52 -07:00
Surinna Curtis	7a77f7b3bb	Add sourceRoot/includePaths to loaders Use the settings modal as an example/testcase	2017-07-18 11:27:48 -07:00
lindwurm	767117f9b0	Update Japanese translation (chase #4249 ) (#4251 ) Signed-off-by: lindwurm <lindwurm.q@gmail.com>	2017-07-18 20:03:18 +02:00
m4sk1n	fb7f06a752	i18n: Update Polish translation (#4252 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-07-18 20:03:06 +02:00
Ondřej Hruška	d69fa9e1f4	Merge changes from upstream with the CSS reload fix	2017-07-18 18:58:47 +02:00
lindwurm	0ccd47f413	Update Japanese translations for new landing page (#4159 ) Signed-off-by: lindwurm <lindwurm.q@gmail.com>	2017-07-18 18:42:59 +02:00
unarist	bb4c3831b2	Add Japanese translation for #4199 (#4247 )	2017-07-18 17:23:35 +02:00
Yamagishi Kazutoshi	3267e4a785	Add unfollow modal (optional) (#4246 ) * Add unfollow modal * unfollowing someone * remove unnecessary prop	2017-07-18 17:14:43 +02:00
abcang	4d42a38954	Improve admin page (#4121 ) * Improve admin page * Fix test * Add spec * Improve select style	2017-07-18 16:38:22 +02:00
Ondřej Hruška	c727eae441	Updated from tootsuite	2017-07-17 20:03:57 +02:00
m4sk1n	902c5cf7ca	i18n: update (pl) (#4233 ) * i18n: update (pl) * Update pl.yml	2017-07-17 10:24:53 +02:00
Eugen Rochko	a3202fd51e	Add SMTP_TLS variable for configuring TLS when server uses non-standard port (#4227 )	2017-07-16 23:48:35 +02:00
unarist	033f970af3	Don't mention default post privacy on hints for locked accounts (#4222 ) "defaults post privacy to followers-only" only means... * default value of `visibility` param on post API * default value for web UI privacy setting (i.e. it will be overridden if they once updated) ...so, many users won't see an effect of it.	2017-07-16 14:02:03 +02:00
Ondřej Hruška	3ea02314b9	split added glitch locales from vanilla (#82 ) * Locale script now accepts overrides and new keys from glitch/locales * Revert glitchsoc changes to mastodon/locales to prevent future merge conflicts	2017-07-16 01:15:25 +02:00
kibigo!	09cfc079b0	Merge upstream (#81 )	2017-07-15 14:33:15 -07:00
Eugen Rochko	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
Ondřej Hruška	75aafc932e	Added buttons and menu items to dismiss individual notifications (#76 ) * Added DELETE verb for notifications * Added notification dismiss button to status dropdown * Added reveal-on-hover notif dismiss button, added FollowNotification component	2017-07-14 11:03:43 -04:00
Eugen Rochko	c42092ba7a	Add option to opt out of search engines on public profile/status pages (#4199 )	2017-07-14 16:41:02 +02:00
m4sk1n	999170d898	i18n: fediwers › fediwersum (pl) (#4198 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-07-14 14:41:13 +02:00
Albert ARIBAUD	37430a3401	fr: replace "silencer" with "masquer" throughout (#4197 ) * fr.json: replace "silencer" with "masquer" "Silencer" as a verb does not exist in French. A good and valid replacement is "masquer". * FR translation: use "masquer" for "silence"	2017-07-14 13:55:40 +02:00
Yamagishi Kazutoshi	0fa9dd8527	Add Rake task for generate VAPID key (#4195 ) * Add Rake task for generate VAPID key * edit config/initializers/vapid.rb	2017-07-14 12:13:43 +02:00
Yamagishi Kazutoshi	87b96f8d33	Add Japanese translations for #3243 (#4192 )	2017-07-14 11:03:01 +02:00
Sorin Davidoi	0c7c188c45	Web Push Notifications (#3243 ) * feat: Register push subscription * feat: Notify when mentioned * feat: Boost, favourite, reply, follow, follow request * feat: Notification interaction * feat: Handle change of public key * feat: Unsubscribe if things go wrong * feat: Do not send normal notifications if push is enabled * feat: Focus client if open * refactor: Move push logic to WebPushSubscription * feat: Better title and body * feat: Localize messages * chore: Fix lint errors * feat: Settings * refactor: Lazy load * fix: Check if push settings exist * feat: Device-based preferences * refactor: Simplify logic * refactor: Pull request feedback * refactor: Pull request feedback * refactor: Create /api/web/push_subscriptions endpoint * feat: Spec PushSubscriptionController * refactor: WebPushSubscription => Web::PushSubscription * feat: Spec Web::PushSubscription * feat: Display first media attachment * feat: Support direction * fix: Stuff broken while rebasing * refactor: Integration with session activations * refactor: Cleanup * refactor: Simplify implementation * feat: Set VAPID keys via environment * chore: Comments * fix: Crash when no alerts * fix: Set VAPID keys in testing environment * fix: Follow link * feat: Notification actions * fix: Delete previous subscription * chore: Temporary logs * refactor: Move migration to a later date * fix: Fetch the correct session activation and misc bugs * refactor: Move migration to a later date * fix: Remove follow request (no notifications) * feat: Send administrator contact to push service * feat: Set time-to-live * fix: Do not show sensitive images * fix: Reducer crash in error handling * feat: Add badge * chore: Fix lint error * fix: Checkbox label overlap * fix: Check for payload support * fix: Rename action "type" (crash in latest Chrome) * feat: Action to expand notification * fix: Lint errors * fix: Unescape notification body * fix: Do not allow boosting if the status is hidden * feat: Add VAPID keys to the production sample environment * fix: Strip HTML tags from status * refactor: Better error messages * refactor: Handle browser not implementing the VAPID protocol (Samsung Internet) * fix: Error when target_status is nil * fix: Handle lack of image * fix: Delete reference to invalid subscriptions * feat: Better error handling * fix: Unescape HTML characters after tags are striped * refactor: Simpify code * fix: Modify to work with #4091 * Sort strings alphabetically * i18n: Updated Polish translation it annoys me that it's not fully localized :P * refactor: Use current_session in PushSubscriptionController * fix: Rebase mistake * fix: Set cacheName to mastodon * refactor: Pull request feedback * refactor: Remove logging statements * chore(yarn): Fix conflicts with master * chore(yarn): Copy latest from master * chore(yarn): Readd offline-plugin * refactor: Use save! and update! * refactor: Send notifications async * fix: Allow retry when push fails * fix: Save track for failed pushes * fix: Minify sw.js * fix: Remove account_id from fabricator	2017-07-13 22:15:32 +02:00
m4sk1n	3567ac3d3e	i18n: @e19eefe, @056b5ed + consistency improvement (pl) (#4171 ) * i18n: @e19eefe (pl) Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: @056b5ed (pl) Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Improve consistency (pl) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-07-12 15:53:50 +02:00
Yamagishi Kazutoshi	43f868de3d	Add Japanese translations for #4163 and #4129 (#4166 ) * Add Japanese translations for #4163 * Add Japanese translations for #4129 * top page -> front page	2017-07-12 14:50:07 +02:00
Yamagishi Kazutoshi	f41590912d	Fix broken terms for Japanese (#4170 )	2017-07-12 14:49:17 +02:00
kibigo!	79d898ae0a	Merge upstream!! #64 <3 <3	2017-07-12 02:03:17 -07:00
Eugen Rochko	056b5ed72f	Improve UI of admin site settings (#4163 )	2017-07-12 03:24:04 +02:00
Eugen Rochko	e19eefe219	Redesign the landing page, mount public timeline on it (#4122 ) * Redesign the landing page, mount public timeline on it * Adjust the standalone mounted component to the lacking of router * Adjust auth layout pages to new design * Fix tests * Standalone public timeline polling every 5 seconds * Remove now obsolete translations * Add responsive design for new landing page * Address reviews * Add floating clouds behind frontpage form * Use access token from public page when available * Fix mentions and hashtags links, cursor on status content in standalone mode * Add footer link to source code * Fix errors on pages that don't embed the component, use classnames * Fix tests * Change anonymous autoPlayGif default to false * When gif autoplay is disabled, hover to play * Add option to hide the timeline preview * Slightly improve alt layout * Add elephant friend to new frontpage * Display "back to mastodon" in place of "login" when logged in on frontpage * Change polling time to 3s	2017-07-11 15:27:59 +02:00
m4sk1n	958fe0f7db	i18n: @7a889a8 (pl) (#4144 ) * i18n: @7a889a8 (pl) * Update pl.yml	2017-07-10 19:42:37 +02:00
Eugen Rochko	a3d93e8bbe	Fix #4059 - Remove ModuleConcatenationPlugin (#4139 ) It increased memory usage of Webpack 1.5x fold with little benefits	2017-07-10 18:46:46 +02:00
STJrInuyasha	7a889a8e12	Remote following success page (#4129 ) * Added a success page to remote following Includes follow-through links to web (the old redirect target) and back to the remote user's profile * Use Account.new in spec instead of a fake with only id (fixes spec) * Fabricate(:account) over Account.new * Remove self from the success text (and all HTML with it)	2017-07-10 18:05:06 +02:00
m4sk1n	d081d4a422	i18n: @2b9721d (pl) (#4143 )	2017-07-10 18:04:43 +02:00
Yamagishi Kazutoshi	31490e0d6c	Add Japanese translations (#4140 ) * Add Japanese translations for #3879 * Add Japanese translations for #4033 * Add Japanese translations for #4136	2017-07-10 16:32:17 +02:00
のら	ca45bd0361	Add Japanese translation of terms and flash (#4137 )	2017-07-10 14:04:05 +02:00
Yamagishi Kazutoshi	63baab088d	Fix regular expression for RFC 5646 (regression from #3604 ) (#4133 )	2017-07-10 14:02:18 +02:00
Yamagishi Kazutoshi	2b9721d1b3	Add setting a always mark media as sensitive (#4136 )	2017-07-10 14:00:32 +02:00
Sadiq Saif	4aa6cd66fc	Change default for auto_play_fit to false for a11y (#4132 ) This is per issue #3876	2017-07-10 04:49:48 +02:00
m4sk1n	8781a8e203	i18n: minor change (pl) (#4124 )	2017-07-09 12:17:00 +02:00
Jeroen	0324f807f4	Update and improvement Dutch language strings (#4117 ) * Update * Update	2017-07-08 17:17:02 +02:00
Sylvhem	8fecd80108	Various fixes in the French translation (#4107 ) * Changement de « Changement de mot de passe » en « Sécurité » * Suppression de « (Two-factor auth) » Change la valeur de la chaîne « two_factor_authentication » de « Identification à deux facteurs (Two-factor auth) » à « Identification à deux facteurs ». La traduction anglaise entre parathentèse était redondante et gênait la lecture. Change the value of the "two_factor_authentication" from "Identification à deux facteurs (Two-factor auth)" to "Identification à deux facteurs". The English translation in brackets was superflous and was getting in the way of the reader. * Remplace « ' » par « ’ » Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019). En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était jusqu’ici incohérente et utilisait les deux. Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019). In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both. * Remplace « ... » par « … » Remplace les séries de trois points par le caractère dédié « … » (U+2026). Replace all the series of three dots by the dedicated character "…" (U+2026). * Mise à jour Crée config/locales/activerecord.fr.yml, ajoute de nouvelles chaînes et met à jour certains textes. Les compteurs de caractères pour le pseudonyme et la biographie devrait maintenant pouvoir fonctionner même quand l’interface est en français. Create config/locales/activerecord.fr.yml, add new strings et update some textes. The caracters counters for the username and the biography should now work even when the interface is in French. * Remplace « A » par « À » Remplace « A » par « À » aux endroits où le mot est mal orthographié. Replace "A" by "À" when the wrong word is used. * Ajout d’espaces insécables Ajoute des espaces insécables suivant les régles nécessaires en typographie française. Add non-breaking spaces following rules of French typography. * Remplace « certain » par « certain·e » Harmonise la traduction en remplaçant « certain » par sa forme épicène. Harmonize the translation by replacing "certain" (sure) by its epicene form. * Corrige un angliscisme Remplace « adresse e-mail » par « adresse électronique ». Replace "adresse e-mail" (e-mail address) by "adresse électronique" (electronic address).	2017-07-08 01:27:22 +02:00
Eugen Rochko	00df69bc89	Fix #4058 - Use a long-lived cookie to keep track of user-level sessions (#4091 ) * Fix #4058 - Use a long-lived cookie to keep track of user-level sessions * Fix tests, smooth migrate from previous session-based identifier	2017-07-07 23:25:15 +02:00
m4sk1n	7a549f830e	i18n: improve consistency (pl) (#4104 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-07-07 20:01:17 +02:00
m4sk1n	9fe6cfca48	i18n: @18d3fa9 (pl) (#4101 )	2017-07-07 17:35:47 +02:00
Yamagishi Kazutoshi	76eda2fc21	Add recursive object support to API response (#4095 )	2017-07-07 14:12:16 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)	2083000027	Set default From address in config (#3756 ) The old implementation sets default From address in mailers. It sets the address from SMTP_FROM_ADDRESS, or notifications@localhost. The behavior is occasionally undesired results. In production environment, notifications@localhost is likely to be incorrect. In testing environment, the email address should not be varied by a environment variable. After appling this change, In production environment, it will throw an exception when launching Mastodon. In testing environment, the address will be fixed with notifications@localhost.	2017-07-07 00:12:12 +02:00
Damien Erambert	18d3fa953b	Add a setting allowing the use of system's default font in Web UI (#4033 ) * add a system_font_ui setting on the server * Plug the system_font_ui on the front-end * add EN/FR locales for the new setting * put Roboto after all other fonts * remove trailing whitespace so CodeClimate is happy * fix user_spec.rb * correctly write user_spect this time * slightly better way of adding the classes * add comments to the system-font stack for clarification * use .system-font for the class instead * don't use multiple lines for comments * remove trailing whitespace * use the classnames module for consistency * use `mastodon-font-sans-serif` instead of Roboto directly	2017-07-06 22:39:56 +02:00
Quent-in	26949607d2	l10n Occitan locale (#4089 ) * Small adjustments About the report part. * Update time format	2017-07-06 21:10:12 +02:00
m4sk1n	6d106d3943	i18n: minor changes in Polish translation (#4087 ) * i18n: minor changes in Polish translation * Update pl.json	2017-07-06 15:25:27 +02:00
m4sk1n	a38b34c37a	i18n: Updated Polish translation (#4068 ) * i18n: Updated Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * fuggin nano	2017-07-04 23:34:00 +02:00
Gyuhwan Park	1921ab40ea	i18n: Update korean translation (#4066 ) * 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 * Updated korean translation	2017-07-04 17:09:17 +02:00
Minori Hiraoka	976c18aa5f	Fix Korean translation (#4065 ) * 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 * Update simple_form.ko.yml Translation error fix - password change form * Update simple_form.ko.yml * Update ko.json Missing translation	2017-07-04 16:48:22 +02:00
Gyuhwan Park	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
Yamagishi Kazutoshi	275c5b51ed	Customizable privacy policy from admin interface (#4062 )	2017-07-04 15:19:24 +02:00
のら	be94f9e35d	Update Japanese translation (#4051 )	2017-07-03 11:02:59 +02:00
Ratmir Karabut	331f0953e9	Update Russian translation (sessions) (#4041 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation * Update Russian translation * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line * Update Russian translation (sessions)	2017-07-03 01:30:22 +02:00
Damien Erambert	133b892e0d	Update French locales (#4034 ) * add missing locales for French translation * accent "Media" in the front-end locales * images => médias * Change 'rapport' to 'signalement' in French locales to be more coherent * fix typo * remove duplicate EN locale * translate missing locales * update missing locale * fix typo * unify with "utilisateur⋅ice⋅s" * address PR comments	2017-07-02 18:36:35 +02:00
unarist	d1d94216d1	Update Japanese translation (Credentials -> Security) (#4025 )	2017-07-01 21:18:38 +02:00
Nolan Lawson	968354923e	Fix webpack-dev-server on Windows (#4000 ) * Fix webpack-dev-server on Windows * Serve webpack from 0.0.0.0, access at 127.0.0.1	2017-06-30 13:43:26 +02:00
Yamagishi Kazutoshi	e4fee6c138	Add Japanese translations (#3985 ) ref #3929, #3935, #3949, #3981	2017-06-28 16:45:21 +02:00
m4sk1n	fb421a1f46	i18n: added email to activerecord.pl.yml (#3981 )	2017-06-28 14:07:53 +02:00
m4sk1n	2a9805b987	i18n: Minor fix in devise.pl.yml (#3978 )	2017-06-27 23:14:02 +02:00
beatrix-bitrot	ddafde942c	Merge remote-tracking branch 'upstream/master'	2017-06-27 20:46:13 +00:00
m4sk1n	da42bfadb5	i18n: E-mail notifications to admins about new reports (pl) (#3975 )	2017-06-27 22:21:35 +02:00
Eugen Rochko	42b8220632	Fix #1624 - Send e-mail notifications to admins about new reports (#3949 )	2017-06-27 00:04:00 +02:00
m4sk1n	646de92781	i18n: Updated Polish translation (#3956 ) * i18n: Updated Polish translation * Update pl.yml	2017-06-26 17:18:45 +02:00
m4sk1n	ae2b722f55	i18n: Warning to look into the spam folder (pl) (#3955 )	2017-06-26 17:10:54 +02:00
Alda Marteau-Hardi	f53ed108b0	Translate pin/unpin and fix some inconsistencies in gender neutral strings (#3952 )	2017-06-26 13:04:36 +02:00
Eugen Rochko	5e8d037e27	Fix #3910 - Require OTP authentication to disable 2FA (#3935 ) * Fix #3910 - Require OTP authentication to disable 2FA. Also, remove ability to generate new OTP backup codes after initial backup codes were handed out during activation * Restore recovery code re-generation * Improve display of some 2FA elements	2017-06-25 23:51:46 +02:00
Eugen Rochko	ed7dc1704d	Bind web UI access tokens to sessions (#3940 ) * Add overview of active sessions * Better display of browser/platform name * Improve how browser information is stored and displayed for sessions overview * Fix test * Fix #2347 - Bind web UI access token to session When you logout, session also destroys the access token, so it's no longer valid. If access token is destroyed some other way, the session is also destroyed, requiring a re-login. Fix #1681 - Add scheduler to remove revoked access tokens and grants * Fix test	2017-06-25 23:51:32 +02:00
amazedkoumei	436ce03772	fix unnecessary variable (#3947 )	2017-06-25 23:29:22 +02:00
Eugen Rochko	d821aba002	Rename "Credentials" page to "Security" for clarity (#3941 ) * Rename "Credentials" page to "Security" for clarity * Change "security" icon from cog to lock	2017-06-25 22:13:02 +02:00
amazedkoumei	87efa38721	more free pgconfig by .env (#3909 ) * more free pgconfig for streaming by .env * fix wrong default values * database.yml read ENV as same as streaming server	2017-06-25 18:13:31 +02:00
Eugen Rochko	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
unarist	68dca26a5d	Fix react-intl/locale-data import issue on production build (#3937 ) Webpack seems to fail to import `react-intl/locale-data/*.js` if those files has been proceed by babel, and this also breaks applying our translation. Note that this won't be a problem on English locale, because react-intl includes it as default and works fine without manually added locale-data. Also this issue seems to only occurs on production build, but I'm not sure about reason.	2017-06-25 12:49:53 +02:00
unarist	138e5a0b1e	Fix webpack config for Windows (#3926 )	2017-06-24 14:03:52 +02:00
Charlotte Fields	b27842dc70	cybre cleanup	2017-06-23 21:45:14 +00:00
Chronister	65528fc54e	All cybrespace changes through 5/28	2017-06-23 21:45:14 +00:00
beatrix-bitrot	9bc593d675	update local modifications for cors and cp	2017-06-23 21:45:14 +00:00
Beatrix Bitrot	a337c5dbe5	CORS tweaks	2017-06-23 21:45:14 +00:00
Sorin Davidoi	2211e8d1cd	Revocable sessions (#3616 ) * feat: Revocable sessions * fix: Tests using sign_in * feat: Configuration entry for the maximum number of session activations	2017-06-23 18:50:53 +02:00
Nolan Lawson	3783cadf2d	Apply babel to react-intl to remove prop-types (#3914 )	2017-06-23 18:21:33 +02:00
Nolan Lawson	e078919f07	Upgrade to Webpack 3 with module concatenation (#3912 )	2017-06-23 17:44:55 +02:00
Ratmir Karabut	9ca02a00a6	Update Russian translation (#3902 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation * Update Russian translation * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line	2017-06-22 23:28:58 +02:00
Quent-in	98fab24bea	Update of doorkeeper.oc.yml (#3896 ) Just some adjustements	2017-06-22 13:39:13 +02:00
m4sk1n	da6fa029f6	i18n: Fixed typo in Polish translation (#3864 )	2017-06-20 18:34:27 +02:00
のら	5cc7cd8518	Add Japanese translation "Action taken by" (#3850 )	2017-06-19 15:12:41 +02:00
masarakki	ff142eb64d	setting-for-account-deletable (#3852 )	2017-06-19 15:12:31 +02:00
Yamagishi Kazutoshi	500e28442f	Re-add disableHostCheck (regression #3729 ) (#3854 ) ref #2790	2017-06-19 14:01:31 +02:00
spla	4367443287	Added new Catalan strings (#3843 ) * 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 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Update ca.json Removed : <<<<<<< HEAD "getting_started.support": "{faq} • {userguide} • {apps}", ======= >>>>>>> upstream/master	2017-06-19 10:29:18 +02:00
Eugen Rochko	f3be605286	Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847 ) Rename Activitypub to ActivityPub	2017-06-19 01:51:04 +02:00
Yamagishi Kazutoshi	53e42bf91e	Upgrade Webpacker to version 2.0 (#3729 )	2017-06-18 02:57:09 +02:00
Quent-in	8fd931dc12	l10n update for account deletion (#3820 ) * l10n update for acount deletion * l10n little change * l10n little changes Less passive voice, more natural. * Update oc.yml Correction, " added	2017-06-17 20:21:25 +02:00
m4sk1n	6f34fdb616	updated Polish translation (#3751 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-06-15 02:00:23 +02:00
unarist	da0333f1cb	Add Japanese translation for Account deletion (#3747 )	2017-06-14 22:00:08 +02:00
m4sk1n	98eacb2238	i18n: updated Polish translation (#3744 )	2017-06-14 20:08:00 +02:00
Eugen Rochko	4a618908e8	Account deletion (#3728 ) * Add form for account deletion * If avatar or header are gone from source, remove them * Add option to have SuspendAccountService remove user record, add tests * Exclude suspended accounts from search	2017-06-14 18:01:27 +02:00
Eugen Rochko	85af2405cf	Exclude packs/custom.js from webpack compilation to prevent breakage (#3719 ) due to the change in #3373	2017-06-13 03:55:36 +02:00
Ratmir Karabut	9e53fe5c29	Update Russian translation (#3692 )	2017-06-11 10:43:01 +02:00
Yamagishi Kazutoshi	3690f04e4a	Remove comments for eslint-disable (#3691 )	2017-06-11 10:42:42 +02:00
Matt Jankowski	2925372ff4	Move create/destroy actions for api/v1/statuses to namespace (#3678 ) Each of mute, favourite, reblog has been updated to: - Have a separate controller with just a create and destroy action - Preserve historical route names to not break the API - Mild refactoring to break up long methods	2017-06-10 09:39:26 +02:00
m4sk1n	778430b54a	i18n: Minor fixes in Polish translation (#3674 ) * i18n * i18n * i18n * i18n * i18n	2017-06-09 23:08:09 +02:00
Matt Jankowski	5282ba862a	Move reblogged_by and favourited_by actions out of api/v1/statuses and into unique controllers (#3646 ) * Add specs for api statuses routes * Update favourited_by and reblogged_by api routes * Move methods into new controllers * Use load_accounts methods to simplify index actions * Clean up load_accounts methods * Clean up link header generation * Check for link headers in specs * Remove unused actions from api/v1/statuses controller * Remove specs for moved actions	2017-06-09 14:12:40 -04:00
m4sk1n	1a065fb146	i18n: updated Polish translation (#3670 )	2017-06-09 19:15:55 +02:00
Yamagishi Kazutoshi	1be48dd805	Refactor views/admin/reports/show.html.haml (#3656 )	2017-06-09 15:08:06 +02:00
unarist	65d8c73bae	Add Japanese translation for #3640 (#3650 )	2017-06-09 03:14:15 +02:00
Eugen Rochko	8902e265b4	Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640 ) * Add explit admin actions to (re)subscribe/unsubscribe remote accounts and re-download avatar/header * Improve how admin NSFW toggle looks	2017-06-08 14:58:22 +02:00
nullkal	b8ea28d6d0	Support multiple trusted proxy ip addresses (#3639 ) * Support multiple trusted proxy ip addresses * correct coding style	2017-06-08 14:33:28 +02:00
Yamagishi Kazutoshi	7d2b4186c3	Add Japanese translations (#3635 )	2017-06-08 13:23:56 +02:00
m4sk1n	90689190a3	i18n: Update Polish translation (#3637 )	2017-06-08 13:23:40 +02:00
Sorin Davidoi	8acadeea76	fix: Warn if JavaScript is disabled (#3634 )	2017-06-08 00:52:56 +02:00
jeroenpraat	92bb166246	Rest of 2FA translated + small fix (#3630 )	2017-06-07 20:08:34 +02:00
Eugen Rochko	722d152082	Fix #3063 - Add dynamic app manifest (#3563 ) * Fix #3063 - Add dynamic app manifest * Added short_name * Add background_color	2017-06-06 19:29:42 +02:00
Yamagishi Kazutoshi	ad4a28f4f6	Refactor translationRunner.js (#3604 ) - Use yargs instead of minimist - Simplify validators - Fix typo (RFC5626 -> RFC5646)	2017-06-06 13:31:57 +02:00
m4sk1n	30fa5fe1a4	i18n: updated Polish translation (#3597 ) * i18n: updated Polish translation * i18n: updated Polish translation btw it would be nice to have master-based Mastodon instance (even isolated from others) to test translation.	2017-06-06 03:59:13 +02:00
Yamagishi Kazutoshi	7a7bfa5170	Add quotes ESLint rules (#3602 ) * Add quotes ESLint rule * Add jsx-quotes ESlint rule * Sort ESLint rules	2017-06-06 03:56:36 +02:00
Daigo 3 Dango	2985d08951	Redirect to streaming_api_base_url (#3579 ) * Redirect to streaming_api_base_url When Rails receives a request to streaming API, it most likely means that there is another host which is configured to respond to it. This is to redirect clients to that host if `STREAMING_API_BASE_URL` is set as another host. * Use the new Ruby 1.9 hash syntax	2017-06-05 12:09:29 +02:00
Quent-in	370fa70924	l10n update for occitan language (#3557 ) * i18n Update : Add preference setting for delete toot modal Adding a line for "Add preference setting for delete toot modal" * i18n update for pin/unpin Update to add two more translations * i18n update to have the dates in plain occitan * Removed the blank line * %{selft} back in the translation	2017-06-05 01:31:10 +02:00
Eugen Rochko	f7a30e2fae	Added support for configurable reserved usernames (fix of #1382 ) (#3566 ) * Added support for configurable reserved usernames * Added reserved usernames from mastodon issue 1355 * Fix reserved usernames	2017-06-05 01:03:45 +02:00
Yamagishi Kazutoshi	3f815b2052	Add date to ignore_missing and ignore_unused in config/i18n-tasks.yml (#3572 )	2017-06-05 01:02:19 +02:00
Nolan Lawson	edddc7c791	Enable stats.json analysis with Webpack Visualizer (#3509 )	2017-06-02 03:49:56 +02:00
Akihiko Odaki (@fn_aki@pawoo.net)	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
Matt Jankowski	2212dc4aaa	Update Rails to version 5.1.1 (#3121 ) * Update rails to version 5.1.1 * Run `rails app:update` * Remove the override of polymorphic activity relationship * Silence warning about otp_secret attribute being unknown to rails * We will only introduce form_with where we want to use remote data	2017-06-01 20:53:37 +02:00
Yamagishi Kazutoshi	1162f61ca3	Remove unused loaders of webpack (#3495 )	2017-06-01 17:27:35 +02:00
Yamagishi Kazutoshi	fda5c699c2	Add ESLint rule (object-curly-spacing) (#3498 )	2017-06-01 17:25:10 +02:00
Matt Jankowski	5c63523972	Spec coverage and refactor for the api/v1/accounts controllers (#3451 )	2017-05-31 21:36:24 +02:00
Matt Jankowski	de4681b2be	Move admin/pubsubhubbub controller to admin/subscriptions (#3442 )	2017-05-31 20:39:35 +02:00
spla	93de41b39b	Catalan language updates (#3454 ) * 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 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated	2017-05-31 02:14:52 +02:00
Naouak	499cc7b803	Fix webpack building on Windows (#3426 ) * Path should not be constructed manually. Use path.join to ensure compatibility. * Path should not be constructed manually. Use path.join to ensure compatibility. * Fix regexp. * Fix my own stupidity. I forgot to check outside my test script the regexp...	2017-05-30 15:30:59 +02:00
Daniel Hunsaker	9ead3d1cdb	[nanobox] Adjustments for Nanobox development (#3295 ) Because Nanobox doesn't run data components in the same container as the code, there are a few tweaks that need to be made in the configuration to get WebPack to work properly in development mode. The same differences lead to needing to use `DATABASE_URL` by default in the `.env` file for Rails to work correctly. Limitations of our `.env` loader for Node.js mean the `.env` file needs to be compiled everywhere in order to work, so we compile it in development, now, too. Also, all the `.env.production` tweaks have been consolidated into a single command. Finally, since Nanobox actually creates the database when it sets up the database server, using the existence of the database alone to determine whether to migrate or setup is insufficient. So we add a condition to `rake db:migrate:setup` to check whether any migrations have run - if the database doesn't exist yet, `db:setup` will be called; if it does, but no migrations have been run, `db:migrate` and `db:seed` are called instead (the same basic idea as what `db:setup` does, but it skips `db:create`, which will only cause problems with an existing DB); otherwise, only `db:migrate` is called. None of these changes should affect development, and all are designed not to interfere with existing behaviors in other environments.	2017-05-29 17:59:18 +02:00
Atsushi Yamamoto	402c19a924	Add preference setting for delete toot modal (#3368 ) * Set delete_modal preference to true by default * Does not show confirmation modal if delete_modal is false * Add ja translation for preference setting page	2017-05-29 17:56:13 +02:00
Akihiko Odaki	189a06d2a2	Fix Webpack Bundle Analyzer output for Webpacker (#3374 ) Webpacker failed to parse output of Webpack when a module requires non-existent module or has similar errors. This commit fixes the bug.	2017-05-28 16:26:16 +02:00
vidarlee	450441fc11	i18n: Add some tags for Chinese translation (#3379 ) * Enhance for the Chinese translation * Add filtered_languages for Chinese Translation include CN/HK/TW for PR #3175 * i18n: Add some tags for Chinese translation * i18n: Add some tags for Chinese translation	2017-05-28 16:25:54 +02:00
Masoud Abkenar	b619362a36	Persian translation fixes and updates (#3380 ) * Persian translation fix * Persian translation of new strings	2017-05-28 16:25:45 +02:00
Eugen Rochko	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
jeroenpraat	f9180823bc	Update Dutch strings for 1.4 (#3363 ) * Update nl strings for 1.4 * Update nl strings for 1.4 * Update nl strings for 1.4 * nl strings (+1) More new OTP strings will be translated another time	2017-05-27 16:28:32 +02:00
Quent-in	4b0c667c09	i18n update for Occitan language (#3362 ) * Update simple_form.oc.yml * Added check spam folder * Update oc.json abonats => seguidors * Update oc.yml * Update oc.json Added translations + corrections * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * i18n mailer * Update reset_password_instructions.oc.html.erb	2017-05-27 15:50:40 +02:00
m4sk1n	1b732cad61	i18n: pl: pluralized (#3344 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-05-27 13:04:42 +02:00
m4sk1n	ef80ad17b3	Updated Polish translation (#3335 ) * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: completed Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: corrected Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: Updated Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update simple_form.pl.yml * Update simple_form.pl.yml * updated Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update pl.yml	2017-05-26 19:59:46 +02:00
Ira	2241a15ee9	i18n: New strings translated to Hebrew (#3282 )	2017-05-25 16:38:02 +02:00
Nolan Lawson	2469fd1cdc	Add improved performance marks for development mode (#3297 )	2017-05-25 14:09:55 +02:00
alpaca-tc	7ee5fc5d68	Toggle sensitive from admin page (#3261 )	2017-05-23 19:45:43 +02:00
Matt Jankowski	4289ed1d13	Refactor of API timeline actions (#3263 ) - Increase coverage to exercise all parts of each action - Move into namespace to share common code - Misc refactor of each action for smaller methods, simpler code	2017-05-23 18:11:39 +02:00
Ira	1baa75f79f	i18n: Latest Hebew strings translated (#3250 )	2017-05-23 13:08:16 +02:00
Eugen Rochko	9afd7dadbf	Fix more locale regressions from #3055 (#3242 )	2017-05-23 02:50:04 +02:00
Eugen Rochko	48e7a22e34	Fix locale regression from #3055 (#3231 )	2017-05-22 16:26:54 +02:00
Ratmir Karabut	2bb5486357	Update Russian translation (#3225 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation * Update Russian translation	2017-05-22 16:03:50 +02:00
Nolan Lawson	60e2b951de	Add webpack-bundle-analyzer for production builds (#3170 )	2017-05-22 15:42:11 +02:00
Immae	a94c152fd3	Allow alternate domains for mastodon handlers (#3187 )	2017-05-22 15:40:04 +02:00
Nolan Lawson	9d04de1c8d	Only load Intl data for current language (#3130 ) * Only load Intl data for current language * Extract common chunk only from application.js and public.js * Generate locale packs, avoid caching on window object	2017-05-22 15:06:06 +02:00
m4sk1n	fbbd80b40b	Updated Polish translation (#3204 ) * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: completed Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: corrected Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: Updated Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update simple_form.pl.yml * Update simple_form.pl.yml	2017-05-22 15:01:53 +02:00
Clworld	df92f010ad	Set config.cache_store in environments file. (#3219 ) * Set config.cache_store in application.rb * Set config.cache_store in environments. * fix code format.	2017-05-22 15:01:02 +02:00
Yamagishi Kazutoshi	84608c3ff8	Add translations for counter of profile (#3214 ) ref #3101	2017-05-22 04:45:55 +02:00
Masoud Abkenar	b69365e397	Persian translation update (#3206 ) * Persian translation update * Persian translation update: new files * Persian translation update * activerecord.fa.yml language code * Persian translation update * fix indent	2017-05-22 00:20:13 +02:00
vidarlee	440441ccb3	Enhance for the Chinese translation (#3198 ) * Enhance for the Chinese translation * Add filtered_languages for Chinese Translation include CN/HK/TW for PR #3175	2017-05-21 11:23:59 +02:00
Daigo 3 Dango	3eb13307ca	Add a Japanese translation for PR #3175 (#3192 )	2017-05-21 01:16:54 +02:00
Eugen Rochko	20c0054460	Adjust REDIS_URL usage in node_redis (#3183 ) Resolves #2780	2017-05-20 21:06:09 +02:00
Eugen Rochko	ef900789bc	Replace mastodon:media:clear and mastodon:feeds:clear rake tasks with (#3180 ) sidekiq-scheduler jobs Resolves #2495	2017-05-20 19:42:58 +02:00
Eugen Rochko	d78f555254	Improve language filter preferences look (#3184 )	2017-05-20 19:42:44 +02:00
Eugen Rochko	c2f70829d9	Adds bootsnap. Faster boot time (#3176 )	2017-05-20 19:42:27 +02:00
spla	b75f13927e	Catalan translation update (#3177 ) * 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 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml	2017-05-20 17:50:11 +02:00
Matt Jankowski	8f4b7c1820	Filter languages with opt out (#3175 ) * Remove allowed_languages and add filtered_languages * Use filtered_languages instead of allowed_languages	2017-05-20 17:32:44 +02:00
Yamagishi Kazutoshi	2e112e2406	Improve eslint rules (#3147 ) * Add semi to ESLint rules * Add padded-blocks to ESLint rules * Add comma-dangle to ESLint rules * add config/webpack and storyboard * add streaming/ * yarn test:lint -- --fix	2017-05-20 17:31:47 +02:00
Yamagishi Kazutoshi	da0a18a318	Add Japanese translations (domain block & admin page) (#3160 ) https://github.com/tootsuite/mastodon/pull/3100 https://github.com/tootsuite/mastodon/pull/3127	2017-05-20 13:39:03 +02:00
Ira	550863198c	i18n: Hebrew Spam folder check warning added (#3134 )	2017-05-19 11:42:02 +02:00
Eugen Rochko	620d0d8029	Account domain blocks (#2381 ) * Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Conversation muting - prevents notifications that reference a conversation (including replies, favourites, reblogs) from being created. API endpoints /api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute Currently no way to tell when a status/conversation is muted, so the web UI only has a "disable notifications" button, doesn't work as a toggle * Display "Dismiss notifications" on all statuses in notifications column, not just own * Add "muted" as a boolean attribute on statuses JSON For now always false on contained reblogs, since it's only relevant for statuses returned from the notifications endpoint, which are not nested Remove "Disable notifications" from detailed status view, since it's only relevant in the notifications column * Up max class length * Remove pending test for conversation mute * Add tests, clean up * Rename to "mute conversation" and "unmute conversation" * Raise validation error when trying to mute/unmute status without conversation * Adding account domain blocks that filter notifications and public timelines * Add tests for domain blocks in notifications, public timelines Filter reblogs of blocked domains from home * Add API for listing and creating account domain blocks * API for creating/deleting domain blocks, tests for Status#ancestors and Status#descendants, filter domain blocks from them * Filter domains in streaming API * Update account_domain_block_spec.rb	2017-05-19 01:14:30 +02:00
Ira	b11c4326d2	i18l: Hebrew translation updates (#3109 )	2017-05-18 13:57:58 +02:00
Quent-in	cf6f67997e	Update oc.yml (#3112 ) Normally fully complete	2017-05-18 12:48:35 +02:00
Eugen Rochko	76449df903	Fix character counter not updating for bio (#3101 )	2017-05-18 00:38:18 +02:00
Eugen Rochko	226c9836e4	Add reset button to admin accounts search, improve looks a little (#3100 )	2017-05-18 00:38:01 +02:00
alpaca-tc	e89e4355eb	Add filter to AccountFilter (#2968 )	2017-05-17 03:00:34 +02:00
jeroenpraat	7c1f3f8163	Added a warning to look into the spam folder (#2921 ) Inspired by a user who received the email confirmation in Gmail's spam folder. This happened with Sparkpost correctly setup.	2017-05-17 02:55:37 +02:00
spla	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
Hiroaki Ninomiya	9bddb946f0	feat(ja): add missing ja translation. (#3083 ) ref: https://github.com/tootsuite/mastodon/pull/2584	2017-05-16 18:14:22 +02:00
Hiroaki Ninomiya	cb50ecdb07	chore(landing_strip): hide signup path unless the instance allows registration. (#3055 )	2017-05-16 00:41:09 +02:00
Hiroaki Ninomiya	1379124682	Improve ja translation (#3071 ) * chore(ja): replace with reasonable word. * chore(ja): add periods.	2017-05-16 00:12:07 +02:00
Akihiko Odaki	85c9496340	Introduce common JavaScript file (#2981 ) * Create common chunk rather than vendor chunk vendor chunk is a set of modules provided by external vendors, but now we can have a chunk as a set of modules shared by multiple entry points, which could be more efficent than having vendor chunk. * Start rails-ujs in common.js This is used by /settings/two_factor_authentication.	2017-05-15 20:20:10 +02:00
Eugen Rochko	d0dd9eb5b5	Feature conversations muting (#3017 ) * Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Conversation muting - prevents notifications that reference a conversation (including replies, favourites, reblogs) from being created. API endpoints /api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute Currently no way to tell when a status/conversation is muted, so the web UI only has a "disable notifications" button, doesn't work as a toggle * Display "Dismiss notifications" on all statuses in notifications column, not just own * Add "muted" as a boolean attribute on statuses JSON For now always false on contained reblogs, since it's only relevant for statuses returned from the notifications endpoint, which are not nested Remove "Disable notifications" from detailed status view, since it's only relevant in the notifications column * Up max class length * Remove pending test for conversation mute * Add tests, clean up * Rename to "mute conversation" and "unmute conversation" * Raise validation error when trying to mute/unmute status without conversation	2017-05-15 03:04:13 +02:00
esetomo	0a110d07b6	Update capistrano lock version to 3.8.1 (#3056 )	2017-05-14 17:38:29 +02:00
Stephen Burgess	4bd0488a77	feat(count): Just yml count syntax to provide different rule for 1 (#2685 ) Update all translation forms that use this "counter" element.	2017-05-13 17:13:17 +02:00
Ira	1b17da6ed9	i18n: Hebrew string updates (#3037 )	2017-05-13 17:05:02 +02:00
Bastien	dc5b746f42	Small FR localisation enhancements (#3033 ) * Small localisation enhancement. Be consistent regarding "e-mail" vs "courriel": I suggest using "courriel" to refer to the electronic message and "e-mail" when used in "adresse e-mail". This reflects the usage I generally observe, but I may be wrong. * Localisation enhancements. Omit some commas: "..., ..., ou ..." should be "..., ... ou ..." since "ou" already articulates the sentence. Also replace "demande" by "requête" when it makes sense.	2017-05-13 15:56:49 +02:00
Eugen Rochko	2cc0d56652	Add back stdout logging to development environment after rails_12factor was removed (#3011 )	2017-05-12 16:47:49 +02:00
Eugen Rochko	e0c3ed29d8	Fix locales again (#3010 ) * Normalize locales * Restore "mention" locale key	2017-05-12 14:46:21 +02:00
ButterflyOfFire	888864ad5a	Update doorkeeper.ar.yml (#3006 ) * Update doorkeeper.ar.yml - Remodelling doorkeeper.ar.yml and adding missing strings from english version to arabic version. - Translating max strings - Reviewing some translations - Other strings to be translated later (complicated somehow) * Update doorkeeper.ar.yml Updating translations from lines : 88 to 91	2017-05-12 14:32:13 +02:00
Koala Yeung	f5cdea5122	Update Norwegian translations (#2937 ) * Update Norwegian translations * Updated no.json * Updated activerecord.no.yml * Updated no.yml * Updated simple_form.no.yml * i18n: fix Unicode character error in no.yml * Javascript escaping code "\uD83D\uDC18" should be "\U0001f418" in Ruby / yml * i18n: remove unused keys in Norwegian translation * Remove unused keys in no.yml and activerecord.no.yml by running: `bundle exec i18n-tasks remove-unused no` * Add missing keys in activerecord.no.yml and no.yml by running: `bundle exec i18n-tasks add-missing no` * i18n: escape the key 'no' in activerecord.no.yml	2017-05-09 14:01:45 +02:00
alpaca-tc	ef226a6f22	Remove rails_12factor (#2901 )	2017-05-09 05:15:54 +02:00
jeroenpraat	406229d927	Updating and extending Dutch strings (#2930 ) * Update nl * Update nl * Update nl * Create confirmation_instructions.nl.html.erb * Create confirmation_instructions.nl.text.erb * Create password_change.nl.html.erb * Create password_change.nl.text.erb * Create reset_password_instructions.nl.html.erb * Create reset_password_instructions.nl.text.erb	2017-05-08 23:11:12 +02:00
ButterflyOfFire	7140def5c9	Update simple_form.ar.yml (#2908 ) * Update simple_form.ar.yml Added missing strings that were introduced to simple_form.ar.yml and completing translation. * Create confirmation_instructions.ar.html.erb * Create confirmation_instructions.ar.text.erb * Create password_change.ar.html.erb * Create password_change.ar.text.erb * Create reset_password_instructions.ar.text.erb * Create reset_password_instructions.ar.html.erb	2017-05-08 15:58:38 +02:00
Koala Yeung	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
alpaca-tc	8c9aff0bef	Render sidekiq scheduler (#2898 )	2017-05-08 03:52:57 +02:00
Eugen Rochko	0291b73de7	Fix Ukrainian malformed locale submitted in #2893 , i18n-tasks normalize (#2896 )	2017-05-08 01:46:36 +02:00
ster	9d84dda213	Update Ukrainian, Russian translations (#2893 ) * Update Ukrainian translation (rebased off Russian translation) * Update Ukrainian, Russian translations	2017-05-07 23:47:19 +02:00
Yamagishi Kazutoshi	3bdcf5d8f0	Add final newline to locale files (#2890 )	2017-05-07 19:55:47 +02:00
beatrix	5c1f70b5c5	namespace redis usage (#2869 ) * add redis-namespace gem * namespace redis usage * refactor redis namespace code to be less intrusive previously : would be prepended to keys when the REDIS_NAMESPACE env var was not set now if it is not set the namespacing functions are not used at all, which should prevent disruptions when instances update. * fix redis namespace variable style in streaming js * remove trailing space * final redis namespace style fix	2017-05-07 19:42:32 +02:00
Özcan Zafer AYAN	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
Nolan Lawson	d372068620	add source maps for dev/production (#2873 )	2017-05-07 15:22:30 +02:00
Yamagishi Kazutoshi	d7c17c32af	Fix redirect path for admin (#2871 )	2017-05-07 15:21:31 +02:00
Ira	ee1486a7de	i18n: Update Hebrew interface translation. (#2880 ) * follow the instructions for registering the language as stated on the Tootsuite's docs. * Added translation strings from latest master Adding &rlm; 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-07 15:20:34 +02:00
Koala Yeung	ada8a6cb77	Fix unused key issue in zh-HK (#2870 ) * locale: remove unused keys in zh-HK * locale: update json translations * handled the untranslated strings. * removed unused keys.	2017-05-07 14:29:01 +02:00
yhirano	bfbfaf9f9f	Enable CodeClimate Brakeman checks (#2861 ) * add brakeman to Gemfile * Enable CodeClimate brakeman checks * add config/brakeman.ignore	2017-05-07 02:45:33 +02:00
Nolan Lawson	8009366231	switch uglify to compress:true,mangle:true (#2852 )	2017-05-06 21:24:59 +02:00
Koala Yeung	99b9a0e5de	translateionRunner: improve minimalist options (#2835 ) * translateionRunner: improve minimalist options * Properly added flags. * Added alias: -h, -f * translationRunner: improve logic and flow * Show all error messages instead of validate availability / name format separately. * translationRunner: check messageDirectory existance * translationRunner: changed throw string to Error * translationRunner: use short cut for boolean	2017-05-06 17:05:13 +02:00
m4sk1n	2d45794956	i18n: corrected Polish translation (#2841 )	2017-05-06 16:41:46 +02:00
Eugen Rochko	b8e166894b	Fix Scheduler::SubscriptionsScheduler (#2834 ) * Fix Scheduler::SubscriptionsScheduler, add worker test for it * Change production log level of Sidekiq to "warn" instead of "info"	2017-05-06 13:05:03 +02:00
Nolan Lawson	7c0cd2597a	remove unnecessary buffer polyfill (#2833 )	2017-05-06 11:02:19 +02:00
Nolan Lawson	37caf0b36e	separate .babelrc for prod/dev, add babel-plugin-lodash (#2829 )	2017-05-06 04:18:23 +02:00
Koala Yeung	cf0b753209	Streamline javascript translation by improving translationRunner (#2808 ) * package.json: Add "build:" targets Improve react-intl-translations-manager workflow. * Added "build:production" to build production bundle. * Added "build:development" to build development bundle. * Fix json translation files * Run `yarn manage:translations` to fix translation files. * Fix `pl.json` for syntax error. * translationRunner: auto detect existing languages * Auto detect existing rfc5646 language tag in .json filenames in `app/javascript/mastodon/locale` folder. No need to manually define every new language in the languages array here. translationRunner: add more functionality * Allow script user to specify language code to check. * Added available language check. * Added --force flag to force creation of unexists language. * Added --help flag and help messages. * gitignore: ignore npm-debug.log * Fix webpack error if NODE_ENV is not defined Default to use 'development' in config/webpack/configuration.js	2017-05-06 04:05:38 +02:00
alpaca-tc	ee3e0a93f4	Fixes unknown mime type (#2822 )	2017-05-05 21:32:14 +02:00
Koala Yeung	886176f854	Update Locale zh-HK (#2818 ) * locale: Add missing translation in zh-HK.yml * locale: fix consistancy in zh-HK.yml translation * locale: Improve zh-HK yml translations * Use "PuSH" in all "PubSubHubBub" occurances. * Simplify text on front page. * Improve doorkeeper authorization table translations. * Simplify setting form text for better layout. * Improve "Business Email" translation. * locale: Update zh-HK.json * Fix untranslated text. * Improve translations.	2017-05-05 18:48:54 +02:00
Milan*	8c9ea9b849	Correct typo in german locale (#2805 )	2017-05-05 09:59:16 -04:00
Eugen Rochko	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
Masoud Abkenar	11077af52f	Persian translation update (#2788 ) * Persian translation update * fix newline typo	2017-05-04 18:32:05 +02:00
Matt Jankowski	2bd132d458	Replace best_in_place editor on admin settings page (#2789 ) * Remove best_in_place * Replace best_in_place usage with rails helpers * Move admin/settings#index to #edit action * Remove click_to__edit from i18n	2017-05-04 18:12:44 +02:00
abcang	91ddd345f2	Enable disableHostCheck option of webpack-dev-server (#2790 )	2017-05-04 17:49:05 +02:00
Akihiko Odaki	0cdcf32865	Use ws protocol in streaming API base URL (#2606 )	2017-05-04 15:55:13 +02:00
Eduardo Elias	3b51581f1b	Language: update pt-BR (#2775 )	2017-05-04 01:28:10 +02:00
alpaca-tc	db92eec876	Localize 'throttled' (#2755 )	2017-05-03 23:36:19 +02:00
Eugen Rochko	c997091166	Clean up redis configuration. Allow using REDIS_URL to set advanced (#2732 ) connection options instead of setting REDIS_HOST etc individually Close #1986	2017-05-03 23:18:13 +02:00
Quent-in	53384b0ffe	Update of simple_forum_oc (#2745 ) * Update of simple_forum_oc * Update simple_form.oc.yml	2017-05-03 14:23:17 +02:00
ヨイツの賢狼ホロ \| 3rd style	1c469ca98b	i18n: Update zh-CN [ Chinese (China) ] translations. (#2699 ) * Update zh-CN translations. * Update doorkeeper.zh-CN.yml * Follow @Artoria2e5 's change advices. * forget mail for text format ...... * fix some changes * mail's html version ...... * https://github.com/tootsuite/mastodon/pull/2699#pullrequestreview-35982283 * a space..... * delete some unused keys	2017-05-03 14:03:16 +02:00
Keiji Matsuzaki	90c00f075a	Added support parallel_tests (#2740 ) - Added new gem the `parallel_tests`. - Updated .travis.yml. - Improved scripts and environment variable.	2017-05-03 12:20:38 +02:00
jirayudech	38473f0aa0	Add Thai Language (#2598 ) * Create th.yml * Update th.yml * Update thai translation * update thai translation. * Update Thai translation * Update thai translation * Update thai thanslation * Update thai translation * Update th.yml * Update th.yml	2017-05-03 12:18:00 +02:00
m4sk1n	bf8031e984	i18n: updated Polish translation (#2729 ) * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: Updated Polish translation * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>	2017-05-03 11:40:09 +02:00
Masafumi Otsune	ab307b816b	Update simple_form.ja.yml (#2746 ) "サーバー" in Japanese is "Server", so I modified it to instance according to English.	2017-05-03 11:39:30 +02:00
Yamagishi Kazutoshi	5f9cb48882	Add Japanese translation for allowed languages (#2738 ) * Add Japanese translation for allowed languages * Remove duplicate expression words	2017-05-03 11:37:44 +02:00
Eugen Rochko	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
Akihiko Odaki	26bc591572	Allow to set CA file for SMTP (#2713 )	2017-05-03 01:03:12 +02:00
m4sk1n	03f3223d72	i18n: updated Polish translation (#2727 ) Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>	2017-05-02 23:04:41 +02:00
Kaylee	7880671f35	Add option to disable two factor auth in admin accounts panel. (#2584 ) * Add option to disable two factor auth in admin accounts panel. Closes #2578 * Add @mjankowski's suggestions. * Moves destroy actions behind User#disable_two_factor! * Adds spec coverage for Admin:TwoFactorAuthenticationsController and User#disable_two_factor!	2017-05-02 21:07:12 +02:00
Quent-in	2128682162	Creation of activerecord for OC (#2721 ) * Creation of activerecord for OC * Update activerecord.oc.yml	2017-05-02 20:55:14 +02:00
m4sk1n	aea3aff4e4	i18n: Updated Polish translation (#2686 ) #807	2017-05-02 20:08:44 +02:00
Eduardo Elias	302c0d2046	Language: update pt-BR (#2687 )	2017-05-02 20:05:21 +02:00
Ira	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 &rlm; 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
Drew Gates	f485fa31f3	grammar fixes (#2695 ) “such as” should be used instead of “like” under imports->preface. Reworded imports->preface and recovery_instructions for better flow.	2017-05-01 20:21:19 -04:00
Giuseppe Pignataro	2bd46f442d	Italian translation (#2654 ) * Added Italian Translation of the following files: Changes to be committed: new file: app/views/user_mailer/confirmation_instructions.it.html.erb new file: app/views/user_mailer/confirmation_instructions.it.text.erb new file: app/views/user_mailer/password_change.it.html.erb new file: app/views/user_mailer/password_change.it.text.erb new file: app/views/user_mailer/reset_password_instructions.it.html.erb new file: app/views/user_mailer/reset_password_instructions.it.text.erb * Added italian translation Changes to be committed: new file: config/locales/activerecord.it.yml	2017-05-01 18:14:51 +02:00
Matt Jankowski	f025cc6782	Filter on allowed user language preferences (#2361 ) * Naive approached to timeline filtering * Convert allowed_languages into a db column * Allow users to choose languages to see statuses in * Style list items as two columns * Add a hint to explain language filtering preference	2017-05-01 17:42:13 +02:00
Alvina Putri	282427cdd9	Updating Indonesian locale (#2644 ) * update id.jsx file * update id.yml for new strings and improvements * add activerecord.id.yml * improve translation that out of context * fix another ooc string * fix main key	2017-04-30 11:35:15 -04:00
Audun Larsen	5caa727e7e	Norwegian locale: Translates missing 2FA strings (#2655 ) * Adds missing strings to Norwegian locale * Translates missing strings. * Changes "tofaktorautentisering" to "to-faktor autentisering" According to the Norwegian National Security Authority this is the correct way to spell it. https://www.nsm.stat.no/blogg/veiledning-i-to-faktor-autentisering/	2017-04-30 08:56:07 -04:00
ButterflyOfFire	3f248dcaae	Update ar.jsx (#2647 ) * Update ar.jsx Updating some (ar) translation. * Update ar.yml Pushing some missing translation strings on ar.yml	2017-04-30 08:51:12 -04:00
Tristan Mahé	964035b118	allow localhost to bypass the ratelimit (#2554 )	2017-04-30 00:27:49 +02:00
Ratmir Karabut	4acc386dd5	Update Russian translation (pluralizations) (#2565 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations)	2017-04-28 15:11:36 +02:00
Ratmir Karabut	ea783d3632	Fix typo and wording in follower auth settings (#2544 )	2017-04-28 00:16:31 +02:00
Eduardo Elias	010e4f2879	Language: Missing keys for pt-BR (#2540 )	2017-04-27 22:32:38 +02:00
yhirano	3d776de2cb	Change permission from 0755 to 0644 (#2536 ) * chmod -x assets.rb * chmod -x assets/fonts * raname extname from jpeg to jpg	2017-04-27 19:29:41 +02:00
jeroenpraat	09b93aaf85	Another (less urgent) Dutch string update (#2533 ) * Another (less urgent) update * Another (less urgent) update * Dutch strings: consistency: let's use 'voorkeuren' as a subset of 'instellingen'	2017-04-27 17:54:34 +02:00
jeroenpraat	b8e7eee837	Last minute Dutch update and fix (after checking on live 1.3RC) (#2529 ) * Update and fix * Update and fix Dutch strings	2017-04-27 17:00:03 +02:00
Eugen Rochko	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
Matt Jankowski	0618f09939	Add spec coverage and refactor authorize_follows controller (#2505 )	2017-04-27 00:19:53 +02:00
Koala Yeung	a23eaf720e	Update Russian translation (rebased) (#2503 ) * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Update Russian translation * Fix merge conflicts Redid Works by @rkarabut	2017-04-26 22:33:54 +02:00
Matt Jankowski	3e78b7cc3a	Updated renamed i18n keys in `de` translation (#2500 )	2017-04-26 19:33:10 +02:00
Matthieu Paret	647a148d4d	fix indentation in translation file (#2498 )	2017-04-26 18:48:43 +02:00
Benedikt Geißler	0576daf5f9	Update German translation (#2485 )	2017-04-26 15:46:14 +02:00
Quent-in	c442cade78	Update of simple_forum OC (#2486 ) Now perfectly similar to the English one.	2017-04-26 15:45:58 +02:00
anon	6137268e79	Update Japanese translation for activitypub and authorized followers (#2471 ) * Update Japanese translation for activitypub and authorized followers * Fixed Japanese translation by review	2017-04-26 14:54:35 +02:00
Yamagishi Kazutoshi	8ee1af9530	Move a locale files for ActiveRecord (#2461 ) ref #2162 and fix #2460	2017-04-26 02:16:30 +02:00
Quent-in	45b379abac	Missing occitan locale file (#2446 ) Based on the device.en file	2017-04-25 23:26:53 +02:00
Mingye Wang	5d26c70a9c	Complete proofreading and addition for zh-CN YML translations (#2445 ) * proofread & update zh-CN setting form locale * Pull in new devise zh-CN translations from their wiki https://github.com/plataformatec/devise/wiki/I18n, more precisely https://gist.github.com/Artoria2e5/6d2a06ca9e92a417afc627b5000f4690 * pull in zh-CN translation for doorkeeper ... from https://github.com/doorkeeper-gem/doorkeeper-i18n/pull/31/	2017-04-25 23:26:33 +02:00
Evan Minto	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
Eugen Rochko	8b5179d006	Fix #2402 - Add Idempotency-Key header to PostStatusService that prevents (#2419 ) duplicates. Web UI regenerates UUID for that header every time the compose form is changed or successfully submitted Also, fix Farsi i18n overwriting the English one	2017-04-25 15:04:49 +02:00
Matt Jankowski	164bad171f	Fix Persian translation (#2428 ) (#2432 ) Settings page contained labels in Persian, when I was using English.	2017-04-25 05:17:52 -04:00
Masoud Abkenar	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
Eugen	da022e1e4f	Run i18n-tasks normalize (#2412 )	2017-04-24 20:52:55 +02:00
Shin Adachi	bc955eaf61	add `patch` method support to CORS (#2408 )	2017-04-24 20:19:51 +02:00
Eduardo Elias	3d3707a077	Language: Missing keys for pt and pt-BR (#2355 )	2017-04-24 02:49:29 +02:00
Matt Jankowski	a0dd90a397	Return force_ssl to the controller (#2380 )	2017-04-24 02:44:05 +02:00
Nolan Lawson	1e2a5dded7	Simplify browserify+babelify config (#2377 )	2017-04-24 02:19:10 +02:00
Effy Elden	1801a36414	Report processing improvements (#2349 ) * Expose media attachments on reported statuses directly * Comment out unused bulk report checkbox. Add title to report comment for viewing full comment. Add 'contents' column, with icons and numerical indicators to show the number of referenced statuses and media attachments in the report * Link account name on authorize_follow card back to account * Add localisation string for report_contents * Show new admin accounts card partial on report view. Apply simple_format to report comment so newlines are preserved. * Add new admin accounts card partial, for display quick useful admin stats (e.g. report history, moderation status). * Fix localized variable	2017-04-24 00:44:37 +02:00
Eugen	501514960a	Followers-only post federation (#2111 ) * Make private toots get PuSHed to subscription URLs that belong to domains where you have approved followers * Authorized followers controller, stub for bulk action * Soft block in the background * Add simple test for new controller * Rename Settings::FollowersController to Settings::FollowerDomainsController, paginate results, rename "private" post setting to "followers-only", fix pagination style, improve post privacy preferences style, improve warning style * Extract compose form warnings into own container, show warning when posting to followers-only with unlocked account	2017-04-24 00:38:37 +02:00
ymmtmdk	072c6f1527	Add link for domain in land strip (#2306 ) * Add link for domain in land strip * Use root_path * Avoid repeating code	2017-04-23 21:45:03 +02:00
Yamagishi Kazutoshi	55e32fe579	Update Japanese translation (#2360 ) for #2181	2017-04-23 21:34:48 +02:00
Matt Jankowski	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
Matt Jankowski	57cd6546c3	Make HSTS enable optional with force_ssl (#2364 )	2017-04-23 19:08:32 +02:00
Koala Yeung	6f0b3b069f	Adding arabic string localization (rebased) (#1895 ) * Create ar.jsx * Preparing file for translation. * Create ar.yml * Preparing file for translation. * Create simple_form.ar.yml * Preparing file for translation. * Create devise.ar.yml * Preparing file for translation. * Create doorkeeper.ar.yml * Preparing file for translation. * Update index.jsx Preparing file for translation. * Update mastodon.jsx * Preparing file to translation. * Correction thanks to @Taekiro https://github.com/tootsuite/mastodon/pull/1798#pullrequestreview-32924922 * Update settings_helper.rb Preparing file to translation. * Update application.rb * Preparing file to translation. * Update simple_form.ar.yml * Update doorkeeper.ar.yml * Update devise.ar.yml * Update ar.yml * Fix i18n-tasks unused issue (ar) Remove unused translation strings * Update application.rb * Update ar.jsx * Fix various issues with Arabic translation * Fix duplication caused in merge * Fix syntax error in devise.ar.yml * Fix import error Duplicated incorrect import in mastodon.jsx * Fix duplication error in locales/index.jsx * Update ar.yml * Update ar.jsx * Update ar.yml * Update ar.jsx * Fix ar translation	2017-04-23 05:58:47 +02:00
Evan Minto	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
Ash Furrow	723f25a999	Admin UI for confirming users (#2245 ) * Shows confirmed status in list. * Adds ability to confirm users in admin UI. * Added new english translations. * Addresses feedback from #2245. * More feedback.	2017-04-23 04:43:42 +02:00
Eugen	59b1de0bcf	Add a confirmation modal: (#2279 ) - Deleting a toot - Muting, blocking someone - Clearing notifications Remove source map generation from development environment, as it is a huge performance sink hole with little gains	2017-04-23 04:39:50 +02:00
Akihiko Odaki	df46864b39	Alter Japanese translations for CW and NSFW (#2305 ) The previous translation for NSFW, "不適切" means "impertinent". This change suggests "閲覧注意", which means the content requires precaution, instead. However, "閲覧注意" was also a translation for CW. CW is now translated as "警告", which simply means "warnings".	2017-04-23 04:31:40 +02:00
Matt Jankowski	ee82d8a876	Move force_ssl check to production config (#2165 ) The force_ssl method from controllers does not add all of the options that the sitewide configuration in a config block does. For example, HSTS enforcement is not added by the controller method, but is added by this style.	2017-04-23 04:22:22 +02:00
ばん	5817bae2da	fix can toot whitespace (#2218 )	2017-04-22 19:48:55 +02:00
Matt Jankowski	67dea31b0f	2FA controller cleanup (#2296 ) * Add spec coverage for settings/two_factor_auth area * extract setup method for qr code * Move otp required check to before action * Merge method only used once * Remove duplicate view * Consolidate creation of @codes for backup * Move settings/2fq#recovery_codes to settings/recovery_codes#create * Rename settings/two_factor_auth#disable to #destroy * Add coverage for the otp required path on 2fa#show * Clean up the recovery codes list styles * Move settings/two_factor_auth to settings/two_factor_authentication * Reorganize the settings two factor auth area Updated to use a flow like: - settings/two_factor_authentication goes to a #show view which has a button either enable or disable 2fa on the account - the disable button turns off the otp requirement for the user - the enable button cycles the user secret and redirects to a confirmation page - the confirmation page is a #new view which shows the QR code for user - that page posts to #create which verifies the code, and creates the recovery codes - that create action shares a view with a recovery codes controller which can be used separately to reset codes if needed	2017-04-22 04:23:17 +02:00
Ashley	05ac28f3e4	Added API for single notification dismissal (#2251 ) * Added API backend for notification dismissal * Added render statement * Changed statement	2017-04-22 02:30:35 +02:00
Akihiko Odaki	0f852c6f74	Do not set port for puma if it is bound to unix socket (#2289 ) Setting port after binding a unix socket puma listen to both of an unix socket and TCP/IP, which is not a desired behavior.	2017-04-22 01:22:20 +02:00
Yamagishi Kazutoshi	1948f9e767	Remove deprecated features at React v15.5 (#1905 ) * Remove deprecated features at React v15.5 - [x] React.PropTypes - [x] react-addons-pure-render-mixin - [x] react-addons-test-utils * Uncommented out & Add browserify_rails options * re-add react-addons-shallow * Fix syntax error from resolve conflicts * follow up `59a77923b3`	2017-04-21 20:05:35 +02:00
Eduardo Elias	27ea2a88c1	Language: Missing keys for pt and pt-BR (#2277 )	2017-04-21 19:53:47 +02:00
Akihiko Odaki	16cd648181	Allow to listen Unix socket (#2085 ) * Allow puma to listen Unix socket * streaming: Show the whole listening address instead of the port Port is not always appropriate (e.g. Unix socket) * streaming: Close server before exiting This change especially allows to remove Unix socket before exiting.	2017-04-21 19:24:31 +02:00
Yamagishi Kazutoshi	53b21ac1cd	Add Japanese translation for display name and bio counter (#2275 ) * Add Japanese translation for display name and bio counter * Remove dep key	2017-04-21 19:23:20 +02:00
Eduardo Elias	e4550811b2	Language: Update missing key for pt and pt-BR (#2276 )	2017-04-21 19:23:02 +02:00
Eduardo Elias	704846a258	Fix: missing : for language (#2274 )	2017-04-21 19:18:16 +02:00
Koala Yeung	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
Koala Yeung	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
Sebastian Morr	74c474a652	Display remaining characters when editing display name and bio (#2219 )	2017-04-21 18:17:21 +02:00
jeroenpraat	d2dc31a74a	Ruby time format fixed (#2259 )	2017-04-21 16:47:15 +02:00
Ash Furrow	a0ed88a99b	Adds version to about/more and API (#2181 ) * Adds version. * Cleans up code. * Removes standalone endpoint and adds version to instance endpoint. * Addresses feedback from #2181.	2017-04-21 03:30:59 +02:00
May Kittens Devour Your Soul	25d2853db2	Croatian language updates & fixes (#2203 ) * Update hr.jsx * Update and rename simple.form.hr.yml to simple_form.hr.yml fixed file name * Update hr.yml * Update hr.yml	2017-04-21 03:30:15 +02:00
Ash Furrow	6c34eafe02	Enables the Polish translation. (#2235 )	2017-04-21 03:29:11 +02:00
jeroenpraat	bbff431e3a	Updated Dutch strings and added Dutch onboarding modal strings (#2243 ) * A bit of more explanation * Update nl.yml * That's more elegant * More consistent and adding missing translation * Update * Update * Added Dutch onboarding modal strings	2017-04-21 03:29:00 +02:00
Mingye Wang	3b342be2f2	Initial overhaul at zh-CN YML translations (#2242 ) This commit provides a heavy proofreading of zh-CN translations, and mainly draws from the zh-HK source when a translation is found too incoherent. Translating directly from en is used when zh-HK translation is not available. This commit also completes the tweet-toot (choo-choo, actually) for zh-cn introduced in #2044. Some minor copyediting, as well as additional en translations, has been fed back into zh-hk text.	2017-04-21 03:27:45 +02:00
Ash Furrow	66b39ccaed	Removes timestamp from URLs. (#2185 )	2017-04-20 03:54:24 +02:00
Miguel Jacq	b79ba3db8a	Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the envfile, otherwise Ruby still attempts auth even if SMTP_AUTH_METHOD is none (#2180 )	2017-04-20 03:12:14 +02:00
alpaca-tc	2c0d756ad9	Extract error messages to locale file (#2162 )	2017-04-19 22:19:32 +02:00
Alex Dunn	35bdacba7a	capistrano: link robots.txt (#1576 ) Related to #1533.	2017-04-19 14:28:23 +02:00
tmyt	6c83fec971	Make configuarable s3_permissions for paperclip (#2139 )	2017-04-19 14:20:36 +02:00
Yamagishi Kazutoshi	8b8e140c71	Change to switch signature version for Amazon S3 (#2124 )	2017-04-19 14:18:50 +02:00
Matt Jankowski	8bac0350d1	Restful refactor of accounts/ routes (#2133 ) * Add routing specs for accounts followers and following actions * Use more restful route naming for public account follow pages Moves two actions: - accounts#followers to accounts/follower_accounts#index - accounts#following to accounts/following_accounts#index Adds routing spec to ensure prior URLs are preserved.	2017-04-19 13:52:37 +02:00
Isao Sugimoto	0a850a8edb	update simple_form.ja.yml (follow for #1991 ) (#2113 )	2017-04-19 03:55:19 +02:00
Isao Sugimoto	71f5cf12d2	update ja.yml (follow for #2106 ) (#2109 )	2017-04-19 00:52:30 +02:00
Michel	9d8bf4ea42	Update fr.yml (#2107 ) Just updated some values. Best regards, cyweo	2017-04-19 00:52:19 +02:00
Eugen	96268e76e6	Fix wording on admin instances view, fix typos in language detector spec (#2106 )	2017-04-18 23:39:51 +02:00
Eugen	e09ab2c0bd	Fix #1642 , fix #1912 - Dictate content-type file extension (#2078 ) * Fix #1642, fix #1912 - Previous change (#1718) did not modify how original file was saved on upload * Fix for when file is missing	2017-04-18 23:15:44 +02:00
Isao Sugimoto	0d6c1e9cba	missing translate ja.yml (#2100 )	2017-04-18 22:29:39 +02:00
Eugen	ff5baa5349	Add rate limits for logins and sign-ups by IP (5 in 5 minutes) (#2079 ) * Add rate limits for logins and sign-ups by IP (5 in 5 minutes) Should be enough for normal attempts * Add rate limit for forgotten password form as well	2017-04-18 22:29:14 +02:00
Matt Jankowski	55e1503522	Instances list in admin (#2095 ) * Add admin/instances index action * Add link to instances admin page * View lists instances * Instances, grouped by domain, ordered by count * Use Account.remote scope * Extract method: Account.by_domain_accounts	2017-04-18 21:09:07 +02:00
Matt Jankowski	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
Olivier Humbert	ee919bedd6	French translation update (#2063 ) fixes	2017-04-18 15:21:47 +02:00
Koala Yeung	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
Ratmir Karabut	50ed72767d	Update Russian translation (#1967 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency	2017-04-18 15:20:37 +02:00
Eugen Rochko	57d784f1e4	Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif	2017-04-18 01:25:50 +02:00
jeroenpraat	e1e15adf1d	Updated, improved and fixed Dutch language strings (#2030 ) * Fixed some words * Improved and more consistent * Fixes and a bit less 'je' * Improved and more consistent * Another round of improvements and consistency * More improvements and less 'je' * Update * Updated with admin strings * More improvements and additions - not complete yet, but most is there * This is what we call in Dutch 'the English disease' :-) * fix comma * admin.reportsi * not needed * hopefully now fixed	2017-04-18 00:16:03 +02:00
spf	8fd6552bca	French i18n-tasks missing fr (#2018 )	2017-04-17 20:27:11 +02:00
Matt Jankowski	21a767dcfa	Improve handling of HTTP_ACCEPT for webfinger (#2008 ) This change includes: - Improve the spec coverage for incoming request to the webfinger action - For requests without an accept header (ie, what a browser might look like), return a JSON response. - For requests with an explicit format of xml or json, return that format. - For requests using an accept header, return that format. Also adds failing spec showing webfinger does not return xml, which covers the issue described in: https://github.com/tootsuite/mastodon/issues/1983	2017-04-17 19:58:03 +02:00
IWAI, Masaharu	f8546ad5a2	Update Japanese translation (#1993 ) Sync text for toot form	2017-04-17 15:15:24 +02:00
Brad Urani	e813810e03	Open sidekiq and pghero admin pages in new browser tabs (#1596 ) * Open sidekiq and pghero admin pages in new tabs * Add missing comma	2017-04-17 12:26:45 +02:00
Patrick Figel	ffb99325ca	Add gif auto-play/pause preference This introduces a new per-user preference called "Auto-play animated GIFs", which is enabled by default. When a user disables this setting, gifs in toots become click-to-play. Previews of animated gifs were changed to display the video play button so that users can distinguish them from regular images. This setting also affects account avatars in the detailed account view, which was changed to use the same hover-to-play mechanism that is used for animated avatars in timelines. Fixes #1652	2017-04-17 12:14:03 +02:00
Miguel Jacq	e9eaf9e33c	Allow using an SMTP server without authentication (#1597 ) * Allow using an SMTP server without authentication (e.g Postfix relay on the same host) by setting SMTP_LOGIN and SMTP_AUTH_METHOD to 'none' * Add note in .env.production.sample about SMTP settings for servers where no auth is required * Assume that SMTP_LOGIN and SMTP_PASSWORD will be blank if we set SMTP_AUTH_METHOD to none	2017-04-17 10:41:19 +02:00
Hugo Gameiro	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
May Kittens Devour Your Soul	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
Toshiyuki Takahashi	be6cabb315	Improved Japanese translation in ja.yml (#1981 )	2017-04-17 10:32:41 +02:00
Ingo Blechschmidt	78bdfc4589	Fix tiny typo (#1956 )	2017-04-17 10:29:49 +02:00
Yamagishi Kazutoshi	5e94643058	Fix minor typo in Japanese translation "保村" -> "保存" (#1968 )	2017-04-17 04:22:14 +02:00
Toshiyuki Takahashi	dc6fe4e04b	Improved Japanese translation in devise.ja.yml (#1969 )	2017-04-17 04:22:09 +02:00
Matt Jankowski	2b6b89491d	Remove unused registrations: key from PT yml locale (#1952 )	2017-04-16 20:53:16 +02:00
Matt Jankowski	f87b51fda8	I18n health warnings (#1949 ) * Rename admin.domain_block to admin.domain_blocks in prep for i18n improvement * Use implicit controller/action path for i18n in admin/domain_blocks * Add DomainBlock#accounts has_many * Avoid i18n health warning for `en` locale by using symbol scope with :count * Remove unused i18n key: plaintext_secret_html * Remove unused i18n key two_factor_auth.warning * Remove final will_paginate i18n keys * Remove unused key two_factor_auth.recovery_codes * Remove unused key: admin.reports.comment.none * Remove unused reports. i18n namespace (moved to admin.reports) * Ignore keys from locales which override activemodel and activerecord errors * Revert "Remove unused key: admin.reports.comment.none" This reverts commit 350ef2685fadc069e619bb6d1066190de195d942. * Update i18n key reference to match moved location * Add missing `en` keys to i18n * Tell i18n-tasks to ignore missing attributes that dont need overwriting * Add i18n-tasks unused to travis	2017-04-16 19:37:01 +02:00
oliverkeeble	86d1dcc97a	Fix translation of 'reblogged' in eo.yml (#1942 )	2017-04-16 18:11:07 +02:00
Eduardo Elias	86eaaf0761	Add missing keys to PT locale (#1941 )	2017-04-16 18:04:19 +02:00
Kazuhiro NISHIYAMA	c2762fa498	Add missing Japanese translations (#1923 ) And `i18n-tasks add-missing -l ja` changes some quotes.	2017-04-16 16:07:45 +02:00
Eduardo Elias	da302a43cd	Improve PT locale on simple_form (#1917 ) * Improve PT locale on simple_form * Add missing keys to PT locale	2017-04-16 14:56:04 +02:00
Matt Jankowski	75f416a492	Fix yaml issue in ja locale (#1916 ) * Fix yaml parse issue in ja.yml locale * Fix issue in locales/ja.jsx	2017-04-16 14:55:04 +02:00
George Hattori	6df63465b9	Improve Japanese translation (#1909 )	2017-04-16 13:44:57 +02:00
新都心(Neet Shin)	f2997c9715	Update Japanese Translate (#1903 ) * [Update ja.jsx] Add Muted, Video_error and sorted * [Update ja] Added Recovery code's translation * [Update ja] Added Two-fact/Recovery's translation * Update ja.jsx	2017-04-16 13:42:16 +02:00
Alex Dunn	865cb39e9b	lock capistrano to 3.8.0 (#1890 )	2017-04-16 12:52:18 +02:00
Eugen	5d710b1139	Make file attachment on MediaAttachment optional (#1865 ) Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true Clean up old media files when creating a new domain block with reject_media set to true Return remote_url in media attachments API if local file is not present Undo domain block action in admin UI Ability to enable reject_media from admin UI	2017-04-16 12:51:30 +02:00
Joachim Viide	363de2dffd	Leave out the "Expires" header from S3 uploads (#1886 )	2017-04-16 04:01:58 +02:00
Alex Dunn	6a1ac9b31f	capistrano: allow overriding repo_url and branch (#1889 )	2017-04-16 04:01:27 +02:00
Ash Furrow	0f8b7d0660	Removed Heroku in-process spawning. (#1873 )	2017-04-15 23:02:13 +02:00
Naouak	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
oliverkeeble	28606d730a	Fix typo in simple_form.eo.yml (#1848 )	2017-04-15 16:46:48 +02:00
Matt Jankowski	6670e6d33f	Add password reset for users from admin accounts area (#1841 )	2017-04-15 16:44:59 +02:00
Patrick Figel	df4ff9a8e1	Add recovery code support for two-factor auth (#1773 ) * Add recovery code support for two-factor auth When users enable two-factor auth, the app now generates ten single-use recovery codes. Users are encouraged to print the codes and store them in a safe place. The two-factor prompt during login now accepts both OTP codes and recovery codes. The two-factor settings UI allows users to regenerated lost recovery codes. Users who have set up two-factor auth prior to this feature being added can use it to generate recovery codes for the first time. Fixes #563 and fixes #987 * Set OTP_SECRET in test enviroment * add missing .html to view file names	2017-04-15 13:26:03 +02:00
luigi	67ad84b7eb	Add some missing Spanish translations (#1818 ) * Add missing spanish translations on user settings simple_form.es.yml * Fix typo: Aute/ción. should be Autenticación	2017-04-15 13:25:00 +02:00
Setuu	9e620ca16c	Fix Japanese translation of ja.yml (#1835 )	2017-04-15 13:18:08 +02:00
goofy-bz	a3aa9381c4	Update devise.fr.yml (#1728 ) Very light grammar fix to improve gender-neutral	2017-04-15 02:55:43 +02:00
Shouko Yu	120a37a197	Add translations for zh-TW (Taiwan) (#1794 )	2017-04-15 02:49:43 +02:00
Koala Yeung	ec9999cdfe	Update Traditional Chinese, HK (zh-HK) translation (#1759 ) * Fix missing string in javascript locale (zh-HK) * Change javascript locale (zh-HK) * Fix some other strings that were still English. * Improve `search.status_by`. * Fix `notification.follow`. ("開始開始你") * Changes according to user feedback. * "Back": "較前顯示" -> "返回" * "Home": "家" -> "主頁" * Update ruby locale (zh-HK) * Fix missing translation * Normalize yml * Update translation strings	2017-04-15 02:48:30 +02:00
Fjoerfoks	e806d3c3f0	Update nl.yml (#1764 ) Some rewording, typos and switching to infinitve	2017-04-15 02:45:46 +02:00
Olivier Humbert	061922b38c	Update devise.fr.yml (#1792 ) * Update devise.fr.yml Consistencies across the French translation * Update doorkeeper.fr.yml	2017-04-15 02:44:10 +02:00
Thor Harald Johansen	4bebeb27d3	More Norwegian translations (#1805 ) * Working translation for Norwegian. * Fixes to Norwegian translation. * Further adjustments to Norwegian translation. * Further adjustments to Norwegian translation. * Yet more improvements to the Norwegian translation. * More Norwegian translations. Better terminology.	2017-04-15 02:33:37 +02:00
Darío Hereñú	9240ca6cef	Mispelling & minor fixes (#1814 )	2017-04-15 02:31:16 +02:00
Matt Jankowski	619817d29e	Remove unused will_paginate.page_gap key from i18n (#1815 ) This value was changed recently, and every locale which had it set was using the same value as the default. This value is still the default in the new location.	2017-04-15 02:30:55 +02:00
rysiekpl	ade004b5ee	Polish translation (needs more love though) (#807 ) * Polish translation (needs more love though) * Polish translation bugfix * bugfix for new colon-containing texts * another bugfix. yaml is evil * minor fix * fixing issues pointed out by reviewers * Uwierzytelnianie dwustopniowe -> dwuetapowe, as suggested by a reviewer * Etyczny dizajn zbyt sarkastyczny, to będą założenia	2017-04-15 02:22:46 +02:00
Les Orchard	7609593e48	Add REDIS_DB env variable to configure Redis database (#1366 )	2017-04-15 02:21:13 +02:00
ThibG	a9529d3b4b	Allow running mastodon on a different domain as the one used for identifying users (#1267 ) * Allow running mastodon on a different domain as the one used for identifying users * Alter documentation of WEB_DOMAIN to make clear it shouldn't be used unless the admin knows what they are doing * Compare to web_domain instead of local_domain when dealing with feeds/API * Correctly identify mentions to local accounts Mentions URLs point to the person's web profile, i.e., the user page served on WEB_DOMAIN.	2017-04-15 02:15:46 +02:00
Valentin Lorentz	5ab0ffc6c8	Custom Paperclip path. (#778 ) * Custom Paperclip path. * Document PAPERCLIP_ROOT. * Add PAPERCLIP_ROOT_URL (and rename PAPERCLIP_ROOT to PAPERCLIP_ROOT_PATH).	2017-04-15 02:07:21 +02:00
Kazuhiro NISHIYAMA	1616cf98a1	Add missing Japanese translations (#1785 )	2017-04-14 19:10:12 +02:00
Takayuki KUSANO	5aae6384ff	Fix Japanese translation for remote_follow (#1771 ) Current remote_follow.acct translation inappropriate. Users may input their own acccount. So fix the wording.	2017-04-14 19:09:52 +02:00
Matt Jankowski	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
Effy Elden	c019b0acfd	Modify ActionMailer configuration to default to ENV['LOCAL_DOMAIN'] if ENV['SMTP_DOMAIN'] is not set. The previous fallback, config.x.local_domain, is undefined when the code is called. (#1745 )	2017-04-14 11:02:25 +02:00
Eugen Rochko	c8be05a4a7	Fix italian translation	2017-04-13 22:26:32 +02:00
Eugen Rochko	41c697fd81	Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master	2017-04-13 22:25:07 +02:00
Eugen	485310a43c	Make browserify respect changes in node_modules for asset compilation (#1722 )	2017-04-13 22:21:20 +02:00
Matteo Aquila	9aae9ae40c	Update devise.it.yml	2017-04-13 22:09:47 +02:00
Matteo Aquila	1fb125b630	Update devise.it.yml	2017-04-13 22:06:19 +02:00
Eugen	057567d548	Make boost modal off by default (#1719 )	2017-04-13 21:53:59 +02:00
Yusuke Abe	169c68a739	Add filename extension to paperclip (#1718 )	2017-04-13 21:52:56 +02:00
Matt Jankowski	9f182346d7	Use english in reported by translation (#1713 )	2017-04-13 21:49:46 +02:00
spf	a58c935c3d	Fr missing strings (#1708 ) * Fix missing translation for username already taken * fr - note too long translation	2017-04-13 21:49:34 +02:00
Thomas Citharel	c0c56db0fa	Translate admin (#1702 ) * Translate the domain_block panel Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate PubSubHubbub section Signed-off-by: Thomas Citharel <tcit@tcit.fr> * translate account section and correct typos * move reports translation & translate sidebar Signed-off-by: Thomas Citharel <tcit@tcit.fr> * normalize l18n	2017-04-13 21:49:07 +02:00
James Moore	d9dc0fe84e	smtp delivery type fix (#1556 ) * delivery fix # Conflicts: # config/environments/production.rb * added stub in .env file * reordered and added a comment	2017-04-13 19:51:49 +02:00
Eugen	9e5c1c487e	Apply `i18n-tasks normalize` to locales (#1696 )	2017-04-13 19:18:32 +02:00
Koala Yeung	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
Matteo Aquila	0220f3a171	Update application.rb	2017-04-13 15:33:45 +02:00
Matteo Aquila	3f42ad7d1a	Rename simple_form.it.yml to config/locales/simple_form.it.yml	2017-04-13 15:28:30 +02:00
Matteo Aquila	f7c466c8d8	Rename devise.it.yml to config/locales/devise.it.yml	2017-04-13 15:28:15 +02:00
Matteo Aquila	245b9cb4ba	Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml	2017-04-13 15:27:56 +02:00
Matteo Aquila	9275f92972	Rename it.yml to config/locales/it.yml	2017-04-13 15:27:37 +02:00
Musee U	467d32fce3	[l10n] ja: update missing Japanese translations (#1684 )	2017-04-13 13:40:58 +02:00
May Kittens Devour Your Soul	90d0018fd5	Adds Croatian language [Hrvatski] (#1000 ) * Create simple.form.hr.yml * Create hr.yml * Update hr.yml * Update hr.yml * Create doorkeeper.hr.yml * Create devise.hr.yml	2017-04-13 13:38:44 +02:00
新都心(Neet Shin)	0e4479bb3a	Update Japanese translation files (#1640 ) * [l10n] ja: Improve Japanese Translations * ja: about: Fix highlighting * ja: Update Translations * ja: Translate admin settings Signed-off-by: lindwurm <lindwurm.q@gmail.com> * Update ja.jsx * Update doorkeeper.ja.yml * Update ja.yml * Update ja.jsx * Update ja.jsx	2017-04-13 13:23:45 +02:00
Ratmir Karabut	af7e880df5	Update Russian translation (#1570 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error	2017-04-13 13:23:23 +02:00
Svetlozar Todorov	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
Matt Jankowski	137100dcf3	Clean up well-known routes/controllers (#1649 ) * Add request spec for host meta route returning xml * Add routing spec for xrd routes * Update well-known routes * Move webfinger and host-meta actions to their own controllers	2017-04-13 13:09:07 +02:00
Matt Jankowski	3a9eb81a80	Admin accounts controller cleanup (#1664 ) * Remove unused account_params method in admin/accounts controller * Introduce AccountFilter to find accounts * Use AccountFilter in admin/accounts controller * Use more restful routes admin silence and suspension area * Add admin/silences and admin/suspensions controllers	2017-04-13 13:04:23 +02:00
Thor Harald Johansen	ccaf3dbc5a	Adjustments to the Norwegian translation (#1648 ) * Working translation for Norwegian. * Fixes to Norwegian translation. * Further adjustments to Norwegian translation. * Further adjustments to Norwegian translation.	2017-04-13 02:17:26 +02:00
lindwurm	9966bd27c2	[l10n] ja: Improve Japanese Translations (#1631 ) * ja: about: Fix highlighting * ja: Update Translations * ja: Translate admin settings Signed-off-by: lindwurm <lindwurm.q@gmail.com>	2017-04-12 20:41:50 +02:00
pinfort	38e24a699b	fix Japanese translation (#1623 ) * 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 * fix translations 翻訳の誤りの修正と改善 * freeの訳修正 * いいねをお気に入りに統一 * Revert "いいねをお気に入りに統一" This reverts commit 568d5cccfa0b6620ccb6c9db8346c52c0396d99f. 間違ってtranslateブランチにコミットしたため取り消し * Revert "freeの訳修正" This reverts commit 565658a60583ff7e1e7a63ef597bf3ac6118e1bf. * revertでミスったので戻す * Revert "ミスったので戻す" This reverts commit 00be7a748a6a2ae85a62be847172424278c52ec7, reversing changes made to b4e1e06503c77e079cb2569a53ab4d6fcfcfd116. * freeの訳修正 * いいねをお気に入りに統一 * 一回戻す * 戻しきれてなかった * 再度変更 * 戻す * 再度変更 * 再度変更 * Update doorkeeper.ja.yml Fixed a lot of unnatural translations * Update ja.yml 資格情報 isn't easy to understanding. so fixed to ログイン情報. * Update ja.yml fixed some unnatural translations * Update simple_form.ja.yml Fixed wrong translate 「アカウント」 to 「アイコン画像」 * Update simple_form.ja.yml * Update doorkeeper.ja.yml * Revert "多くの不自然な翻訳を解消しました。" * Update ja.jsx fixed typo * 文字化け修正	2017-04-12 20:19:38 +02:00
Manato Kameya	bf3e56b8ad	Fix incorrect notation in simple_form.ja.yml (#1620 )	2017-04-12 20:19:27 +02:00
CgX	e32edd247f	Update fr.yml (#1600 ) Mistake on %{link} variable	2017-04-12 19:56:09 +02:00
Matt Jankowski	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
Matt Jankowski	7f0a865b05	Allow import/export of mutes list (#1541 ) * Allow export of mutes list * Allow importing of mutes list * Refactor to use Settings::Exports::BaseController and DRY up exports code	2017-04-12 18:20:44 +02:00
Carlos A. Escobar	3064ef96a1	Added missing Spanish translations strings (#1292 ) * Added missing Spanish translations strings * fix bad translation * resolve conflict with tootsuite/master * agreements from spanish community * Add some missing strings	2017-04-12 17:16:40 +02:00
Thomas Citharel	d90d23699c	Make Reporting admin section translatable (#1549 ) * Make Reporting admin section translatable And translate it into english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make subject of emails translatable and improve french translation Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make error pages translatable and translate them in english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate site setting section * Insert instance in registration emails and improve them a bit Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2017-04-12 17:11:49 +02:00
Thor Harald Johansen	1f5ff46fd9	Working translation for Norwegian. (#1611 )	2017-04-12 17:07:51 +02:00
Matt Jankowski	b352a8e5d4	Default to json type for webfinger requests (#1583 )	2017-04-12 16:03:37 +02:00
Koala Yeung	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
Eugen	40bdf43297	Change default log level in production from :debug to :info for less I/O (#1579 )	2017-04-11 23:28:23 +02:00
Eugen	5cdd2c2414	Fix #1535 - #1372 set a wrong default on :openssl_verify_mode (#1563 )	2017-04-11 22:49:53 +02:00
Matt Jankowski	3ddd936b03	Refactor exports controller (#1567 ) * Add basic coverage for settings/exports controller * Remove unused @account variable from settings/exports controller * Add coverage for download export actions * Remove deprecated `render :text` in favor of `send_data` for csv downloads * Add model to handle exports * Use Export class in settings/exports controller * Simplify settings/exports controller methods * Move settings/export to more restful routes	2017-04-11 22:00:43 +02:00
Thomas Citharel	327a6e166f	Update french locale (#1525 ) * Update devise.fr.yml fixing minor typos * add missing strings * Fix a translation and add translation for devise part Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2017-04-11 21:54:40 +02:00
pinfort	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
jukper	4964433190	Revised finnish translation (#1537 )	2017-04-11 21:41:40 +02:00
Jantso Porali	9e3c4fd2d7	Update language files (#1516 ) * update faq with default language * update translation for about page * update Minio config Thanks to @Gargon for helping me. I hope this will help others as well * update import and export translation * translate emails to finnish * add finnish translation for emails * add finnish translation for emails * add finnish translation * add missing dot * update finnish language to emails * add finnish translation for emails * add dot and fix typo * updated some minor typos * remove language change due breaking emails And by dev request * updated minio config by dev request * updated about page translation * fix for Amazon S3/Minio instance setups If you were using S3 or Minio for your files, this will fix the Import issue :) * update translation according to issue #1515 See issue #1515 * update translation for issue #1515 see issue #1515	2017-04-11 21:41:29 +02:00
Eugen Rochko	2a7602cad4	Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master	2017-04-11 20:43:56 +02:00
blackle	06444bf050	Allow user to disable the boost confirm dialog in preferences	2017-04-11 10:10:16 -04:00
Yann GUERN	a85d4473aa	Avoid user enumeration with devise paranoid mode (#1527 )	2017-04-11 14:21:15 +02:00
Matt Jankowski	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
Matt Jankowski	64dbde0dbf	Version bumps for ruby and misc gems (#1159 ) * Update rspec-rails to version 3.5.2 * Update addressable to version 2.5.1 * Update autoprefixer-rails to version 6.7.7.1 * Update bullet to version 5.5.1 * Update domain_name to version 0.5.20170404 * Update letter_opener_web to version 1.3.1 * Upate redis-rails to version 5.0.2 * Update active_record_query_trace to version 1.5.4 * Update capistrano-rails to version 1.2.3 * Update dotenv-rails to version 2.2.0 * Update pg to version 0.20.0 * Update tilt to version 2.0.7 * Update warden to version 1.2.7 * Update tins to version 1.13.2 * Update terminal-table to version 1.7.3 * Update oj to version 2.18.5 * Update simplecov to version 0.14.1 * Update uglifier to version 3.1.13 * Update hashdiff to version 0.3.2 * Update webmock to version 2.3.2 * Update devise to version 4.2.1 * Use ruby version 2.4.1 * Update sass to version 3.4.23 * Update puma to version 3.8.2 * Update will_paginate to version 3.1.5 * Update font-awesome-rails to version 4.7.0.1 * Update fuubar to version 2.2.0 * Update pry-rails to version 0.3.6 * Update simple-navigation to version 4.0.5 * Update rubocop to version 0.48.1 * Update doorkeeper to version 4.2.5 * Update faker to version 1.7.3 * Update aws-sdk to version 2.9.5 * Update fabrication to version 2.16.1 * Update hamlit-rails to version 0.2.0 * Update http to version 2.2.1 * Update httplog to version 0.99.2 * Update sidekiq to version 4.2.10 * Update rspec-sidekiq to version 3.0.0 * Update pghero to version 1.6.4 * Update rack-cors to version 0.4.1 * Update i18n-tasks to version 0.9.13 * Update ruby-oembed to version 0.12.0 * Update jquery-rails to version 4.3.1 * Update simple_form to version 3.4.0 * Update react-rails to version 1.11.0 * Update aws-sdk to version 2.9.6 * Update sidekiq-unique-jobs to version 5.0.0 * Update uglifier to version 3.2.0	2017-04-10 22:47:41 +02:00
Alexander Mankuta	0dbbc16c69	More SMTP customization (#1372 ) * Allow SMTP auth method customization * Add SMTP openssl_verify_mode option support Allows one use self-signed certs with their SMTP server. * Add SMTP enable_starttls_auto option support	2017-04-10 21:48:30 +02:00
Ratmir Karabut	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
R Tucker	8bfdbf0aa6	Add comment to settings.yml to nudge admins towards editing values via Web UI (#1289 ) * Put a useful message for new admins on /about/more I totally failed to realize this file was just defaults. I think this message would be a good default for people like me. * Revert default site description, expand comment This will keep setup-related stuff from leaking into public views, while still hopefully keeping over-eager admins from editing this file unnecessarily before RTFMing. (e.g., me)	2017-04-09 18:34:29 +02:00
David Celis	d4fe6cd2bf	Allow users to update their Account in the API (#1179 ) * Allow users to update their Account in the API It would be nice for API clients to be able to allow users to update their accounts without having to wrap Mastodon in a web view. This patch adds an API endpoint to let users submit a PATCH for their account. Signed-off-by: David Celis <me@davidcel.is> * Add /api/v1/accounts/update_credentials to the API docs Signed-off-by: David Celis <me@davidcel.is>	2017-04-09 18:33:40 +02:00
Olivier Humbert	082bef3027	French translation update (#1271 ) * Update confirmation_instructions.fr.html.erb consistency across the French translation * Update consistency across the French translation * Update fr.yml a bunch of consistency across the French translation + a few typos * Update doorkeeper.fr.yml consistency across the French translation (punctuation)	2017-04-09 14:55:58 +02:00
spf	e6b48a7048	French typo (#1257 ) * French typo * Datetime french translation	2017-04-09 14:54:47 +02:00
Matt Jankowski	e5282e4ec0	Clean up about page (#1282 ) * Add InstancePresenter to expose site details * Clean up about controller, use instance presenter	2017-04-09 14:47:25 +02:00
Matt Jankowski	71706f21c2	Ignore implied formats for catch all route requests (#1340 ) A request to `/test` would show the custom 404 page, but a request to `/test.test` would return a 404 with an empty body. This change ignores the format on incoming catch all route requests, so that the html 404 page is returned on these requests.	2017-04-09 14:39:41 +02:00
Eugen	d5a675099a	Add env variable to disable prepared statements (#1293 )	2017-04-09 05:46:32 +02:00
Ash Furrow	c3e7bac1cc	Allows setting log level in env variable (#1290 ) * Allows setting log level in env variable. * Made changes based on feedback in #1290.	2017-04-09 01:42:13 +02:00
Eugen	9acdb166e8	Fix #795 , fix #704 , fix #835 - 2FA requires confirmation to be enabled (#1278 ) * Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled TOTP secret is not shown again after 2FA is enabled * Clean up	2017-04-08 22:20:08 +02:00
Thomas Citharel	41f8fde83e	Update french translation (#1148 ) Add french translation for emails sent Signed-off-by: Thomas Citharel <tcit@tcit.fr> Add non-breaking spaces Signed-off-by: Thomas Citharel <tcit@tcit.fr> changes and fixes to the nbsps Signed-off-by: Thomas Citharel <tcit@tcit.fr> French update a few fixes Signed-off-by: Thomas Citharel <tcit@tcit.fr> fixes Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2017-04-08 13:11:16 +02:00
Sebastian Hübner	f860eb7d71	Fixed two translation errors (#1139 ) Changed followers from Follower to Folger and following from Gefolgt to Folgt, to make it identical with the translation in de.jsx	2017-04-08 13:03:11 +02:00
Korbinian	8f9a11b642	Update simple_form.de.yml (#971 )	2017-04-08 13:02:07 +02:00
Jantso Porali	01d8003867	Updated about page in Finnish language (#1170 ) * update faq with default language * update translation for about page * update Minio config Thanks to @Gargon for helping me. I hope this will help others as well * update import and export translation * translate emails to finnish * add finnish translation for emails * add finnish translation for emails * add finnish translation * add missing dot * update finnish language to emails * add finnish translation for emails * add dot and fix typo * updated some minor typos * remove language change due breaking emails And by dev request * updated minio config by dev request * updated about page translation	2017-04-08 12:17:34 +02:00
Olivier Humbert	ed3dfd0bee	French translation update (#1188 ) * Update fr.yml one typo fix * Update simple_form.fr.yml one translation consistency	2017-04-08 12:16:49 +02:00
Shel R	fef478781d	Merge branch 'master' into master	2017-04-07 22:21:21 -04:00
Chad Pytel	ad5ddd5e95	Use I18n for media attachment validation errors These are currently user facing errors, but are not localized. This adds the ability for these messages to be localized.	2017-04-07 14:23:18 -04:00
Eugen	0adee18d73	Merge branch 'master' into feature-customized-default-locale	2017-04-07 13:07:03 +02:00
Jantso Porali	786e6f94b9	Update Finnish translations, add sample Minio config (#954 )	2017-04-07 12:58:12 +02:00
Eugen Rochko	e3a3422a65	Allow setting of default language through config Setting of locale in controller extracted to Localized concern, the doorkeeper authorized applications controller moved under custom namespace with inclusion of Localized, which resolves the "it sometimes appears in a different random language" bug	2017-04-07 12:40:26 +02:00
Eugen	1c351709bc	Force UTF8 encoding on generated XML (#1140 )	2017-04-07 11:09:14 +02:00
André Lewin	bf7cefa516	Merge branch 'master' into master	2017-04-05 20:28:58 +02:00
Eugen Rochko	29ffe1cad3	Make sure Rabl is using Oj	2017-04-05 19:29:30 +02:00
Jantso Porali	837030db98	updated blocking translation	2017-04-05 14:53:35 +02:00
Jantso Porali	deb001bba8	updated two-way auth and preferences translation	2017-04-05 14:49:29 +02:00
Jantso Porali	d3bf0307db	updated translation for about page	2017-04-05 14:47:42 +02:00
JantsoP	20b53e6add	Merge branch 'master' into master	2017-04-05 10:07:17 +02:00
JantsoP	3ec221d3b7	updated reblog to boost translation Since it is that :D	2017-04-05 09:57:25 +02:00
JantsoP	473e4f7813	udpdated display_name translation	2017-04-05 09:52:31 +02:00
JantsoP	b845ef395d	updated reblog translation	2017-04-05 09:51:35 +02:00
Eugen Rochko	667ffafef8	Fix spec	2017-04-05 03:31:26 +02:00
Eugen	086a88f3bb	Merge pull request #863 from Eychics/master Add closed_registrations message on French language	2017-04-05 03:11:13 +02:00
Eugen	e76dd52b08	Merge pull request #818 from JantsoP/master Updated Finnish Translation	2017-04-05 03:09:20 +02:00
Eugen	c12214963e	Merge pull request #866 from kklleemm/patch-1 Fix typos on french translations	2017-04-05 03:06:41 +02:00
Eugen	aa8dacbc8a	Merge pull request #792 from chapeaumeinfreund/master Updated and fixed german orthography	2017-04-05 03:05:50 +02:00
Eugen	ce524cbb49	Merge pull request #790 from chapeaumeinfreund/patch-1 Updated and fixed german orthography	2017-04-05 03:05:31 +02:00
Eugen	117b22e905	Merge pull request #852 from peterkeen/email-whitelist-817 [#817] Add email whitelist	2017-04-05 03:04:58 +02:00
Eugen	57466d542b	Merge pull request #805 from nevillepark/master Changed "reblogs" to "boosts"	2017-04-05 03:00:57 +02:00
Clément D	350958babf	Fix typos on french translations	2017-04-04 19:09:54 +02:00
Thibaut (Eychics)	9a5d6e9715	Add closed_registrations message on French language	2017-04-04 18:58:19 +02:00
Pete Keen	e9a6da6bc7	[#817 ] Add email whitelist This adds the ability to filter user signup with a whitelist instead of or in addition to a blacklist. Fixes #817	2017-04-04 11:20:15 -04:00
Eugen Rochko	5f54981846	New admin setting: open/close registrations, with custom message, from the admin UI	2017-04-04 15:28:12 +02:00
JantsoP	db4a41cf58	Merge branch 'master' into master	2017-04-04 08:41:46 +02:00
JantsoP	dc89fc17cc	updated translation	2017-04-04 08:29:53 +02:00
Neville Park	ce1ca28594	Changed "reblogs" to "boosts"	2017-04-03 17:45:36 -04:00
axolotl	0700521ef3	added Esperanto (eo)	2017-04-03 20:22:50 +02:00
Eugen Rochko	98a93aa07e	Fix norwegian translation being malformed	2017-04-03 19:50:55 +02:00
Korbinian	ec8029a955	Updated and fixed orthography	2017-04-03 19:10:48 +02:00
Korbinian	7dd5ba42a3	Updated and fixed german orthography	2017-04-03 19:01:17 +02:00
Eugen Rochko	b7c1b12367	Make default admin UI page reports. Add admin UI for creating a domain block	2017-04-03 18:55:06 +02:00
Christopher Kolstad	5cb011b66b	Add Norwegian locale	2017-04-03 16:32:03 +02:00
JantsoP	65d667dc6c	another typo. fuck me	2017-04-03 14:56:13 +02:00
JantsoP	d3fde60297	fixed an sneaky peaky tpy	2017-04-03 14:54:53 +02:00
JantsoP	85a8b62ca2	add finnish translation add finnish translation	2017-04-03 14:43:07 +02:00
JantsoP	97803600ed	add finnish translation add finnish translation	2017-04-03 14:20:50 +02:00
JantsoP	bfa99981e5	Merge branch 'master' into master	2017-04-03 13:50:57 +02:00
JantsoP	6501ffdadc	add finnish translation add finnish translation	2017-04-03 13:35:12 +02:00
JantsoP	b0f4c9b91f	finnish translation finnish translation	2017-04-03 13:25:46 +02:00
JantsoP	f9b4f30de6	updated final translation updated final translation	2017-04-03 13:07:09 +02:00
JantsoP	87854745e9	Create new translation file Still in progress. Should be done shortly	2017-04-03 12:42:09 +02:00
Angristan	c97fc5c1f4	Improve french translation	2017-04-03 11:04:00 +02:00
Valentin Lorentz	fbcba65f81	Improve French translation Fix typos and typography. Make vocabulary and grammar more uniform.	2017-04-03 03:16:37 +02:00
Eugen	61894582b8	Merge pull request #746 from eramdam/feature/improve-french-locales Feature/improve french locales (again)	2017-04-03 00:25:56 +02:00
Damien Erambert	71cf9d0608	Fix typo in simple_form.fr.yml	2017-04-02 14:04:06 -07:00
Damien Erambert	5e45982ed9	Improve translation of data import in fr.yml	2017-04-02 14:03:57 -07:00
Damien Erambert	b829460b4a	Better translation for revoked token in doorkeeper.fr.yml	2017-04-02 14:03:41 -07:00
Damien Erambert	65e6a00817	Fix date format in doorkeeper.fr.yml	2017-04-02 14:03:31 -07:00
Eugen	48cb2dccd2	Merge pull request #741 from eramdam/feature/improve-french-locales Improve/add some French locales	2017-04-02 22:22:44 +02:00
Eugen Rochko	5b12624847	Add proper error page for request timeouts	2017-04-02 19:43:44 +02:00
Damien Erambert	cb1989cbd8	Add locale in devise.fr.yml	2017-04-01 23:38:40 -07:00
Damien Erambert	03d676faa8	Add french translation for "scopes" in doorkeeper.fr.yml	2017-04-01 23:35:11 -07:00
Damien Erambert	9e26af264e	Fix small typo in doorkeeper.fr.yml	2017-04-01 23:34:37 -07:00
Damien Erambert	f9f6098e22	Complete localization of in simple_form.fr.yml	2017-04-01 23:26:26 -07:00
Damien Erambert	2c881e6717	Improve french locales on the backend (WIP)	2017-04-01 23:15:49 -07:00
Eugen Rochko	5e26295e06	Fix #700 - hide spoilers on static pages	2017-03-31 13:54:36 +02:00
Eugen Rochko	e8875c6046	Import feature for following/blocking lists (addresses #62 , #177 , #201 , #454 )	2017-03-30 19:42:33 +02:00
Eugen Rochko	f864fee116	Fix up some localizations	2017-03-26 13:22:38 +02:00
leopku	d5d5afff9c	🌐 add simplified chinese language	2017-03-26 14:13:18 +08:00
leopku	fc9bbdfd34	🚧 chinese translation WIP	2017-03-24 19:03:14 +08:00
leopku	349c6cfa2b	🌐 add chinese language file	2017-03-24 18:53:41 +08:00
leopku	c46843c65c	🔧 S3 protocol from ENV add support for reading S3 protocol from ENV also add S3_HOSTNAME in .env.production.sample	2017-03-23 15:44:55 +08:00
Eugen Rochko	d6ed2eb512	Prettier account and stream entry URLs	2017-03-22 19:55:14 +01:00
Eugen Rochko	05cf086766	New API method: /api/v1/search Returns accounts, statuses, hashtags arrays	2017-03-22 02:32:27 +01:00
Eugen Rochko	8803ca9efe	Improved landing page	2017-03-21 19:18:37 +01:00
Eugen Rochko	6b1db5c2b2	Add landing strip	2017-03-20 03:36:29 +01:00
Eugen Rochko	56d998cbdb	Export follow/block lists as CSV	2017-03-19 20:29:41 +01:00
Eugen Rochko	2816b1bf8e	Federate header images, fix open-uri http->https redirection error	2017-03-18 22:51:20 +01:00
shel	38dceb3bf7	Promote Apps (#670 ) "Various apps are available" is now a hyperlink	2017-03-17 16:16:39 +01:00
Eugen Rochko	6be7bde243	Fix #525 - Add instance information API	2017-03-15 23:12:48 +01:00
Eugen	e245115f47	Merge branch 'master' into mastodon-site-api	2017-03-15 22:55:22 +01:00
Eugen Rochko	02349b3269	Obfuscate filenames better, double rate limits	2017-03-14 15:59:21 +01:00
Eugen Rochko	1fb3e8988b	Revert earlier fix due to new bug reports	2017-03-06 02:25:41 +01:00
Eugen Rochko	ebc01bf0f6	Make the paperclip filename interpolator smarter about the :original style If an :original gets converted into another format, it would get saved as original_filename anyway, so generating the extension is pointless and yields bad results for when you change the style definition later. This way, old gifs will still have correct URLs	2017-03-05 23:03:49 +01:00
Eugen Rochko	85fce04d1b	Detect videos with no sound, handle them like gifv	2017-03-05 22:55:24 +01:00
Eugen Rochko	5f4e402204	Improved /api/v1/accounts/:id/statuses with new params: only_media, exclude_replies Redirect /:username to /users/:username Redirect /:username/:id to /users/:username/updates/:id Updated API documentation and sponsors	2017-03-05 17:27:17 +01:00
Eugen Rochko	caf5b8e975	Fix #431 - convert gif to webm during upload. Web UI treats them like it did before. In the API, attachments now can be either image, video or gifv. Gifv is to be treated like images in terms of behaviour, but are videos by file type.	2017-03-04 23:02:24 +01:00
Eugen Rochko	6b81d10030	Add digest e-mails	2017-03-04 00:00:48 +01:00
Kit Redgrave	442fdbfc53	Mute button progress so far. WIP, doesn't entirely work correctly.	2017-03-01 22:31:21 -06:00
Kibigo	620f70e42c	Adds site metadata access to the API	2017-02-27 04:06:25 -08:00
Eugen Rochko	175a9b9caa	Fix #104 - Style OAuth authorized applications page Add ability to search accounts by display name	2017-02-27 00:15:00 +01:00
Eugen Rochko	9d4cad6307	Improve glow	2017-02-23 02:14:35 +01:00
Eugen Rochko	8132cf8153	Add GET /api/v1/accounts/:id/statuses/media that returns only statuses with media attachments Make replies default to privacy settings of the status being replied to	2017-02-17 01:30:24 +01:00
Eugen Rochko	d0f087db2d	Add UI to view report details, remove reported statuses, quick links to resolve/silence/suspend from report	2017-02-17 00:42:52 +01:00
Eugen Rochko	24ba7c9762	Adding index overview for reports in admin UI	2017-02-16 02:28:10 +01:00
Eugen Rochko	ff49649130	Expose Link headers via CORS	2017-02-15 23:26:17 +01:00
Eugen Rochko	5426f06ac2	Fix admin UI for accounts somewhat	2017-02-15 00:22:58 +01:00
Eugen Rochko	3b81baaaaf	Adding POST /api/v1/reports API, and a UI for submitting reports	2017-02-14 20:59:26 +01:00
Eugen Rochko	63886bdc59	Fix #587 - Display TOTP secret next to QR code	2017-02-13 20:56:03 +01:00
Eugen Rochko	138d21aea8	Update service timeout setting from 15s to 90s	2017-02-13 20:42:02 +01:00
Eugen Rochko	0518492158	Stop trying to shoehorn all Salmon updates into the poor database-connected StreamEntry model. Simply render Salmon slaps as they are needed	2017-02-12 01:19:14 +01:00
Eugen Rochko	d2619e0b53	Site title is now a setting	2017-02-10 22:37:11 +01:00
shel	2d6f603c2b	Add link to other instances text Text for link to other instances	2017-02-10 13:08:47 -05:00
Eugen	9d5fb49cd8	Merge pull request #603 from evanminto/activitypub-account Expose ActivityStreams 2.0 representation of accounts	2017-02-07 02:08:40 +01:00
Eugen Rochko	347a153b3d	Add API modifiers to limit returned toots from public/hashtag timelines to only those from local users; Add link to "extended information" to getting started in the UI; Add defaults for posting privacy; Change how publish button looks depending on posting privacy chosen	2017-02-06 23:16:20 +01:00
Evan Minto	94e213c6c1	Reuse existing controller and route	2017-02-06 01:19:26 -08:00
Eugen Rochko	77e13c2bc9	Removing failed push notification API, make context loads use cache	2017-02-05 17:51:44 +01:00
Eugen Rochko	19b9e1e2c3	Preheat status cache	2017-02-05 17:24:18 +01:00
Evan Minto	8bd8ea7c04	Remove unnecessary leftover code	2017-02-04 14:49:24 -08:00
Evan Minto	e2fbf8bc74	Add an account endpoint for ActivityPub and link to it on HTML profile pages	2017-02-04 14:46:23 -08:00
Eugen Rochko	ccb8ac8573	Make the streaming API also handle websockets (because trying to get the browser EventSource interface to work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead of ActionCable like before. This means that if you are upgrading, you should set that up beforehand.	2017-02-04 00:34:31 +01:00
Eugen Rochko	d9ca46b464	Cleaning up format of broadcast real-time messages, removing redis-backed "mentions" timeline as redundant (given notifications)	2017-02-02 00:03:31 +01:00
Eugen Rochko	1da0ce5c7c	Looks like log level :debug is required for activerecord times to be tracked	2017-02-01 12:13:16 +01:00
Eugen Rochko	65402d9c09	Fix activerecord logging in production	2017-02-01 11:34:50 +01:00
Eugen Rochko	c2fbd144cf	Add "open in web" link to detailed public status pages	2017-01-30 23:01:37 +01:00
Eugen Rochko	a2a85e8549	Add capistrano to development environment	2017-01-30 20:03:17 +01:00
Eugen Rochko	3f075c7794	API for apps to register for push notifications	2017-01-29 01:30:32 +01:00
Eugen Rochko	23b997ae55	Split 2FA login into two prompts	2017-01-28 20:43:38 +01:00
Eugen Rochko	f4bc9620a9	Update settings to re-use admin layout, one big navigation tree, improve settings forms	2017-01-28 03:56:10 +01:00
Eugen Rochko	76e970c856	Do not automatically login after password reset, as it would circumvent two-factor auth (if enabled) Do not require e-mail address changes to be re-confirmed, it's only trouble for no real benefit	2017-01-27 20:35:16 +01:00
Eugen Rochko	ba192f12e3	Added optional two-factor authentication	2017-01-27 20:35:16 +01:00
Eugen Rochko	f6a5977f0b	Fix key names in statsd	2017-01-26 19:46:52 +01:00
Eugen Rochko	d567f21d4f	Improve StatsD instrumentation	2017-01-26 19:08:05 +01:00
Eugen Rochko	7329fbd8a4	Fix up timeout, improve contrast on "show more", add responsive style for extremely wide monitors	2017-01-26 18:48:56 +01:00
Eugen Rochko	cc5c1e5feb	Removed accidental n+1 query from notifications, updated some deps, improved how "show more" link looks	2017-01-26 14:52:07 +01:00
Effy Elden	07b9a10d4d	Add redirect for /admin => /admin/settings	2017-01-26 18:59:35 +11:00
Eugen Rochko	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
Eugen Rochko	f392030ab8	Add /api/v1/notifications/clear, non-existing link cards for statuses will now return empty hash instead of throwing a 404 error. When following, merge into timeline will filter statuses	2017-01-23 21:09:27 +01:00
Eugen	956da43e19	Fix error	2017-01-22 23:07:31 +01:00
Eugen Rochko	61aee0006e	Override Rack::Request to use the same trusted proxy settings as Rails	2017-01-22 21:01:28 +01:00
Eugen Rochko	67befe5463	Allow to specify trusted proxies through env	2017-01-22 20:35:49 +01:00
Eugen Rochko	e028406db4	Fix code style	2017-01-21 22:19:13 +01:00
Eugen Rochko	d72dd38c13	Merge branch 'master' of https://github.com/ineffyble/mastodon into ineffyble-master	2017-01-21 22:15:22 +01:00
Eugen Rochko	3a4b5961be	Method to fetch a single notification	2017-01-21 22:14:13 +01:00
Effy Elden	5fef55c11a	Set remote dev environments to use letter_opener_web, add default .env.vagrant variables	2017-01-21 20:22:49 +11:00
Eugen Rochko	f0de621e76	Fix #463 - Fetch and display previews of URLs using OpenGraph tags	2017-01-20 01:00:14 +01:00
Eugen Rochko	f051c2e813	Fix statsd null backend not being initialized properly	2017-01-19 09:37:07 +01:00
Eugen Rochko	306eb6e9c9	Add optional StatsD performance tracking	2017-01-18 23:44:29 +01:00
Eugen Rochko	fcb5a85cdd	Add sounds for notifications. Boop by @jk@mastodon.social	2017-01-17 20:09:03 +01:00
Effy Elden	ab4f5f5da5	Add Heroku deployment support	2017-01-17 22:00:03 +11:00
Eugen	16f9490d33	Merge pull request #476 from ineffyble/fix-paperclip-s3-acl Fix S3 default settings	2017-01-15 14:29:47 +01:00
Eugen Rochko	e9737c2235	Fix tests, add applications to eager loading/cache for statuses, fix application website validation, don't link to app website if website isn't set, also comment out animated boost icon from #464 until it's consistent with non-animated version	2017-01-15 14:01:33 +01:00
Effy Elden	a097dd489b	Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read'	2017-01-15 20:58:46 +11:00
Effy Elden	e45fed58cb	Add a textual 'Back to Mastodon' link in footer of settings pages	2017-01-15 11:03:35 +11:00
Eugen Rochko	c01dd089ff	Adding about/more page with extended information that can be set up by an admin	2017-01-13 20:16:38 +01:00
Eugen Rochko	e25170f960	Add extended about page stub	2017-01-13 03:24:41 +01:00
Eugen Rochko	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
Eugen	4292cf60ae	Fix env variable name	2017-01-10 22:01:13 +01:00
Eugen Rochko	75f80bef10	Persist UI settings, add missing localizations for German	2017-01-09 14:00:55 +01:00
Eugen Rochko	2e71bb031b	Fix Paperclip timeout setting. Fix bug introduced in #437	2017-01-08 19:12:54 +01:00
Eugen Rochko	7ddec6e7c3	Add read timeout to paperclip when it's downloading remote images	2017-01-07 15:43:56 +01:00
Jessica Stokes	bb033c1d37	"Reblog" -> "boost" in more places A couple of places were using "reblog" rather than "boost" - this updates them to match the web UI	2017-01-04 18:00:50 -08:00
Eugen Rochko	2b0b7ff1b8	Fix #385 - /web now loads a page	2017-01-04 15:35:36 +01:00
Eugen Rochko	8f47f6a7ec	Adding remote follow button	2017-01-01 19:54:34 +01:00
Eugen Rochko	a302e56f9a	Add API for retrieving favourites	2016-12-29 20:33:26 +01:00
Eugen Rochko	49834a6e7f	Add API for retrieving blocked accounts	2016-12-29 20:12:32 +01:00
Eugen Rochko	d7dc84439c	Add ability to use remote follow function on other sites	2016-12-29 16:54:54 +01:00
Eugen Rochko	eca6110fc4	Add preferences for follow request notification e-mails	2016-12-26 22:04:16 +01:00
Eugen Rochko	2146ac91a0	Follow requests send e-mail notifications, but are excluded from notifications API Better initial state for unlisted/nsfw toggles	2016-12-26 21:52:03 +01:00
Eugen Rochko	3689c119f0	Replacing follow requests in the settings area with in-UI column	2016-12-26 21:33:51 +01:00
Eugen Rochko	004382e4d0	Adding follow requests API	2016-12-26 19:30:45 +01:00
Eugen Rochko	b302b9202b	Add page for authorizing/rejecting follow requests	2016-12-23 00:04:52 +01:00
Eugen Rochko	3c841c7306	Adjust wording	2016-12-22 23:24:46 +01:00
Eugen Rochko	05b13c38b5	Re-enable Webfinger for locked accounts but don't handle "follow" events coming in via Salmon. Currently no way to prevent remote follows, but they will only receive public and unlisted posts	2016-12-22 23:17:57 +01:00
Eugen Rochko	b891a81008	Follow call on locked account creates follow request instead Reflect "requested" relationship in API and UI Reflect inability of private posts to be reblogged in the UI Disable Webfinger for locked accounts	2016-12-22 23:03:57 +01:00
Eugen Rochko	2d2154ba75	Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users	2016-12-22 21:34:19 +01:00
Eugen Rochko	6d71044c85	Don't use rack timeout in any but production environments	2016-12-21 19:10:40 +01:00
Eugen Rochko	e09d3a2c66	Fix #249 - use window.location hack to let people login from sandboxed iOS homescreen	2016-12-21 00:13:13 +01:00
Eugen	6b67b55cee	Merge pull request #356 from victorhck/master added two missings spanish translations	2016-12-18 21:22:46 +01:00
Eugen Rochko	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
Eugen Rochko	aed25932b5	Add OEmbed iframe HTML, convert emojis on public pages, increase size of attachment thumbnails	2016-12-18 15:20:39 +01:00
Eugen Rochko	6de079a5af	Removing external hub completely, fix #333 fixing digit-only hashtags, removing web app capability from non-webapp pages	2016-12-18 12:24:37 +01:00
victorhck	f5c8d64b6d	added to missings spanish translations	2016-12-14 18:43:00 +01:00
Eugen Rochko	76ec907993	Improved admin UI	2016-12-13 13:42:10 +01:00
Eugen Rochko	0c491ea928	Fix translations	2016-12-09 11:52:09 +01:00
Stanislav Makar	d2ab41aea4	Declare Ukrainian Closes: #345	2016-12-08 18:57:58 +02:00
Vladyslav	2c6c912076	Fix some translation errors.	2016-12-07 21:13:57 +02:00
Vladyslav	d85c566960	Final steps for Ukrainian translation	2016-12-07 20:39:22 +02:00
Eugen Rochko	8b93f45f3d	Fix paperclip config	2016-12-07 17:19:29 +01:00
Eugen Rochko	f114bc7bb7	Update Paperclip config to allow plugging in Minio instead of AWS	2016-12-07 16:59:18 +01:00
Eugen Rochko	f978b06dd1	Add suspend account functionality to admin UI	2016-12-06 18:22:59 +01:00
Eugen Rochko	1357c1cb3d	Add single user mode	2016-12-06 17:19:26 +01:00
Eugen	a910cdd54d	Merge pull request #338 from stamak/uk.yml Add Ukrainian localization file uk.yml	2016-12-05 12:30:07 +01:00
Stanislav Makar	0e18bbe3e2	Add Ukrainian localization file uk.yml Closes: #337	2016-12-05 07:40:45 +02:00
Eugen Rochko	b362de2232	Adding configurable e-mail blacklist	2016-12-04 19:07:02 +01:00
Eugen Rochko	9d9f796130	Adding more to admin accounts UI	2016-12-04 18:10:40 +01:00
Eugen Rochko	f763e844e8	Do not use expiring links after all	2016-12-04 13:02:43 +01:00
Eugen Rochko	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
Eugen Rochko	290ffb63cd	Fix cloudfront config	2016-12-03 22:12:22 +01:00
Eugen Rochko	d3bd10dfe4	Add Cloudfront support	2016-12-03 22:08:15 +01:00
Stanislav Makar	ea91286aaa	Add Ukrainian localization file doorkeeper.uk.yml Closes: #334	2016-12-03 09:46:26 +02:00
Andrea Faulds	1c1102008f	Fix line endings for Portuguese locale	2016-12-01 17:27:47 +00:00
Eugen Rochko	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
unsmell	66e55d60e1	Create pt localisation files in /config/locales/	2016-11-30 23:04:53 -01:00
Eugen Rochko	6ff93845d5	Add basic OEmbed provider API, fix #247	2016-11-30 23:01:03 +01:00
Eugen Rochko	14bd46946d	Per-status control for unlisted mode, also federation for unlisted mode Fix #233, fix #268	2016-11-30 21:34:59 +01:00
Eugen Rochko	356d3874eb	Normalize localizations, add stub for admin/accounts	2016-11-30 15:32:26 +01:00
Eugen Rochko	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
Eugen Rochko	cc70f28f19	Adding rack timeout of 30sec, PuSH jobs moved to push queue so they can be processed separately	2016-11-29 02:07:14 +01:00
Eugen Rochko	c0555f2db6	Don't rate-limit PuSH endpoints	2016-11-29 00:44:11 +01:00
Eugen Rochko	4e351baf88	Fix URLs in inline-rendered XML	2016-11-29 00:26:01 +01:00
Eugen	41ef277da3	Fix URLs in ApplicationController.renderer	2016-11-28 21:21:05 +01:00
Eugen Rochko	27fc49d745	Add simple admin overview of PuSH subscriptions	2016-11-28 18:45:13 +01:00
Eugen Rochko	66ab0d0d56	Enabling portuguese and hungarian translations, which are awfully incomplete	2016-11-28 13:55:03 +01:00
Eugen Rochko	2d2c81765b	Adding embedded PuSH server	2016-11-28 13:36:47 +01:00
Eugen	26287b6e7d	Merge pull request #275 from kodacs/master Hungarian translation for Mastodon.	2016-11-26 18:33:48 +01:00
Eugen Rochko	6c82dfcf5f	Fix CDN_HOST variable requirement	2016-11-26 15:27:05 +01:00
Eugen Rochko	dda9ac9222	Fix reset date format when rate limited	2016-11-25 18:20:47 +01:00
kodacs	b503a5e05e	#275 fix missing i18n item	2016-11-25 14:56:28 +01:00
kodacs	7bd559158b	fixing yamls for #275	2016-11-25 13:57:37 +01:00
kodacs	6586408c69	fix #275	2016-11-25 13:35:08 +01:00
nicolas	959e4b8198	Merge branch 'master' into french-translation	2016-11-25 13:33:00 +01:00
nicolas	9bb885805c	Update simple_form.fr.yml	2016-11-25 13:30:52 +01:00
Eugen Rochko	1ff0d5aea6	Normalized locale files	2016-11-25 13:15:07 +01:00
Eugen	1c9e21a507	Merge pull request #273 from nclm/french-translation French localisation update	2016-11-25 13:14:30 +01:00
Eugen Rochko	71401659b8	Fix #65 - Options to block notifications from people you don't follow/who don't follow you	2016-11-25 13:13:16 +01:00
kodacs	eb3a12bba6	Server side HU translation + Toot fix.	2016-11-25 12:43:23 +01:00
nicolas	d0122045f4	Update simple_form.fr.yml	2016-11-25 09:25:31 +01:00
nicolas	4cc6684881	Update fr.yml	2016-11-25 09:25:29 +01:00
Eugen Rochko	8efa081f21	Remove Neo4J	2016-11-24 23:46:27 +01:00
Eugen Rochko	8e34bed7cc	Mini Profiler not working well, remove it	2016-11-24 19:59:11 +01:00
Eugen Rochko	4f1d863615	Only distribute statuses to followers who signed in in the last 2 weeks, add rake task for clearing feeds of inactive users	2016-11-24 18:17:58 +01:00
nicolas	23677bc51e	Merge branch 'master' into french-translation	2016-11-23 15:43:27 +01:00
nicolas	1e95fbb10b	Update doorkeeper.fr.yml e	2016-11-23 14:47:41 +01:00
nicolas	94f96a6e85	Update doorkeeper.fr.yml	2016-11-23 14:45:31 +01:00
Eugen Rochko	fc90d38893	Moving some counter queries out of subqueries in the API	2016-11-22 22:59:54 +01:00
Eugen Rochko	4a422650bb	Fix broken locales	2016-11-22 11:34:36 +01:00
nicolas	82cb34916a	Update fr.yml	2016-11-22 10:39:15 +01:00
nicolas	ba4c03de71	Update simple_form.fr.yml silenced mode + edits	2016-11-22 10:32:43 +01:00
nicolas	89dab7c534	Merging code updates (Unlisted Mode)	2016-11-22 10:25:17 +01:00
Eugen Rochko	1788164352	Local accounts can control "silenced" attribute which removes them from public timeline	2016-11-21 23:06:41 +01:00
nicolas	64cfbbcc55	Adding French locale	2016-11-21 22:46:59 +01:00
nicolas	46d9076e99	Importing doorkeeper.fr.yml From https://github.com/doorkeeper-gem/doorkeeper-i18n/blob/master/rails/locales/fr.yml	2016-11-21 22:39:20 +01:00
nicolas	12e9f789ab	Importing devise.fr.yml From https://gist.github.com/qsypoq/4cf3b858ff8242ffb013	2016-11-21 22:34:50 +01:00
Eugen Rochko	7944ed6fe5	Adding option to specify asset server, filter followers query by local accounts during Fan Out On Write to load less stuff into memory	2016-11-21 22:04:10 +01:00
nicolas	a3afea7b9d	First version for simple_form.fr.yml	2016-11-21 21:30:13 +01:00
nicolas	fc87243c39	First version for fr.yml	2016-11-21 21:25:27 +01:00
nicolas	05823c325c	Create devise.fr.yml	2016-11-21 20:59:41 +01:00
nicolas	753115ff57	Create doorkeeper.fr.yml	2016-11-21 20:59:13 +01:00
nicolas	8504110d45	Create simple_form.fr.yml	2016-11-21 20:58:43 +01:00
nicolas	e9980a9b8b	Create fr.yml	2016-11-21 20:57:28 +01:00
Eugen Rochko	db58235930	Fixes for the Spanish translation	2016-11-21 11:05:11 +01:00
Eugen Rochko	38dd85daab	Adding notifications column	2016-11-20 19:39:58 +01:00
Eugen Rochko	da2ef4d676	Adding unified streamable notifications	2016-11-20 19:39:58 +01:00
Victorhck	c12125e6b5	improvements in text made by Ekaitz	2016-11-20 00:52:06 +01:00
Victorhck	0b48973733	fix typos, and suggestions made by Ekaitz	2016-11-20 00:50:45 +01:00
Eugen Rochko	8977fde8ed	Fix up Spanish translations	2016-11-19 22:05:26 +01:00
Victorhck	d68750d7dc	Finished spanish translation config files	2016-11-19 18:40:03 +01:00
Eugen	93e47c7135	Fix wrong language declaration	2016-11-19 18:31:36 +01:00
Eugen	5cda7f6bbb	Fix wrong language declaration	2016-11-19 18:31:21 +01:00
victorhck	a6ed09441c	finished spanish translation config files	2016-11-19 17:45:45 +01:00
Eugen Rochko	c7a1b78536	Activating Spanish i18n	2016-11-19 00:10:47 +01:00
Victorhck	367b05d733	Spanish translation for devise.es.yml	2016-11-18 23:57:03 +01:00
Victorhck	a05fe70c24	finished spanish translation for es.yml	2016-11-18 23:04:26 +01:00
victorhck	084668c170	started sp translations config locales	2016-11-18 20:39:40 +01:00
Eugen Rochko	85d1b74ac3	Adding german localization	2016-11-18 15:53:46 +01:00
Eugen Rochko	116ab27e08	i18n for devise mailer too	2016-11-16 18:25:21 +01:00
Eugen Rochko	2c766bd4b4	Add user locale setting	2016-11-16 17:56:31 +01:00
Eugen Rochko	546c4718e7	Localizations for most server-side strings	2016-11-16 00:55:33 +01:00
Eugen Rochko	3ce6ac0ce2	Adding some localizations	2016-11-15 23:02:57 +01:00
Eugen Rochko	fdc17bea58	Fix rubocop issues, introduce usage of frozen literal to improve performance	2016-11-15 16:56:29 +01:00
Eugen Rochko	d42ed78aa4	Fix #110 - Make web UI use browser history, change links in e-mails to link to that	2016-11-13 14:02:34 +01:00
Eugen Rochko	09218d4c01	Use full-text search for autosuggestions	2016-11-12 14:36:10 +01:00
Eugen Rochko	ff229aa978	Fix #141 - Add "Server: Mastodon" header to responses	2016-11-10 23:34:33 +01:00
Eugen Rochko	448ab18a20	Replace setting custom CORS headers with rack-cors, set it on /oauth/token endpoint	2016-11-09 18:06:01 +01:00
Eugen Rochko	b13e7dda1f	API pagination for all collections using Link header	2016-11-09 17:48:44 +01:00
Eugen Rochko	9aecc0f48a	Move timelines API from statuses to its own controller, add a check for resources that require a user context vs those that don't (such as public timeline) /api/v1/statuses/public -> /api/v1/timelines/public /api/v1/statuses/home -> /api/v1/timelines/home /api/v1/statuses/mentions -> /api/v1/timelines/mentions /api/v1/statuses/tag/:tag -> /api/v1/timelines/tag/:tag	2016-11-08 23:29:08 +01:00
Eugen Rochko	86574ea524	Adding Emoji One	2016-11-08 21:46:29 +01:00
Eugen Rochko	2f21f4cc01	Fix region setting for AWS gem	2016-11-08 18:55:46 +01:00
Eugen Rochko	dbe00a4156	Improved configuration from ENV, cleaned up timeline filter methods to be more readable, add extra logging to process feed service	2016-11-07 23:20:52 +01:00
Eugen Rochko	b835f4aa1c	Fix insecure S3 URLs	2016-11-06 20:59:06 +01:00
Eugen Rochko	d14967e1c8	Fix URL configuration when S3 is enabled	2016-11-06 20:43:16 +01:00
Eugen Rochko	45230c56ab	Improve S3 config	2016-11-06 18:55:20 +01:00
Eugen Rochko	3ab193bc3f	Adding optional S3, fail-mastodon	2016-11-06 18:35:46 +01:00
Eugen Rochko	48b9619439	Adding hashtags	2016-11-05 17:13:14 +01:00
Eugen Rochko	6471a548fe	Add pghero for analyzing postgres performance in production	2016-11-04 18:35:04 +01:00
Eugen Rochko	829d189f44	Add tests for recently added API end points	2016-11-03 18:53:37 +01:00
Eugen Rochko	e4671adc25	Fix reblogged/favourited caching; add API endpoints for who favd/reblogged status	2016-11-03 14:50:22 +01:00
Eugen Rochko	e7723ab662	Add puma preloading, decrease DB pool size to size of threads per worker	2016-11-02 16:38:54 +01:00
Eugen Rochko	53fb7b1aa8	Replace in-memory cache store with redis store, should decrease memory footprint of each running process by 128mb	2016-11-02 13:30:52 +01:00
Eugen Rochko	a59d10d3df	Fix missing default headers	2016-11-02 13:12:18 +01:00
Eugen Rochko	9467b900a2	Make cookies https-only if LOCAL_HTTPS is true, set X-Frame-Options to DENY, add permissive CORS to API controllers	2016-11-02 12:58:15 +01:00
Eugen Rochko	dd03118098	Fix follow icon changing plus to minus, add terms page stub	2016-11-01 18:05:55 +01:00
Eugen Rochko	e0a197650a	Adding common followers API, fixing fallback query again	2016-10-29 01:29:19 +02:00
Eugen Rochko	720d1f8f3d	Restrict access to oauth/applications to admins only	2016-10-23 12:08:52 +02:00
Eugen Rochko	a9e40a3d80	Adding OAuth access scopes, fixing OAuth authorization UI, adding rate limiting to the API	2016-10-22 19:39:44 +02:00
Eugen Rochko	43df35213e	Improving all forms	2016-10-18 16:37:15 +02:00
Eugen Rochko	d5e086a47b	Adding application/jrd+json webfinger resource	2016-10-18 02:54:49 +02:00
Eugen Rochko	dd02fc0ec4	More debugging	2016-10-18 01:22:28 +02:00
Eugen Rochko	6611e3a2ef	More debugging	2016-10-18 00:59:18 +02:00
Eugen Rochko	4baca34a45	Do not compress JS (perhaps it removes source maps, needed for debugging)	2016-10-18 00:48:40 +02:00
Eugen Rochko	c9a7e6e1e3	Enable source maps	2016-10-18 00:36:01 +02:00
Eugen Rochko	e21a3fe0cd	Adding sync of follow relationships to Neo4J, accounts/suggestions API	2016-10-14 23:10:07 +02:00
Eugen Rochko	7a6d95f70c	E-mail preferences page	2016-10-14 02:28:49 +02:00
Eugen Rochko	1f650d327d	Adding public timeline	2016-10-07 16:00:11 +02:00
Eugen Rochko	3554d638b3	Fix #72 - add follow/unfollow button to public profiles	2016-10-06 21:27:58 +02:00
Waldir Pimenta	4f654eb822	use consistent capitalization for subject lines	2016-10-06 11:16:59 +01:00
Yann Vaillant	038a407b9e	Update default devise wording to include reference to Mastodon Fix #68	2016-10-06 07:45:07 +02:00
Eugen Rochko	fe77921e47	Catching more exceptions that slipped through, removing AR logging from production as it's very verbose and not very useful	2016-10-05 13:26:44 +02:00
Eugen Rochko	7b9a4af311	API for blocking and unblocking	2016-10-03 18:17:06 +02:00
Eugen Rochko	fc198a8b4c	Adding e-mail confirmations	2016-10-03 16:51:00 +02:00
Eugen Rochko	d74da1a89a	Small fixes	2016-10-02 23:46:25 +02:00
Eugen Rochko	f06f295890	Fix doorkeeper skip_authorization	2016-10-02 22:55:09 +02:00
Eugen Rochko	6d7290f47c	Add API for getting info about authenticated user: /api/v1/accounts/verify_credentials	2016-10-02 16:14:21 +02:00
Eugen Rochko	4909bbf415	Add logging for outgoing http requests	2016-10-02 14:58:06 +02:00
Eugen Rochko	492224b93f	Allow non-https redirect URIs for OAuth apps (AndStatus seems to require this)	2016-09-30 22:40:31 +02:00
Eugen Rochko	e63aebff7a	Adding landing page	2016-09-27 23:12:33 +02:00
Eugen Rochko	4f9b7432dd	Fix #52 - Add API versioning (v1)	2016-09-27 16:59:08 +02:00
Eugen Rochko	7e14eefc81	Replace logo, fix #57 - delete/unreblog/unfavourite API, fix #45 - app registration API	2016-09-26 23:56:53 +02:00
Eugen Rochko	3b56350121	Fix #6 - Rate limit GET reqs to 300/5min, POST to 100/5min	2016-09-24 13:53:54 +02:00
Eugen Rochko	e46abc71ca	Fix notifications in UI, added new API for fetching account relationships	2016-09-21 22:07:18 +02:00
Eugen Rochko	bd5ad304ba	Adding media controller, 1 webm/compose form allowed, previews generated	2016-09-17 17:47:26 +02:00
Eugen Rochko	5b0cef9781	Setting up preliminary "detailed" routes in the UI, new API end-point for fetching status context	2016-09-16 00:21:51 +02:00
Eugen Rochko	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
Eugen Rochko	509c18eb13	Fix local follows, 404 in logs	2016-09-08 02:40:51 +02:00
Eugen Rochko	0f4bc56719	Improving production logs, removing n+1 on media attachments in atom, adding attachments display to static views	2016-09-08 01:24:26 +02:00
Eugen Rochko	eec0dc46a6	PostStatusService can attach media to status, ProcessFeedService likewise	2016-09-05 18:39:53 +02:00
Eugen Rochko	ae1fac0062	Add API to upload media attachments	2016-09-05 17:46:36 +02:00
Eugen Rochko	413e700fe0	Enhancing test suite but I think the problem might have been caching setting	2016-09-05 01:26:08 +02:00
Eugen Rochko	1022d682dc	Normalized data in Redux, fix for asset URLs when rendered outside request	2016-09-04 14:04:26 +02:00
Eugen Rochko	92afd29650	The frontend will now be an OAuth app, auto-authorized. The frontend will use an access token for API requests Adding better errors for the API controllers, posting a simple status works from the frontend now	2016-08-26 19:12:19 +02:00
Eugen Rochko	44e57f64dd	Improving statuses, adding a composer drawer, which doesn't work yet	2016-08-25 19:52:55 +02:00
Eugen Rochko	bc0692d75b	Removing mini-profiler that doesn't work, formatting timelines a bit better	2016-08-24 19:23:37 +02:00
Eugen Rochko	49520d6e62	Adding React.js, Redux, revamping dashboard	2016-08-24 17:56:44 +02:00
Eugen Rochko	68c93f8b85	Final fix for ActionCable origin issues	2016-08-18 18:51:50 +02:00
Eugen Rochko	8985f8e66c	Fixing more configuration issues with ActionCable	2016-08-18 18:39:35 +02:00
Eugen Rochko	5a8c149f6b	Fix ActionCable origin checking	2016-08-18 18:08:25 +02:00
Eugen Rochko	8459acd123	Fix for force SSL issue with websockets	2016-08-18 17:48:57 +02:00
Eugen Rochko	6426819b6f	Fix tests	2016-08-18 17:22:44 +02:00
Eugen Rochko	6deb9f966e	Live timelines using ActionCable	2016-08-18 15:49:51 +02:00
Eugen Rochko	10ba09f546	Upgrade to Rails 5.0.0.1	2016-08-17 17:58:00 +02:00
Eugen Rochko	6c480c8429	Oops, typo	2016-03-26 13:52:40 +01:00
Eugen Rochko	85b00d19b8	Moving Salmon notifications to background processing, fixing mini-profiler behaviour with Turbolinks enabled, optimizing Rabl for production	2016-03-26 13:42:10 +01:00
Eugen Rochko	5764d52b04	Fix Sidekiq pooling issues. Remove API docs from homepage, replace with a basic home timeline	2016-03-25 16:10:14 +01:00
Eugen Rochko	bb98ee489d	Up the number of pooled DB connections to cover both Sidekiq and Puma workers	2016-03-25 15:10:34 +01:00
Eugen Rochko	318886287b	Fixing some stuff for Turbolinks, adding gzip on top, fixing a n+1 query	2016-03-25 15:09:40 +01:00
Eugen Rochko	36f3da3cde	Adjust down the number of Sidekiq threads to 5 (default of 25 is way too high)	2016-03-25 14:20:31 +01:00
Eugen Rochko	e24bfbde1a	Fixing FanOutOnWriteService, fixing Sidekiq not having enough DB connections in the pool, adding a throttle of 60rpm per IP, adding mini profiler, adding admin status to users	2016-03-25 14:12:24 +01:00
Eugen Rochko	42dcb0d4cb	Adding Sidekiq for background processing (firstly just of mailers)	2016-03-25 02:50:48 +01:00
Eugen Rochko	f14f462eaf	Adding Turbolinks, adding status posting form on homepage	2016-03-21 18:26:47 +01:00
Eugen Rochko	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
Eugen Rochko	253ab26520	Adding more tests for helpers	2016-03-20 13:50:22 +01:00
Eugen Rochko	b640f35621	Writing out more tests, fixed some bugs	2016-03-20 13:03:06 +01:00
Eugen Rochko	e2b846f630	Adding letter opener for development and Rack::Attack for future rate limiting implementations	2016-03-19 14:57:30 +01:00
Eugen Rochko	71ae4dd3d2	Adding public following and followers pages, fix #3	2016-03-19 14:02:30 +01:00
Eugen Rochko	9cb690c706	Access tokens no longer expire, case-insensitive local username validation, as well as case-insensitive Webfinger look-up	2016-03-16 18:29:52 +01:00
Eugen Rochko	48d66a2055	Fixing the docker container setup (with assets compilation &co)	2016-03-16 12:57:01 +01:00
Eugen Rochko	2c374cd97c	Adding e-mail configuration	2016-03-16 12:13:40 +01:00
Eugen Rochko	b17202ca0f	Adding a docker-compose template for running Mastodon easily	2016-03-14 21:39:39 +01:00
Eugen Rochko	6fec8afc3f	Bind oauth applications to users	2016-03-14 17:49:13 +01:00
Eugen Rochko	3441361568	Adding simple_form, adding profile settings, header image	2016-03-12 20:47:22 +01:00
Eugen Rochko	1aa477ac2f	Customized more doorkeeper views, only logged in users can create oauth apps	2016-03-12 19:46:06 +01:00
Eugen Rochko	aab9f57e36	Adding config for puma, dashboard layout, fixing some queries	2016-03-12 16:21:53 +01:00
Eugen Rochko	447cfef62d	Improving feed queries, switching API to doorkeeper authentication	2016-03-11 16:47:36 +01:00
Eugen Rochko	b919f39b31	Customizing doorkeeper views for authorizing app	2016-03-11 01:58:55 +01:00
Eugen Rochko	6c4c84b161	Distrubute statuses as a fan-out-on-write system, with optional precomputing	2016-03-08 20:20:45 +01:00
Eugen Rochko	fe57f6330f	API methods for retrieving home and mentions timelines	2016-03-07 13:25:26 +01:00
Eugen Rochko	f099bc6091	Adding API for favouriting a status	2016-03-07 12:58:42 +01:00
Eugen Rochko	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
Eugen Rochko	c605b828b5	Adding routes to follow, unfollow, favourite and reblog (locally known models)	2016-03-06 12:51:55 +01:00
Eugen Rochko	6045b6cb18	Customizing devise views and controllers	2016-03-05 22:43:05 +01:00
Eugen Rochko	7e93da3f8d	Removing grape and adding devise	2016-03-05 13:12:24 +01:00
Eugen Rochko	23d08c6749	Changing the use of config constants to the Rails configuration object	2016-02-29 20:06:39 +01:00
Eugen Rochko	0e8f59c16f	Refactoring Grape API methods into normal controllers & other things	2016-02-29 19:42:08 +01:00
Eugen Rochko	ee73d35eea	Incoming Salmon requests can be turned into follows and unfollows	2016-02-23 22:17:07 +01:00
Eugen Rochko	fa33750105	Adding reblogs, favourites, improving atom generation	2016-02-23 19:17:37 +01:00
Eugen Rochko	3b0bc18db9	Improved Atom rendering templates, added README	2016-02-23 13:08:01 +01:00
Eugen Rochko	2bc48e9064	Individual atom entries	2016-02-22 19:11:07 +01:00
Eugen Rochko	1dad72bf13	Fixes and general progress	2016-02-22 18:10:30 +01:00
Eugen Rochko	709c6685a9	Made some progress	2016-02-22 16:00:20 +01:00
Eugen Rochko	9c4856bdb1	Initial commit	2016-02-20 22:53:20 +01:00

... 34 35 36 37 38 ...

3204 Commits