]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoUse OrderedCollectionPage to return followers/following list (#4949)
nullkal [Tue, 19 Sep 2017 14:37:06 +0000 (23:37 +0900)]
Use OrderedCollectionPage to return followers/following list (#4949)

8 years agoAdd support for multiple themes (#4959)
Andrew [Tue, 19 Sep 2017 14:36:23 +0000 (07:36 -0700)]
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

8 years agoHide sensitive image in default on the public pages (#5009)
unarist [Tue, 19 Sep 2017 14:03:45 +0000 (23:03 +0900)]
Hide sensitive image in default on the public pages (#5009)

Additionally, this restores previous background / text color for media spoiler.

8 years agoFix incomplete account records being read (#4998)
Eugen Rochko [Tue, 19 Sep 2017 04:53:16 +0000 (06:53 +0200)]
Fix incomplete account records being read (#4998)

* Fix incomplete account records being read

- Put account processing into redis lock
- Do not save until record is complete

* Fix spaces

8 years agoRemove ubuntu-toolchain-r-test (#5005)
Akihiko Odaki [Tue, 19 Sep 2017 03:06:27 +0000 (12:06 +0900)]
Remove ubuntu-toolchain-r-test (#5005)

8 years agoFix custom emojis index (#5006)
Yamagishi Kazutoshi [Tue, 19 Sep 2017 03:06:13 +0000 (12:06 +0900)]
Fix custom emojis index (#5006)

8 years agoDefine emoji context for ActivityPub (#5004)
Eugen Rochko [Tue, 19 Sep 2017 03:05:48 +0000 (05:05 +0200)]
Define emoji context for ActivityPub (#5004)

* Define emoji context for ActivityPub

* Fix the emojo

* Use general Mastodon context instead

8 years agoAdmin interface for listing, adding and removing custom emojis (#5002)
Eugen Rochko [Tue, 19 Sep 2017 01:52:38 +0000 (03:52 +0200)]
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

8 years agoRun i18n-tasks normalize (#5003)
Eugen Rochko [Tue, 19 Sep 2017 01:27:08 +0000 (03:27 +0200)]
Run i18n-tasks normalize (#5003)

8 years agoCustom emoji (#4988)
Eugen Rochko [Tue, 19 Sep 2017 00:42:40 +0000 (02:42 +0200)]
Custom emoji (#4988)

* Custom emoji

- In OStatus: `<link rel="emoji" name="coolcat" href="http://..." />`
- In ActivityPub: `{ type: "Emoji", name: ":coolcat:", href: "http://..." }`
- In REST API: Status object includes `emojis` array (`shortcode`, `url`)
- Domain blocks with reject media stop emojis
- Emoji file up to 50KB
- Web UI handles custom emojis
- Static pages render custom emojis as `<img />` tags

Side effects:

- Undo #4500 optimization, as I needed to modify it to restore
  shortcode handling in emojify()
- Formatter#plaintext should now make sure stripped out line-breaks
  and paragraphs are replaced with newlines

* Fix emoji at the start not being converted

8 years agoA few updates to the Spanish translation and some typos fixing (#4997)
BruWalfas [Mon, 18 Sep 2017 22:47:48 +0000 (19:47 -0300)]
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

8 years agoAdd will-change to improve scrolling perf (#5001)
Nolan Lawson [Mon, 18 Sep 2017 21:29:15 +0000 (14:29 -0700)]
Add will-change to improve scrolling perf (#5001)

8 years agoRe-allow underscore on valid_url_path_ending_chars (#4999)
unarist [Mon, 18 Sep 2017 19:25:40 +0000 (04:25 +0900)]
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.

8 years agoAdd published property to ActivityPub activity for reblogs (#5000)
unarist [Mon, 18 Sep 2017 18:30:11 +0000 (03:30 +0900)]
Add published property to ActivityPub activity for reblogs (#5000)

Since reblogs are serialized as Announce activity, its published property can be used for the creation time of reblog.

8 years agoDo not add image size without meta to OGP (regression from #4901) (#4995)
Yamagishi Kazutoshi [Mon, 18 Sep 2017 13:00:29 +0000 (22:00 +0900)]
Do not add image size without meta to OGP (regression from #4901) (#4995)

8 years agoUse Account.local.sum(statuses_count) instead of Status.local.count (#4996)
Akihiko Odaki [Mon, 18 Sep 2017 12:59:57 +0000 (21:59 +0900)]
Use Account.local.sum(statuses_count) instead of Status.local.count (#4996)

It is faster.

8 years agoBump ruby version to 2.4.2 (#4958)
Daigo 3 Dango [Mon, 18 Sep 2017 02:55:57 +0000 (16:55 -1000)]
Bump ruby version to 2.4.2 (#4958)

* Bump ruby version to 2.4.2

https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-4-2-released/

Gemfile.lock is also updated.

TODO
- [ ] Update Dockerfile with Alpine release of ruby-2.4.2

* Revert jwt version

It seems that jwt 2.0.0 fails in some environment.
ref. https://github.com/zaru/webpush/issues/42

* Bump Ruby version on docker image

8 years agoAdd `strip_insignificant_zeros: true` option to `number_to_human` (#4993)
Yamagishi Kazutoshi [Mon, 18 Sep 2017 02:55:23 +0000 (11:55 +0900)]
Add `strip_insignificant_zeros: true` option to `number_to_human` (#4993)

8 years agoSome improvements in the Spanish translation (#4991)
febrezo [Mon, 18 Sep 2017 02:52:34 +0000 (04:52 +0200)]
Some improvements in the Spanish translation (#4991)

8 years agoOauth code in input form and add description message (#4986)
Lynx Kotoura [Sun, 17 Sep 2017 13:23:44 +0000 (22:23 +0900)]
Oauth code in input form and add description message (#4986)

* Oauth code in a input form and add description

* New authcode description

8 years agoValidate uri presence for remote status (#4985)
unarist [Sun, 17 Sep 2017 13:21:57 +0000 (22:21 +0900)]
Validate uri presence for remote status (#4985)

8 years agoRaise an error on getting activity uri for remote status (#4984)
unarist [Sun, 17 Sep 2017 11:51:34 +0000 (20:51 +0900)]
Raise an error on getting activity uri for remote status (#4984)

We had returned `nil` for that case, but this raises an error instead, as a wrong usage of the method.
This method is currently only used in ActivitySerializer.

8 years agoFix cancellation of scroll to the right (#4978)
abcang [Sun, 17 Sep 2017 09:59:23 +0000 (18:59 +0900)]
Fix cancellation of scroll to the right (#4978)

8 years agoRandomize sidekiq-scheduler cron schedule (#4980)
Patrick Figel [Sun, 17 Sep 2017 09:58:20 +0000 (11:58 +0200)]
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.

8 years agoFix an error when actor json couldn't be fetched in ResolveRemoteAccountService ...
unarist [Sun, 17 Sep 2017 09:54:23 +0000 (18:54 +0900)]
Fix an error when actor json couldn't be fetched in ResolveRemoteAccountService (#4979)

* Fix an error when actor json couldn't be fetched in ResolveRemoteAccountService

* Add specs

8 years agoSo Spanish. Much changes. Wow. (#4976)
BruWalfas [Sun, 17 Sep 2017 09:16:43 +0000 (06:16 -0300)]
So Spanish. Much changes. Wow. (#4976)

8 years agoRemove local_only scope in Status (#4977)
Akihiko Odaki [Sun, 17 Sep 2017 03:29:43 +0000 (12:29 +0900)]
Remove local_only scope in Status (#4977)

8 years agoEscape URL parts on formatting local status (#4975)
unarist [Sat, 16 Sep 2017 19:33:52 +0000 (04:33 +0900)]
Escape URL parts on formatting local status (#4975)

8 years agoMinor Chinese check & jsx addition (#4973)
Mingye Wang [Sat, 16 Sep 2017 16:48:38 +0000 (12:48 -0400)]
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

8 years agoAdjust landing pages 2 (#4967)
Lynx Kotoura [Sat, 16 Sep 2017 16:39:12 +0000 (01:39 +0900)]
Adjust landing pages 2 (#4967)

* Adjust landing pages 2

Fix styles of terms page
Remove action buttons from timeline in about page
Adjust styles of short description
Adjust form inputs
Set autocomplete off for username and email box in registration form. Remove line breakings.

* Revert removing action buttons

8 years agoFix an error in ReplyDistributionWorker when replied status was deleted (#4974)
unarist [Sat, 16 Sep 2017 16:18:00 +0000 (01:18 +0900)]
Fix an error in ReplyDistributionWorker when replied status was deleted (#4974)

Reply distribution is proceed by Sidekiq, so replied status may be deleted before this.

8 years agocorrect URL pattern used in text length counter in WebUI (#4968)
ふぁぼ原 [Sat, 16 Sep 2017 13:01:15 +0000 (22:01 +0900)]
correct URL pattern used in text length counter in WebUI (#4968)

8 years agoFix AP serialization error when thread is missing (#4970)
unarist [Sat, 16 Sep 2017 13:00:36 +0000 (22:00 +0900)]
Fix AP serialization error when thread is missing (#4970)

`Status#reply?` may returns true even if the thread is missing.
e.g. the replied status was deleted or couldn't be fetched.

Then it raises NoMethodError on various AP json serialization.

This issue won't happen on Atom serialization because it checks thread
existence using `StreamEntry#threaded?` instead.

8 years agoFix hasSize condition in secSet and sizes. (#4969)
Naoki Kosaka [Sat, 16 Sep 2017 13:00:01 +0000 (22:00 +0900)]
Fix hasSize condition in secSet and sizes. (#4969)

8 years agoFix filterable_languages method of SettingsHelper (#4966)
Akihiko Odaki [Sat, 16 Sep 2017 12:59:41 +0000 (21:59 +0900)]
Fix filterable_languages method of SettingsHelper (#4966)

8 years agoBump to 1.6.1
Eugen Rochko [Sat, 16 Sep 2017 01:08:29 +0000 (03:08 +0200)]
Bump to 1.6.1

8 years agoWhen accessing uncached media attachment, redownload it (#4955)
Eugen Rochko [Sat, 16 Sep 2017 01:01:45 +0000 (03:01 +0200)]
When accessing uncached media attachment, redownload it (#4955)

* When accessing uncached media attachment, redownload it

* Prevent re-download of rejected media

8 years agoFix invisible load more button (#4962)
unarist [Fri, 15 Sep 2017 22:32:43 +0000 (07:32 +0900)]
Fix invisible load more button (#4962)

* Fix behavior while the button is invisible
e.g. pointer cursor, couldn't open contextmenu
* Avoid rendering the button to remove blank space if no more items are available or no items are rendered

8 years agoWhen web UI URL used while logged out, redirect to static page (#4954)
Eugen Rochko [Thu, 14 Sep 2017 22:57:08 +0000 (00:57 +0200)]
When web UI URL used while logged out, redirect to static page (#4954)

8 years agoRemove redundant width/height values from SVGs to fix Safari bug (#4956)
Eugen Rochko [Thu, 14 Sep 2017 22:51:00 +0000 (00:51 +0200)]
Remove redundant width/height values from SVGs to fix Safari bug (#4956)

8 years agol10n: PT-BR translation updated (#4953)
Anna e só [Thu, 14 Sep 2017 22:02:38 +0000 (19:02 -0300)]
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

8 years agoAdd scheduled worker to purge old user IPs (#4951)
sdukhovni [Thu, 14 Sep 2017 20:26:38 +0000 (16:26 -0400)]
Add scheduled worker to purge old user IPs (#4951)

* Add scheduled worker to purge old user IPs

* Use ruby 1.9 hash syntax

8 years agoFix race condition when receiving an ActivityPub Create multiple times (#4930)
ThibG [Thu, 14 Sep 2017 20:26:22 +0000 (22:26 +0200)]
Fix race condition when receiving an ActivityPub Create multiple times (#4930)

* Fix race condition when receiving an ActivityPub Create multiple times

* Use a RedisLock to avoid concurrent processing of a same Create activity

8 years agoAdd missing Japanese translations (#4947)
Yamagishi Kazutoshi [Thu, 14 Sep 2017 16:03:34 +0000 (01:03 +0900)]
Add missing Japanese translations (#4947)

8 years agoEnable to recognize most kinds of characters as URL paths (#4941)
ふぁぼ原 [Thu, 14 Sep 2017 16:03:20 +0000 (01:03 +0900)]
Enable to recognize most kinds of characters as URL paths (#4941)

8 years agol10n: update Persian translation (#4946)
Masoud Abkenar [Thu, 14 Sep 2017 15:13:38 +0000 (17:13 +0200)]
l10n: update Persian translation (#4946)

8 years agoFix #4908 - Do not keep remote file names, generate random (#4934)
Eugen Rochko [Thu, 14 Sep 2017 14:41:59 +0000 (16:41 +0200)]
Fix #4908 - Do not keep remote file names, generate random (#4934)

8 years agoInclude requested URL into the message on network errors (#4945)
unarist [Thu, 14 Sep 2017 14:12:50 +0000 (23:12 +0900)]
Include requested URL into the message on network errors (#4945)

8 years agoRevert unique retry job (#4937)
abcang [Thu, 14 Sep 2017 13:12:43 +0000 (22:12 +0900)]
Revert unique retry job (#4937)

* Revert "Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)"

This reverts commit 6859d4c0289e767955aac3f345074220fe200604.

* Revert "Do not execute the job with the same arguments as the retry job (#4814)"

This reverts commit be7ffa2d7539d5a1946a3933cb9d242b9fac0ddc.

8 years agoi18n: Update Polish translation (#4942)
m4sk1n [Thu, 14 Sep 2017 12:58:48 +0000 (14:58 +0200)]
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

8 years agoAnother Dutch language update (#4944)
Jeroen [Thu, 14 Sep 2017 12:52:47 +0000 (14:52 +0200)]
Another Dutch language update (#4944)

* Update nl.json

* Update nl.yml

* Update nl.json

8 years agoAdd Japanese translate for #4911 (#4943)
Naf [Thu, 14 Sep 2017 09:20:04 +0000 (18:20 +0900)]
Add Japanese translate for #4911 (#4943)

8 years agol10n update OC/FR video redesign (#4938)
Quent-in [Thu, 14 Sep 2017 07:32:14 +0000 (09:32 +0200)]
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

8 years agoAdd Japanese translate for #4913 (#4936)
N氏 [Thu, 14 Sep 2017 03:25:18 +0000 (12:25 +0900)]
Add Japanese translate for #4913 (#4936)

8 years agoSupport OpenGraph video embeds (#4897)
Eugen Rochko [Thu, 14 Sep 2017 02:11:36 +0000 (04:11 +0200)]
Support OpenGraph video embeds (#4897)

* Support OpenGraph video embeds

It's not really OpenGraph, it's twitter:player property, but it's
not OEmbed so that fits. For example, this allows Twitch clips to
be displayed as embeds.

Also, fixes glitch-soc/mastodon#135

* Fix invalid OpenGraph cards being saved through attaching and
revisit URLs after 14 days

8 years agoGive video player fluid max-width (#4935)
Eugen Rochko [Thu, 14 Sep 2017 02:03:00 +0000 (04:03 +0200)]
Give video player fluid max-width (#4935)

8 years agoRedesign video player (#4911)
Eugen Rochko [Thu, 14 Sep 2017 01:39:10 +0000 (03:39 +0200)]
Redesign video player (#4911)

* Redesign video player

* Use new video player on static public pages too

* Use media gallery component on static public pages too

* Pause video when hiding it

* Full-screen sizing on WebKit

* Add aria labels to video player buttons

* Display link card on public status page

* Fix fullscreen from modal sizing issue

* Remove contain: strict property to fix fullscreen from columns

8 years agoFix refollowing (#4931)
ThibG [Wed, 13 Sep 2017 22:05:25 +0000 (00:05 +0200)]
Fix refollowing (#4931)

* Make RefollowWorker ActivityPub-only to avoid potential identifier mismatches

* Don't call RefollowWorker on new accounts

8 years agoUploads for admin site settings (#4913)
Eugen Rochko [Wed, 13 Sep 2017 22:04:30 +0000 (00:04 +0200)]
Uploads for admin site settings (#4913)

* Improve OpenGraph tags for about pages

* Add thumbnail admin setting

* Fix error

* Fix up

8 years agoi18n: Update Polish translation (#4929)
m4sk1n [Wed, 13 Sep 2017 18:57:33 +0000 (20:57 +0200)]
i18n: Update Polish translation (#4929)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoUpdating Dutch translation (#4927)
Jeroen [Wed, 13 Sep 2017 14:12:29 +0000 (16:12 +0200)]
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

8 years agofix share intent. (#4926)
MitarashiDango [Wed, 13 Sep 2017 13:20:03 +0000 (22:20 +0900)]
fix share intent. (#4926)

8 years agoFix ActivityPub handling of replies with WEB_DOMAIN (#4895) (#4904)
ThibG [Wed, 13 Sep 2017 12:22:16 +0000 (14:22 +0200)]
Fix ActivityPub handling of replies with WEB_DOMAIN (#4895) (#4904)

* Fix ActivityPub handling of replies when LOCAL_DOMAIN ≠ WEB_DOMAIN (#4895)

For all intents and purposes, `local_url?` is used to check if an URL refers
to the Web UI or the various API endpoints of the local instances. Those things
reside on `WEB_DOMAIN` and not `LOCAL_DOMAIN`.

* Change local_url? spec, as all URLs handled by Mastodon are based on WEB_DOMAIN

8 years agoAdd instance search feature (#4925)
nullkal [Wed, 13 Sep 2017 10:30:07 +0000 (19:30 +0900)]
Add instance search feature (#4925)

8 years agoMake instance names in into links to user list in the instance (#4924)
nullkal [Wed, 13 Sep 2017 09:34:07 +0000 (18:34 +0900)]
Make instance names in  into links to user list in the instance (#4924)

8 years agoFix #4917 - Add missing suspend checks (#4921)
Eugen Rochko [Wed, 13 Sep 2017 09:05:02 +0000 (11:05 +0200)]
Fix #4917 - Add missing suspend checks (#4921)

8 years agoFix #4918 - Limit pinned toots to 5 (#4923)
Eugen Rochko [Wed, 13 Sep 2017 09:04:32 +0000 (11:04 +0200)]
Fix #4918 - Limit pinned toots to 5 (#4923)

8 years agoFix height cache (#4909)
abcang [Wed, 13 Sep 2017 08:24:33 +0000 (17:24 +0900)]
Fix height cache (#4909)

8 years agoSpecify libicu explicitly in Aptfile (#4920)
Daigo 3 Dango [Wed, 13 Sep 2017 07:30:13 +0000 (21:30 -1000)]
Specify libicu explicitly in Aptfile (#4920)

It seems libicu-dev no longer installs libicu55 needed by charlock_holmes.

8 years ago[WiP] Whenever a remote keypair changes, unfollow them and re-subscribe to … (#4907)
ThibG [Tue, 12 Sep 2017 21:10:40 +0000 (23:10 +0200)]
[WiP] Whenever a remote keypair changes, unfollow them and re-subscribe to … (#4907)

* Whenever a remote keypair changes, unfollow them and re-subscribe to them

In Mastodon (it could be different for other OStatus or AP-enabled software),
a keypair change is indicative of whole user (or instance) data loss. In this
situation, the “new” user might be different, and almost certainly has an empty
followers list. In this case, Mastodon instances will disagree on follower
lists, leading to unreliable delivery and “shadow followers”, that is users
believed by a remote instance to be followers, without the affected user
knowing.

Drawbacks of this change are:
1. If an user legitimately changes public key for some reason without losing
   data (not possible in Mastodon at the moment), they will have their remote
   followers unsubscribed/re-subscribed needlessly.
2. Depending of the number of remote followers, this may generate quite some
   traffic.
3. If the user change is an attempt at usurpation, the remote followers will
   unknowingly follow the usurper. Note that this is *not* a change of
   behavior, Mastodon already behaves like that, although delivery might be
   unreliable, and the usurper would not have known the former user's
   followers.

* Rename ResubscribeWorker to RefollowWorker

* Process followers in batches

8 years agoAdd section for protocol specific information on the admin page (#4910)
unarist [Tue, 12 Sep 2017 21:06:10 +0000 (06:06 +0900)]
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

8 years agoClean up and improve generated OpenGraph tags (#4901)
Eugen Rochko [Tue, 12 Sep 2017 03:39:38 +0000 (05:39 +0200)]
Clean up and improve generated OpenGraph tags (#4901)

- Return all images as og:image
- Return videos as og:image (preview) and og:video
- Return profile:username on profiles

8 years agoFix nil error for old toots that don't have a conversation (#4900)
Eugen Rochko [Mon, 11 Sep 2017 22:57:18 +0000 (00:57 +0200)]
Fix nil error for old toots that don't have a conversation (#4900)

8 years agoFix #4894 - Merge context hash into final JSON hash after key transform (#4898)
Eugen Rochko [Mon, 11 Sep 2017 22:16:18 +0000 (00:16 +0200)]
Fix #4894 - Merge context hash into final JSON hash after key transform (#4898)

8 years agoFix count numbers from ActivityPub not being saved (#4899)
Eugen Rochko [Mon, 11 Sep 2017 22:16:03 +0000 (00:16 +0200)]
Fix count numbers from ActivityPub not being saved (#4899)

They are marked as read-only by Rails, but we know what we are doing,
so we are un-marking them as such.

The mastodon:maintenance:update_counter_caches task is not really
supposed to be run anymore (it was a one-time thing during an upgrade)
however, just in case, I have modified it to not touch ActivityPub
accounts.

Also, no point writing to logger from these rake tasks, since they
are not to be run from cron. Better to give stdout feedback.

8 years agoFix error when following locked accounts (#4896)
Eugen Rochko [Mon, 11 Sep 2017 21:50:37 +0000 (23:50 +0200)]
Fix error when following locked accounts (#4896)

8 years agoBump puma from 3.9.1 to 3.10.0 (#4879)
Grey Baker [Mon, 11 Sep 2017 21:43:19 +0000 (22:43 +0100)]
Bump puma from 3.9.1 to 3.10.0 (#4879)

Bumps [puma](https://github.com/puma/puma) from 3.9.1 to 3.10.0.
- [Release notes](https://github.com/puma/puma/releases/tag/v3.10.0)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.9.1...v3.10.0)

8 years agoBump rails from 5.1.3 to 5.1.4 (#4875)
Grey Baker [Mon, 11 Sep 2017 21:03:14 +0000 (22:03 +0100)]
Bump rails from 5.1.3 to 5.1.4 (#4875)

Bumps [rails](https://github.com/rails/rails) from 5.1.3 to 5.1.4.
- [Commits](https://github.com/rails/rails/compare/v5.1.3...v5.1.4)

8 years agoReset preview image if avatar/header image selection was cancelled (#4893)
unarist [Mon, 11 Sep 2017 14:19:54 +0000 (23:19 +0900)]
Reset preview image if avatar/header image selection was cancelled (#4893)

8 years agoAdd OpenStack Keystone V3 support (#4889)
Patrick Figel [Mon, 11 Sep 2017 13:11:13 +0000 (15:11 +0200)]
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.

8 years agol10n: Full PT-BR translation (#4882)
Anna e só [Sun, 10 Sep 2017 23:40:29 +0000 (20:40 -0300)]
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

8 years agol10n: update Persian translation (#4880)
Masoud Abkenar [Sun, 10 Sep 2017 23:35:27 +0000 (01:35 +0200)]
l10n: update Persian translation (#4880)

* l10n: update Persian translation

* l10n: fix missing Persian translation

8 years agoi18n: Update Polish translation (#4881)
m4sk1n [Sun, 10 Sep 2017 15:25:39 +0000 (17:25 +0200)]
i18n: Update Polish translation (#4881)

8 years agoBump to 1.6.0
Eugen Rochko [Sun, 10 Sep 2017 13:10:03 +0000 (15:10 +0200)]
Bump to 1.6.0

8 years agoFix POST /api/v1/follows error when already following (#4878)
Eugen Rochko [Sun, 10 Sep 2017 13:09:06 +0000 (15:09 +0200)]
Fix POST /api/v1/follows error when already following (#4878)

8 years agoFix Japanese translation (#4876)
yoshipc [Sun, 10 Sep 2017 11:34:15 +0000 (20:34 +0900)]
Fix Japanese translation (#4876)

I translated the additional text ( added by #4871)

8 years agoBump version to 1.6.0rc5
Eugen Rochko [Sun, 10 Sep 2017 08:26:51 +0000 (10:26 +0200)]
Bump version to 1.6.0rc5

8 years agoHide modal loading screen for media/video/boost/confirm/actions modals (#4873)
Eugen Rochko [Sun, 10 Sep 2017 08:26:01 +0000 (10:26 +0200)]
Hide modal loading screen for media/video/boost/confirm/actions modals (#4873)

8 years agoDefault follows for new users (#4871)
Eugen Rochko [Sun, 10 Sep 2017 07:58:38 +0000 (09:58 +0200)]
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)

8 years agoFix dimensions of loading component for compose drawer (#4872)
Eugen Rochko [Sun, 10 Sep 2017 06:48:11 +0000 (08:48 +0200)]
Fix dimensions of loading component for compose drawer (#4872)

8 years agoSet fallback address when empty notification address (#4868)
Yamagishi Kazutoshi [Sat, 9 Sep 2017 19:31:48 +0000 (04:31 +0900)]
Set fallback address when empty notification address (#4868)

8 years agoi10n minors changes for 1.6 (#4867)
Quent-in [Sat, 9 Sep 2017 16:22:56 +0000 (18:22 +0200)]
i10n minors changes for 1.6 (#4867)

* wrong preposition + typo

* wrong preposition + typo

* Typo

* Typo

* minor changes

* minor changes

8 years agoFix errors preventing UnsubscribeService from working (#4866)
Eugen Rochko [Sat, 9 Sep 2017 15:36:27 +0000 (17:36 +0200)]
Fix errors preventing UnsubscribeService from working (#4866)

8 years agoAdd script to make embedded iframes autosize (#4853)
Eugen Rochko [Sat, 9 Sep 2017 14:23:44 +0000 (16:23 +0200)]
Add script to make embedded iframes autosize (#4853)

8 years agoDisable mouse-based pause from #4859 (#4865)
Eugen Rochko [Sat, 9 Sep 2017 13:09:50 +0000 (15:09 +0200)]
Disable mouse-based pause from #4859 (#4865)

It wasn't working ideally and introduced some annoying false positivies

8 years agoBump version to 1.6.0rc4
Eugen Rochko [Sat, 9 Sep 2017 12:53:49 +0000 (14:53 +0200)]
Bump version to 1.6.0rc4

8 years agoFix scroll behavior and others on paused timeline (#4864)
unarist [Sat, 9 Sep 2017 12:16:11 +0000 (21:16 +0900)]
Fix scroll behavior and others on paused timeline (#4864)

Resolved:

* Lot of redundant renders while mouse moving
* Scroll jumping when timeline loaded
* Scroll position isn't kept when statuses below the scrollTop was deleted then new status arrived

Unresolved:

* Scroll position isn't kept when statuses over the scrollTop was deleted then new status arrived
-> It needs to know which statuses are over the scrollTop
* New status indicator should be active when new statuses arrived while mouse moved recently
-> It needs a) update indicator in ScrollableList, or b) set scrollTop status while mouse moving

8 years agoFix second report (regression from 3b81baaaaf51ff1c70fb1f865eef07fdb33a5950) (#4863)
Yamagishi Kazutoshi [Sat, 9 Sep 2017 11:42:48 +0000 (20:42 +0900)]
Fix second report (regression from 3b81baaaaf51ff1c70fb1f865eef07fdb33a5950) (#4863)

8 years agoAdd missing reject_media check before avatar download via ActivityPub (#4862)
Eugen Rochko [Sat, 9 Sep 2017 11:41:45 +0000 (13:41 +0200)]
Add missing reject_media check before avatar download via ActivityPub (#4862)

8 years agoScrollable tables in settings pages (#4857)
Lynx Kotoura [Sat, 9 Sep 2017 00:26:58 +0000 (09:26 +0900)]
Scrollable tables in settings pages (#4857)

* Scrollable tables in settings pages

* Add space before curly brace