mastodon

mirror of https://github.com/mastodon/mastodon.git synced 2024-12-15 15:44:56 +01:00

Author	SHA1	Message	Date
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 `27bf9a946e`. 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 `108c460531`. * 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

... 6 7 8 9 10 ...

1639 Commits