about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-29Bump version to 1.3.2 (#2623)Eugen Rochko
2017-04-29fix(video): Position of play icon (#2608)Stephen Burgess
* fix(video): Position of play icon #2601 * fix(overlay-button): Positioning * fix(expand): Bottom align expand icon * feat(video): Fit landscape videos into preview area
2017-04-29Update index.js (#2612)YOU
2017-04-29Expand uploaded thumbnail (#2611)alpaca-tc
2017-04-29Remove uneeded `ORDER BY` query (#2615)alpaca-tc
2017-04-29Set unknown attachment type when adding domain blocks (#2605)Patrick Figel
Follow-up to #2599. When a domain block with `reject_media` is added or `rake mastodon:media:remove_remote` is invoked, mastodon deletes the locally cached attachments and avatars but does not reflect that change in the database, causing the `file` fields to still have values. This change persists the deletion in the database and sets the attachment type to unknown. This also introduces a one-off rake task that sets all attachments without a local file to the "unknown" type. The upgrade notes for the next release should contain a post-upgrade step with `rake mastodon:media:set_unknown`.
2017-04-29Add tests to the Feed model (#2594)Joël Quenneville
This adds a test for the `Feed#get` method. While the data transformations in `Feed#get` may seem redundant, they are important to maintain the order from Redis. The tests I wrote will fail if someone tries to refactor away this "redundancy" (as I tried to do in the first iteration of this change).
2017-04-29Set correct attachment type for rejected media (#2599)Patrick Figel
In #2110, a new attachment type "unknown" was introduced for attachments that were rejected due to a domain being blocked using reject_media. However, the "type" field was never set to "unknown" because a default value of "0" (image) is set for that column, causing the `type.blank?` expression to always equal false. This version uses type_changed? instead, causing the type to be set to "unknown" unless a type has been explicitly set. This introduces a small change in behaviour causing the type to be set to unknown before paperclip calls `before_post_process`. Presumably this behaviour is more appropriate than the current one because the attachment type has not been determined by that point. Included are new tests for `ProcessFeedService` and `UpdateRemoteProfileService` which now check that remote media is downloaded for non-blocked domains and is rejected for others.
2017-04-28Fix broken view spec for about/links (#2591)Matt Jankowski
2017-04-28Fix API for Mastodon version (#2590)Yamagishi Kazutoshi
Fix #2589
2017-04-28Minor updates to zh-CN JS translation (#2557)Mingye Wang
* Minor updates to zh-CN JS translation * removed "!" from "toot" per #2549 (it's a privacy indicator) * ellipsis work (from ... to some U+2026 horizontal ellipsis unicode stuff) * Spillcheck for zh-CN js translations (squash this) 部 [份→分]
2017-04-28Fix broken spec for about/links view partial (#2586)Matt Jankowski
2017-04-28Fix spec for hide get started (#2585)Yamagishi Kazutoshi
2017-04-28Hide get started link when register closed (#2583)Yamagishi Kazutoshi
2017-04-28More controller specs (#2561)Matt Jankowski
* Add render_views in more places * Delegate methods from account to user with allow nil true, so that admin accounts show view renders when missing a user * Use actual account instances in authorize follow controller spec
2017-04-28Update en locale federation description (#2558)Wonderfall
2017-04-28Update Russian translation (pluralizations) (#2565)Ratmir Karabut
* Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations)
2017-04-28Return missing page when tag does not exist (#2563)Matt Jankowski
2017-04-28Gem version updates (#2566)Matt Jankowski
* Update autoprefixer-rails to version 6.7.7.2 * Update aws-sdk to version 2.9.12 * Update http to version 2.2.2 * Update mail to version 2.6.5 * Update pghero to version 1.6.5 * Update ox to version 2.4.13 * Update json to version 2.1.0 * Update capistrano-rbenv to version 2.1.1 * Update httplog to version 0.99.3 * Update rainbow to version 2.2.2 * Update pkg-config to version 1.2.0 * Update globalid to version 0.4.0 * Update redis-rack to version 2.0.2 * Update webmock to version 3.0.1 * Update oj to version 3.0.2
2017-04-28More status specs (#2564)Matt Jankowski
* Add rough outline of coverage needed for public timeline * Specs for visibility, replies, boosts * Specs for silenced account * Specs for local_only option * Specs for blocks and mutes * Add tentative spec around including other silenced account statuses * Add with_public_visibility scope * Add simple coverage for tag_timeline * Tag timeline includes replies * Replace tag.statuses with a tagged_with scope in tag timeline method * Use with_public_visibility in tag timeline * Extract common scope between public and tag timelines to method * Extract local domain check to local_only scope * Extract local_only check to starting scope method * Move list of excluded from timeline account ids to account model * Simplify excluded accounts list on account model * Only join accounts when needed * Rename method for account specific filtering * Extract method for account exclusions * Fix bug where silenced accounts were not including statuses from other silenced accounts * DRY up filter application from account or no account * timeline_scope can be private * Add spec showing that account can find its excluded accounts ids * Add spec which fails if local_only does not have a left outer join * rubocop
2017-04-28Update Russian translation (#2570)Ratmir Karabut
New column subheadings
2017-04-28Update version to 1.3.1 (#2571)Ash Furrow
2017-04-28Use the new Ruby 1.9 hash syntax (#2577)y-temp4
2017-04-28Update settings_helper.rb (#2556)ButterflyOfFire
Correcting language name arabic = العربية
2017-04-28Update onboard federation description (#2555)Wonderfall
2017-04-28Add render_views to admin/reports controller spec (#2548)Matt Jankowski
2017-04-28Copy edits to reflect changes in post privacy (#2552)Shel Raphen
There was still a reference to "private posts" and the phrasing of unlisted in contrast to the others now made it seem strangely more private.
2017-04-28Fix remote follow (#2547)Matt Jankowski
* Add coverage for remote_follow#new * Fix reference to authorize_follows/card partial
2017-04-28Fix typo and wording in follower auth settings (#2544)Ratmir Karabut
2017-04-28fix partial path in admin/reports (#2546)Patrick Figel
In #2505, the authorize_follow views were renamed to authorize_follows. This change was not applied in the show view of admin/reports, which causes a 500 when reports are viewed.
2017-04-27Hotfix remote status formatting (#2543)Eugen Rochko
2017-04-27Language: Missing keys for pt-BR (#2540)Eduardo Elias
2017-04-27Update Japanese translation (and English translation file) for JavaScript ↵unarist
(#2538) * Update English translation file for JavaScript * Update Japanese translation for JavaScript
2017-04-27Change permission from 0755 to 0644 (#2536)yhirano
* chmod -x assets.rb * chmod -x assets/fonts * raname extname from jpeg to jpg
2017-04-27Fix broken oEmbed provider (#2537)Yamagishi Kazutoshi
2017-04-27Fix Doorkeeper error (#2534)Yamagishi Kazutoshi
* Fix Doorkeeper error * use Doorkeeper::OAuth::Scopes.from_string
2017-04-27Another (less urgent) Dutch string update (#2533)jeroenpraat
* Another (less urgent) update * Another (less urgent) update * Dutch strings: consistency: let's use 'voorkeuren' as a subset of 'instellingen'
2017-04-27Cache Status#ancestors recursive query results (#2527)Eugen Rochko
2017-04-27Improve shared status verification (#2525)Eugen Rochko
* Instead of parsing shared status contents verbatim, make roundtrip to purported original URL. Confirm that the "original" URL is from the same domain as the author it claims to be from. * Fix obvious typo, add comment * Use URI look-up first * Add test, update Goldfinger dependency to make less useless HTTP requests per Webfinger lookup
2017-04-27Last minute Dutch update and fix (after checking on live 1.3RC) (#2529)jeroenpraat
* Update and fix * Update and fix Dutch strings
2017-04-27Bump version, improve how version is stored for better commit history (#2526)Eugen Rochko
2017-04-27Catch error when server decryption fails on 2FA (#2512)Matt Jankowski
2017-04-27Added '(dev)' to the title in development mode (#2524)Ashley
* Added different title for dev * Changed indentation
2017-04-27OEmbed support for PreviewCard (#2337)Eugen Rochko
* OEmbed support for PreviewCard * Improve ProviderDiscovery code failure treatment * Do not crawl links if there is a content warning, since those don't display a link card anyway * Reset db schema * Fresh migrate * Fix rubocop style issues Fix #1681 - return existing access token when applicable instead of creating new * Fix test * Extract http client to helper * Improve oembed controller
2017-04-27Sync a locale files for JavaScript (#2513)Yamagishi Kazutoshi
There are multiple messages missing in en.jsx. It is very troublesome when translating other languages.
2017-04-27Don't need to include ActiveModel::Validations (#2521)Tomohiro Suwa
2017-04-27Add ActivityPub Actor id to WebFinger JSON. (#2522)Evan Minto
2017-04-27Add aria-label to icon driven dropdown menus (#2516)Lindsey Bieda
2017-04-27Copy over "Boost" hover text fix to detailed view. (#2508)Kaylee
from #1754, should close out #1394
2017-04-27Add spec coverage and refactor authorize_follows controller (#2505)Matt Jankowski