]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoSet Docker permissions during the build process (#6514)
Eugen Rochko [Tue, 20 Feb 2018 16:25:01 +0000 (17:25 +0100)]
Set Docker permissions during the build process (#6514)

* Set Docker permissions during the build process

* Remove docker_entrypoint.sh and use COPY with chown

8 years agoImprove performance of feed_manager_spec (#6517)
abcang [Tue, 20 Feb 2018 15:50:12 +0000 (00:50 +0900)]
Improve performance of feed_manager_spec (#6517)

8 years agoDon't resize avatars/headers if their dimensions are already right (#6508)
Eugen Rochko [Mon, 19 Feb 2018 15:06:12 +0000 (16:06 +0100)]
Don't resize avatars/headers if their dimensions are already right (#6508)

Also don't apply "-quality 80" option which is probably the reason
for slight color differences between original and remote image
(because it would apply it twice, once on original instance, and
again on the receiving instance)

8 years agoFix media spoiler design (#6507)
Eugen Rochko [Mon, 19 Feb 2018 01:39:18 +0000 (02:39 +0100)]
Fix media spoiler design (#6507)

- 4px rounded corners on media attachments
- Better colors/contrast for CW/media spoiler on public pages
- Fix vertical alignment of "Show more" button
- Fix layout jump when unhiding standalone media

8 years agoadd parameter locked to /api/v1/update_credentials (#6506)
Konrad Pozniak [Sun, 18 Feb 2018 21:57:53 +0000 (22:57 +0100)]
add parameter locked to /api/v1/update_credentials (#6506)

8 years agoAdded fetch_remote_status_service call spec case actibitypub (#6500)
Kazushige Tominaga [Sun, 18 Feb 2018 15:34:03 +0000 (00:34 +0900)]
Added fetch_remote_status_service call spec case actibitypub (#6500)

* Added #link_header spec

* Added #call spec

* Delete spec of private methods

* Added call test case activitypub

8 years agoRemove outline from body window (Fixes #6501) (#6502)
HellPie [Sun, 18 Feb 2018 15:32:58 +0000 (16:32 +0100)]
Remove outline from body window (Fixes #6501) (#6502)

8 years agoRemove unnecessary g++ configuration (#6499)
Akihiko Odaki [Sun, 18 Feb 2018 15:32:17 +0000 (00:32 +0900)]
Remove unnecessary g++ configuration (#6499)

8 years agoCache relationships in API (#6482)
Eugen Rochko [Sun, 18 Feb 2018 02:14:46 +0000 (03:14 +0100)]
Cache relationships in API (#6482)

* Cache relationships in API

* Fetch relationships for search results in UI

* Only save one account's maps in each cache item

8 years agoIsolate each specs for cache store (#6450)
Akihiko Odaki [Sat, 17 Feb 2018 21:35:05 +0000 (06:35 +0900)]
Isolate each specs for cache store (#6450)

The cache store is explicitly used by some specs, but they were not
isolated and therefore not reliable. This fixes the issue by clearing
the cache after each specs.

8 years agoPush discovered status through streaming API within a time window (#6484)
Eugen Rochko [Sat, 17 Feb 2018 13:28:48 +0000 (14:28 +0100)]
Push discovered status through streaming API within a time window (#6484)

Time window of 6 hours

8 years agoLimit the languages used for notification mailer test (#6487)
Akihiko Odaki [Sat, 17 Feb 2018 13:27:51 +0000 (22:27 +0900)]
Limit the languages used for notification mailer test (#6487)

Some available languages lack translations for notification mails. Now it
tests for two languages which is certain to have required translations:
German and English.

German is the language the current project owner, Eugen Rochko speaks, and
providing English translations for new messages is de facto mandatory.

8 years agoFix Spanish translation of remote_follow acct (#6475)
Simó Albert i Beltran [Fri, 16 Feb 2018 18:53:38 +0000 (19:53 +0100)]
Fix Spanish translation of remote_follow acct (#6475)

8 years agoFix Catalan translation of remote_follow acct (#6476)
Simó Albert i Beltran [Fri, 16 Feb 2018 18:15:56 +0000 (19:15 +0100)]
Fix Catalan translation of remote_follow acct (#6476)

8 years ago[Nanobox] Fix backups for file storage (#6483)
Daniel Hunsaker [Fri, 16 Feb 2018 16:10:01 +0000 (09:10 -0700)]
[Nanobox] Fix backups for file storage (#6483)

8 years agoSave video metadata and improve video OpenGraph tags (#6481)
Eugen Rochko [Fri, 16 Feb 2018 06:22:20 +0000 (07:22 +0100)]
Save video metadata and improve video OpenGraph tags (#6481)

* Save metadata from video attachments, put correct dimensions into OG tags

* Add twitter:player for videos

* Fix code style and test

8 years agoDo not hide NSFW media/CW'd text in OpenGraph tags (#6479)
Eugen Rochko [Fri, 16 Feb 2018 03:40:53 +0000 (04:40 +0100)]
Do not hide NSFW media/CW'd text in OpenGraph tags (#6479)

Reasoning: HTML title tag affects everyone. But OpenGraph only affects
when somebody is deliberately sharing the content, usually in an
environment where such content is expected. Hiding the content in
OpenGraph tags results in deceitful previews which inhibit the
shareability of the post.

Example: Somebody writes a clever post about politics but kindly
puts a "uspol" content warning on it. Mastodon users are thankful,
but sharing this post on another platform results in non-Mastodon
users believing the entire contents of the post is "uspol" and not
clicking through/reading and re-sharing.

8 years agoAfter click to embed video, autoplay it (#6480)
Eugen Rochko [Thu, 15 Feb 2018 22:05:12 +0000 (23:05 +0100)]
After click to embed video, autoplay it (#6480)

8 years agoFix #5173: Click card to embed external content (#6471)
Eugen Rochko [Thu, 15 Feb 2018 06:04:28 +0000 (07:04 +0100)]
Fix #5173: Click card to embed external content (#6471)

8 years agoFix media button type (#6478)
abcang [Thu, 15 Feb 2018 03:40:42 +0000 (12:40 +0900)]
Fix media button type (#6478)

8 years agoi18n: Update Polish translation (#6470)
Marcin Mikołajczak [Tue, 13 Feb 2018 22:55:45 +0000 (23:55 +0100)]
i18n: Update Polish translation (#6470)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoFix URLs incorrectly having trailing hyphen removed (#6465)
Daniel King [Sun, 11 Feb 2018 22:49:18 +0000 (22:49 +0000)]
Fix URLs incorrectly having trailing hyphen removed (#6465)

In cases where a URL has a trailing hyphen the FetchLinkCardService incorrectly removes the hyphen when it is parsed

The hyphen is not a reserved character in the URI spec https://tools.ietf.org/html/rfc3986#section-2.2

8 years agoFix Chewy trying to update index with the wrong strategy (#6464)
Eugen Rochko [Sun, 11 Feb 2018 21:59:44 +0000 (22:59 +0100)]
Fix Chewy trying to update index with the wrong strategy (#6464)

8 years agoInteractive `rake mastodon:setup` task (#6451)
Eugen Rochko [Sun, 11 Feb 2018 17:40:57 +0000 (18:40 +0100)]
Interactive `rake mastodon:setup` task (#6451)

* Add better CLI prompt

* Add rake mastodon:setup interactive wizard

* Test db/redis/smtp configurations and add admin user at the end

* Test database connection even when database does not exist yet

8 years agoAdded FetchRemoteAccountService spec (#6456)
Kazushige Tominaga [Sat, 10 Feb 2018 16:10:58 +0000 (01:10 +0900)]
Added FetchRemoteAccountService spec (#6456)

* Added #link_header spec

* Added #call spec

* Delete spec of private methods

* Added #call spec

8 years agoFix password recovery (#6459)
ThibG [Sat, 10 Feb 2018 16:09:44 +0000 (17:09 +0100)]
Fix password recovery (#6459)

* Fix password recovery

* Use “resource” instead of “current_user”

8 years agoAdded #call spec (#6455)
Kazushige Tominaga [Sat, 10 Feb 2018 02:31:38 +0000 (11:31 +0900)]
Added #call spec (#6455)

* Added #link_header spec

* Added #call spec

* Delete spec of private methods

8 years agoFull-text search for authorized statuses (#6423)
Eugen Rochko [Fri, 9 Feb 2018 22:04:47 +0000 (23:04 +0100)]
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

8 years agofix-indent (#6453)
masarakki [Fri, 9 Feb 2018 14:29:48 +0000 (23:29 +0900)]
fix-indent (#6453)

8 years agoChange web UI "posts" to "toots" on profile for consistency (#6447)
Eugen Rochko [Thu, 8 Feb 2018 23:27:18 +0000 (00:27 +0100)]
Change web UI "posts" to "toots" on profile for consistency (#6447)

8 years agoAdd preference to always display sensitive media (#6448)
Eugen Rochko [Thu, 8 Feb 2018 23:26:57 +0000 (00:26 +0100)]
Add preference to always display sensitive media (#6448)

8 years agoPerform request spec (#6446)
Kazushige Tominaga [Thu, 8 Feb 2018 23:12:35 +0000 (08:12 +0900)]
Perform request spec (#6446)

* Added #link_header spec

* Added #perform_request spec

8 years agoClear account cache of notification target_status (#6442)
abcang [Thu, 8 Feb 2018 14:33:23 +0000 (23:33 +0900)]
Clear account cache of notification target_status (#6442)

8 years agoFix response of signature_verification_failure_reason (#6441)
abcang [Thu, 8 Feb 2018 04:00:45 +0000 (13:00 +0900)]
Fix response of signature_verification_failure_reason (#6441)

8 years agoAdded #link_header spec (#6439)
Kazushige Tominaga [Wed, 7 Feb 2018 23:17:53 +0000 (08:17 +0900)]
Added #link_header spec (#6439)

8 years agoChange user_id column non-nullable (#6435)
Akihiko Odaki [Wed, 7 Feb 2018 15:35:44 +0000 (00:35 +0900)]
Change user_id column non-nullable (#6435)

8 years agomatch hashtag regex in js client with server (#6431)
Daniel King [Mon, 5 Feb 2018 01:44:13 +0000 (01:44 +0000)]
match hashtag regex in js client with server (#6431)

the slight mismatch in hashtag regex between js and ruby was causing
hashtag warning to be displayed for unlisted tweets when an invalid
hashtag was entered

exact version of ruby regex not possible in js as POSIX bracket
expressions are not supported, this version approximates and doesn't
give same unicode support

8 years agoMake PAM gem optional, allow configuration over environment (#6415)
Eugen Rochko [Sun, 4 Feb 2018 14:05:53 +0000 (15:05 +0100)]
Make PAM gem optional, allow configuration over environment (#6415)

8 years agoValidation of count works even when text of status is nil (#6429)
abcang [Sun, 4 Feb 2018 11:32:41 +0000 (20:32 +0900)]
Validation of count works even when text of status is nil (#6429)

8 years agoExclude nil from relationships array (#6427)
abcang [Sun, 4 Feb 2018 11:32:10 +0000 (20:32 +0900)]
Exclude nil from relationships array (#6427)

8 years agoMake sure status is not nil (#6428)
abcang [Sun, 4 Feb 2018 11:31:46 +0000 (20:31 +0900)]
Make sure status is not nil (#6428)

8 years agoUpgrade Vagrant box to Xenial (#6421)
Daniel King [Sun, 4 Feb 2018 05:03:01 +0000 (05:03 +0000)]
Upgrade Vagrant box to Xenial (#6421)

* upgrade vagrant box to xenial

this allows the redis version to be upgraded to support the new redis
features used in the activity tracker

* add libpam0g package to vagrant box

this is required for native extensions of gems to build after the
addition of PAM support was added in #5303

8 years agoAdd option to show only local toots in timeline preview (#6292)
Renato "Lond" Cerqueira [Sun, 4 Feb 2018 05:00:10 +0000 (06:00 +0100)]
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

8 years agoCAS + SAML authentication feature (#6425)
Eugen Rochko [Sun, 4 Feb 2018 04:42:13 +0000 (05:42 +0100)]
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

8 years agoIsolate internal services from external networks in Docker configuration (#6369)
Akihiko Odaki [Sat, 3 Feb 2018 17:44:22 +0000 (02:44 +0900)]
Isolate internal services from external networks in Docker configuration (#6369)

The database and Redis do not need external connections, so isolate them
and prevent unauthorized access.

8 years agofix ColumnBackButtonSlim should extended from ColumnBackButton (#6417)
takayamaki [Sat, 3 Feb 2018 17:41:51 +0000 (02:41 +0900)]
fix ColumnBackButtonSlim should extended from ColumnBackButton (#6417)

8 years agoRequire environment for generate_static_pages (#6420)
Akihiko Odaki [Sat, 3 Feb 2018 17:41:01 +0000 (02:41 +0900)]
Require environment for generate_static_pages (#6420)

It is required for ApplicationController.

8 years agoFix column header button (#6411)
abcang [Fri, 2 Feb 2018 12:31:28 +0000 (21:31 +0900)]
Fix column header button (#6411)

8 years agoFix saving of oEmbed image (#6409)
abcang [Fri, 2 Feb 2018 10:57:59 +0000 (19:57 +0900)]
Fix saving of oEmbed image (#6409)

8 years agoSet minimum height for mastodon on drawer (#6142)
Akihiko Odaki [Fri, 2 Feb 2018 10:56:50 +0000 (19:56 +0900)]
Set minimum height for mastodon on drawer (#6142)

8 years agoAllow HTTP caching of atom-rendered public toots (OStatus compatibility) (#6207)
ThibG [Fri, 2 Feb 2018 09:54:04 +0000 (10:54 +0100)]
Allow HTTP caching of atom-rendered public toots (OStatus compatibility) (#6207)

8 years agomoved save button (#3792)
Charlotte Fields [Fri, 2 Feb 2018 09:45:43 +0000 (20:45 +1100)]
moved save button (#3792)

* moved save button

* added save back to the bottom

* Update show.html.haml

8 years agoRemove wave from list drawer (#6381)
Akihiko Odaki [Fri, 2 Feb 2018 09:32:41 +0000 (18:32 +0900)]
Remove wave from list drawer (#6381)

8 years agoUnify links container implementation in about pages (#6382)
Akihiko Odaki [Fri, 2 Feb 2018 09:32:21 +0000 (18:32 +0900)]
Unify links container implementation in about pages (#6382)

They were redundant, and also had a inconsistency; the button for
"other instances" had an icon for the external link in "more" page, but
it didn't in the other pages.

This unifies the implementation, and the external link icon is now shown
in all the about pages.

8 years agoAccept ActivityPub announce from the author of the original note (#6236)
Akihiko Odaki [Fri, 2 Feb 2018 09:22:15 +0000 (18:22 +0900)]
Accept ActivityPub announce from the author of the original note (#6236)

8 years agoAllow retrieval of private statuses (single or in outbox) using HTTP signatures ...
puckipedia [Fri, 2 Feb 2018 09:19:59 +0000 (10:19 +0100)]
Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225)

8 years agopam authentication (#5303)
Alexander [Fri, 2 Feb 2018 09:18:55 +0000 (10:18 +0100)]
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

8 years agoFix mistake in cache deletion (#6408)
abcang [Fri, 2 Feb 2018 09:10:18 +0000 (18:10 +0900)]
Fix mistake in cache deletion (#6408)

8 years agoUpgrade Paperclip > 5.2.1 (#6404)
Rob Watson [Thu, 1 Feb 2018 16:54:22 +0000 (16:54 +0000)]
Upgrade Paperclip > 5.2.1 (#6404)

Mitigation for CVE-2017-0889.

https://www.cvedetails.com/cve/CVE-2017-0889/
https://medium.com/in-the-weeds/all-about-paperclips-cve-2017-0889-server-side-request-forgery-ssrf-vulnerability-8cb2b1c96fe8

8 years agoFix button hiding when header title is too long (#6406)
abcang [Thu, 1 Feb 2018 16:17:17 +0000 (01:17 +0900)]
Fix button hiding when header title is too long (#6406)

8 years agoRussian language updated (#6397)
Evgeny Petrov [Wed, 31 Jan 2018 22:33:54 +0000 (01:33 +0300)]
Russian language updated (#6397)

8 years agofix ruby 2.5 rvm install in vagrant (#6396)
Daniel King [Wed, 31 Jan 2018 20:52:58 +0000 (20:52 +0000)]
fix ruby 2.5 rvm install in vagrant (#6396)

RVM has a known issue with installing Ruby 2.5 on the version of Ubuntu
the Vagrant box is using: https://github.com/rvm/rvm/issues/4291

This bug was preventing any gem installs in the vagrant box

8 years agoBump version to 2.2.0
Eugen Rochko [Mon, 29 Jan 2018 00:12:36 +0000 (01:12 +0100)]
Bump version to 2.2.0

8 years agoFix padding bug in landing page column header (#6374)
Eugen Rochko [Mon, 29 Jan 2018 00:10:59 +0000 (01:10 +0100)]
Fix padding bug in landing page column header (#6374)

8 years agoASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)
Eugen Rochko [Mon, 29 Jan 2018 00:06:39 +0000 (01:06 +0100)]
ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)

8 years agoAdd direction tags to HTML e-mails for RTL languages (#6373)
Eugen Rochko [Sun, 28 Jan 2018 23:22:20 +0000 (00:22 +0100)]
Add direction tags to HTML e-mails for RTL languages (#6373)

8 years agoWeblate translations (#6370)
Renato "Lond" Cerqueira [Sun, 28 Jan 2018 13:48:09 +0000 (14:48 +0100)]
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

8 years agol10n Occitan update (#6367)
Quenty31 [Fri, 26 Jan 2018 23:51:03 +0000 (00:51 +0100)]
l10n Occitan update (#6367)

* Final point missing

+ s'acabar => expirar

* Update oc.yml

* Update oc.json

8 years agoDo not manually update system RubyGems (#6355)
Akihiko Odaki [Thu, 25 Jan 2018 03:23:29 +0000 (12:23 +0900)]
Do not manually update system RubyGems (#6355)

Travis CI ships compatible system RubyGems now:
https://github.com/travis-ci/travis-ci/issues/8969#issuecomment-360288970
> I have repackaged the 2.5.0 archive for Linux to include RubyGems 2.7.4,
> which should have the fix for this issue. Please restart the affected
> jobs, and let us know how they go for you.

8 years agoDo not require sudo on Travis CI (#6356)
Akihiko Odaki [Thu, 25 Jan 2018 03:23:09 +0000 (12:23 +0900)]
Do not require sudo on Travis CI (#6356)

The issue which the workaround for is now addressed:
https://github.com/travis-ci/travis-ci/issues/7941#issuecomment-310667894
> We've pushed out new stable trusty images to production with a patch.

8 years agoFix initial_state me in push_notification_register (#6349)
abcang [Wed, 24 Jan 2018 13:37:46 +0000 (22:37 +0900)]
Fix initial_state me in push_notification_register (#6349)

8 years agoFix hide and show media button on admin page (#6347)
abcang [Wed, 24 Jan 2018 12:29:46 +0000 (21:29 +0900)]
Fix hide and show media button on admin page (#6347)

8 years agoAdd packs volume to docker-compose.yml (#6348)
Yamagishi Kazutoshi [Wed, 24 Jan 2018 12:29:32 +0000 (21:29 +0900)]
Add packs volume to docker-compose.yml (#6348)

8 years agol10n Occitan language update (#6346)
Quenty31 [Wed, 24 Jan 2018 12:29:03 +0000 (13:29 +0100)]
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

8 years agoBump to 2.2.0rc2
Eugen Rochko [Wed, 24 Jan 2018 03:16:30 +0000 (04:16 +0100)]
Bump to 2.2.0rc2

8 years agoFix style of legacy column headers (#6342)
Eugen Rochko [Wed, 24 Jan 2018 03:03:51 +0000 (04:03 +0100)]
Fix style of legacy column headers (#6342)

* Fix regression from #6199: Style of legacy column headers

* Fix tests

* Clean up variables

8 years agoFix #6311: Replace relative URLs in CSS only for Premailer (#6335)
Eugen Rochko [Wed, 24 Jan 2018 01:57:14 +0000 (02:57 +0100)]
Fix #6311: Replace relative URLs in CSS only for Premailer (#6335)

8 years agoFix #6331 (#6341)
Eugen Rochko [Tue, 23 Jan 2018 19:52:30 +0000 (20:52 +0100)]
Fix #6331 (#6341)

UserTrackingConcern is circumvented by SessionsController#create
because it calls warden, which calls the User#update_tracked_fields!
method directly. Move returning user logic to that method.

8 years agoDisplay deleted users' role as “Suspended” (#6339)
ThibG [Tue, 23 Jan 2018 13:31:31 +0000 (14:31 +0100)]
Display deleted users' role as “Suspended” (#6339)

Follow-up to 6eb60260b1b771e8cd42d3b58b82b2781a067991 which missed a spot where
the same error occurs.

8 years agoUpdate goldfinger, ostatus2 and http.rb versions (#6337)
Eugen Rochko [Tue, 23 Jan 2018 13:30:42 +0000 (14:30 +0100)]
Update goldfinger, ostatus2 and http.rb versions (#6337)

8 years agoFix e-mail icon for reblog being stretched (#6336)
Eugen Rochko [Tue, 23 Jan 2018 13:30:28 +0000 (14:30 +0100)]
Fix e-mail icon for reblog being stretched (#6336)

8 years agoFix regression from #6199: Make entire column header clickable (#6334)
Eugen Rochko [Tue, 23 Jan 2018 04:06:29 +0000 (05:06 +0100)]
Fix regression from #6199: Make entire column header clickable (#6334)

8 years agoRename ResolveRemoteAccountService to ResolveAccountService (#6327)
Akihiko Odaki [Mon, 22 Jan 2018 13:25:09 +0000 (22:25 +0900)]
Rename ResolveRemoteAccountService to ResolveAccountService (#6327)

The service used to be named ResolveRemoteAccountService resolves local
accounts as well.

8 years agoRename FetchRemoteResourceService to ResolveURLService (#6328)
Akihiko Odaki [Mon, 22 Jan 2018 13:24:22 +0000 (22:24 +0900)]
Rename FetchRemoteResourceService to ResolveURLService (#6328)

The service used to be named FetchRemoteResourceService resolves local
URL as well.

8 years agoResolve URL for local account in follow authorization success view (#6324)
Akihiko Odaki [Mon, 22 Jan 2018 13:22:14 +0000 (22:22 +0900)]
Resolve URL for local account in follow authorization success view (#6324)

8 years agoWeblate translations (#6323)
Renato "Lond" Cerqueira [Mon, 22 Jan 2018 13:20:58 +0000 (14:20 +0100)]
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

8 years agoKorean translation (#6322)
Jeong Arm [Sun, 21 Jan 2018 23:49:57 +0000 (08:49 +0900)]
Korean translation (#6322)

Related to #6273

8 years agoarmenian translations initial commit (#6320)
Norayr Chilingarian [Sun, 21 Jan 2018 20:02:23 +0000 (00:02 +0400)]
armenian translations initial commit (#6320)

* adding armenian translations

* updating config files for armenian translations

* armenian translation fix

* fixing spaces

8 years agofix filter search index being too strict when looking for line breaks (#6318)
codl [Sun, 21 Jan 2018 12:23:17 +0000 (13:23 +0100)]
fix filter search index being too strict when looking for line breaks (#6318)

8 years agoFix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319)
ThibG [Sun, 21 Jan 2018 12:22:31 +0000 (13:22 +0100)]
Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319)

Since 872a0d5bd801c998d911f7da582a60d2f714a710, 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.

8 years agoRedirect to 2FA creation page when otp_secret is not available (#6314)
Aboobacker MK [Sun, 21 Jan 2018 12:21:28 +0000 (17:51 +0530)]
Redirect to 2FA creation page when otp_secret is not available (#6314)

8 years agoDisplay number of follow requests in getting started menu, and (#6313)
Eugen Rochko [Sun, 21 Jan 2018 12:20:20 +0000 (13:20 +0100)]
Display number of follow requests in getting started menu, and (#6313)

if notifications column is not mounted, also display number of
unread notifications there.

8 years agoFix invalid value passed to full_asset_url in mailers (#6312)
Eugen Rochko [Sun, 21 Jan 2018 12:20:00 +0000 (13:20 +0100)]
Fix invalid value passed to full_asset_url in mailers (#6312)

8 years agoChange mailer avatar url (#6309)
Iijima Yasushi [Sat, 20 Jan 2018 18:27:13 +0000 (03:27 +0900)]
Change mailer avatar url (#6309)

* Change mailer avatar url

* Use full_asset_url method

8 years agoBump version to 2.2.0rc1
Eugen Rochko [Sat, 20 Jan 2018 15:27:19 +0000 (16:27 +0100)]
Bump version to 2.2.0rc1

8 years agoUpdate Simplified Chinese translations (#6306)
SerCom_KC [Sat, 20 Jan 2018 15:11:21 +0000 (23:11 +0800)]
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

8 years agoFix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305)
Eugen Rochko [Sat, 20 Jan 2018 02:49:06 +0000 (03:49 +0100)]
Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305)

8 years agoRestore onboarding modal (#6303)
Eugen Rochko [Sat, 20 Jan 2018 00:32:37 +0000 (01:32 +0100)]
Restore onboarding modal (#6303)

* Restore onboarding modal
Revert 5ba8b3a396895ecec083c5258aaf9084d584a7c4

* Change greeting elephant graphic, fix up some design issues

* Fix wrong link color in onboarding modal

8 years agoImprove HTML e-mails based on Litmus tests (#6301)
Eugen Rochko [Sat, 20 Jan 2018 00:32:21 +0000 (01:32 +0100)]
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

8 years agoMake text e-mails consistent with HTML ones in UserMailer (#6291)
Eugen Rochko [Sat, 20 Jan 2018 00:32:05 +0000 (01:32 +0100)]
Make text e-mails consistent with HTML ones in UserMailer (#6291)

* Make text e-mails consistent with HTML ones in UserMailer

* Fix UserMailer specs