about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-09-13fix share intent. (#4926)MitarashiDango
2017-09-13Fix ActivityPub handling of replies with WEB_DOMAIN (#4895) (#4904)ThibG
* 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
2017-09-13Add instance search feature (#4925)nullkal
2017-09-13Make instance names in into links to user list in the instance (#4924)nullkal
2017-09-13Fix #4917 - Add missing suspend checks (#4921)Eugen Rochko
2017-09-13Fix #4918 - Limit pinned toots to 5 (#4923)Eugen Rochko
2017-09-13Fix height cache (#4909)abcang
2017-09-13Specify libicu explicitly in Aptfile (#4920)Daigo 3 Dango
It seems libicu-dev no longer installs libicu55 needed by charlock_holmes.
2017-09-12[WiP] Whenever a remote keypair changes, unfollow them and re-subscribe to ↵ThibG
… (#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
2017-09-12Add section for protocol specific information on the admin page (#4910)unarist
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-12Clean up and improve generated OpenGraph tags (#4901)Eugen Rochko
- Return all images as og:image - Return videos as og:image (preview) and og:video - Return profile:username on profiles
2017-09-12Fix nil error for old toots that don't have a conversation (#4900)Eugen Rochko
2017-09-12Fix #4894 - Merge context hash into final JSON hash after key transform (#4898)Eugen Rochko
2017-09-12Fix count numbers from ActivityPub not being saved (#4899)Eugen Rochko
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.
2017-09-11Fix error when following locked accounts (#4896)Eugen Rochko
2017-09-11Bump puma from 3.9.1 to 3.10.0 (#4879)Grey Baker
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)
2017-09-11Bump rails from 5.1.3 to 5.1.4 (#4875)Grey Baker
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)
2017-09-11Reset preview image if avatar/header image selection was cancelled (#4893)unarist
2017-09-11Add OpenStack Keystone V3 support (#4889)Patrick Figel
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-11l10n: Full PT-BR translation (#4882)Anna e só
* 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-11l10n: update Persian translation (#4880)Masoud Abkenar
* l10n: update Persian translation * l10n: fix missing Persian translation
2017-09-11i18n: Update Polish translation (#4881)m4sk1n
2017-09-10Bump to 1.6.0Eugen Rochko
2017-09-10Fix POST /api/v1/follows error when already following (#4878)Eugen Rochko
2017-09-10Fix Japanese translation (#4876)yoshipc
I translated the additional text ( added by #4871)
2017-09-10Bump version to 1.6.0rc5Eugen Rochko
2017-09-10Hide modal loading screen for media/video/boost/confirm/actions modals (#4873)Eugen Rochko
2017-09-10Default follows for new users (#4871)Eugen Rochko
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-10Fix dimensions of loading component for compose drawer (#4872)Eugen Rochko
2017-09-09Set fallback address when empty notification address (#4868)Yamagishi Kazutoshi
2017-09-09i10n minors changes for 1.6 (#4867)Quent-in
* wrong preposition + typo * wrong preposition + typo * Typo * Typo * minor changes * minor changes
2017-09-09Fix errors preventing UnsubscribeService from working (#4866)Eugen Rochko
2017-09-09Add script to make embedded iframes autosize (#4853)Eugen Rochko
2017-09-09Disable mouse-based pause from #4859 (#4865)Eugen Rochko
It wasn't working ideally and introduced some annoying false positivies
2017-09-09Bump version to 1.6.0rc4Eugen Rochko
2017-09-09Fix scroll behavior and others on paused timeline (#4864)unarist
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
2017-09-09Fix second report (regression from 3b81baaaaf51ff1c70fb1f865eef07fdb33a5950) ↵Yamagishi Kazutoshi
(#4863)
2017-09-09Add missing reject_media check before avatar download via ActivityPub (#4862)Eugen Rochko
2017-09-09Scrollable tables in settings pages (#4857)Lynx Kotoura
* Scrollable tables in settings pages * Add space before curly brace
2017-09-09Fix #1004 - Temporarily pause timeline if there's been recent mouse movement ↵Eugen Rochko
(#4859)
2017-09-09Fix #4852 - Check if already requested from FollowService (#4855)Eugen Rochko
2017-09-09Fix #4850 - When visibility missing from API call to toot, fallback to user ↵Eugen Rochko
preference (#4861)
2017-09-08Refresh timeline after toot while the timeline is disconnected (#4858)unarist
To reflect status posting immediately, we've inserted the status into timelines directly. However, status insertion changes "latest status", and it means next timeline refresh only fetches statuses since the inserted status. This behavior is very bad for disconnected timeline and mobile views. After this patch, it refreshes timeline for disconnected timelines, instead of direct insertion.
2017-09-08Handle stream_entry URL correctly in ActivityPub (#4854)unarist
In before, the method uses stream_entry id as status id, so replied status was wrongly selected. This PR uses StatusFinder which was introduced with `Api::Web::EmbedsController`.
2017-09-08i10n update OC and FR (#4849)Quent-in
* Missing "navigation_bar.pins" * Missing "navigation_bar.pins"
2017-09-08Fix language filter codes (#4841)Eugen Rochko
* Fix language filter codes CLD3 returns BCP-47 language identifier, filter settings expect identifiers in the ISO 639-1 format. Convert between formats, and exclude duplicate languages from filter choices (zh-CN->zh) * Fix zh name
2017-09-08"Mute conversation" option on all own toots, not just in notifications (#4844)Eugen Rochko
That way you can mute notifications for a toot before you get replies to it or boosts or favourites
2017-09-08Fetch statuses/following/followers numbers from ActivityPub collections (#4840)Eugen Rochko
2017-09-08i18n: Update Polish translation (#4845)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-09-07i10n OC / FR update Pinned toots (#4842)Quent-in
* Added column.pins New strings * Added column.pins * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * Update password_change.oc.html.erb * Update password_change.oc.text.erb * Update reset_password_instructions.oc.html.erb * Update reset_password_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb