about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-05-01Fix Rubocop offences (#2630)yhirano
* disable Bundler/OrderedGems * fix rubocop Lint/UselessAssignment * fix rubocop Style/BlockDelimiters * fix rubocop Style/AlignHash * fix rubocop Style/AlignParameters, Style/EachWithObject * fix rubocop Style/SpaceInLambdaLiteral
2017-05-01Detect extension for preview card (#2679)Yamagishi Kazutoshi
* Detect extension for preview card * next
2017-04-30Reports spec for media attachments, clean up method (#2660)Matt Jankowski
* Add coverage for Report#media_attachments * Direct query on media attachment
2017-04-30Add postgres/redis folder to .dockerignore (#2659)mecab
2017-04-30Updating Indonesian locale (#2644)Alvina Putri
* update id.jsx file * update id.yml for new strings and improvements * add activerecord.id.yml * improve translation that out of context * fix another ooc string * fix main key
2017-04-30Additional key checks for browser compatibility (#2539)Noëlle Anthony
Not all browsers recognize e.key === 'Escape'; some use 'Esc' and some only respond to the keyCode.
2017-04-30Center web app on larger windows sizes (#2021)Hugo Gameiro
* center web app for larger screen sizes * move center app to components.scss * center app on larger window sizes * center .columns-area
2017-04-30Fix character_counter.jsx (#2653)AA4ch1
This commit fixes #2576
2017-04-30Norwegian locale: Translates missing 2FA strings (#2655)Audun Larsen
* Adds missing strings to Norwegian locale * Translates missing strings. * Changes "tofaktorautentisering" to "to-faktor autentisering" According to the Norwegian National Security Authority this is the correct way to spell it. https://www.nsm.stat.no/blogg/veiledning-i-to-faktor-autentisering/
2017-04-30Minor fixes in the French translation (#2607)Sylvhem
* Changement de « muets » en « silencés » Utiliser le mot « muet » donne la fausse impression que ces comptes ne diffusent juste rien. Utiliser le mot « silencé » met l’accent sur le fait que ceci résulte d’une action de l’utilisateur·rice. By using tho word "muet" (mute), we give the false impression that this accounts don't publish anything. Using the "silencé" (muted) put emphasis on the fact that this is the result of one of the user's action. * Remplacement de « ' » par « ’ » En français, l’apostrophe utilisée est une apostrophe courbe « ’ » (U+2019) et non pas une apostrophe droite « ' » (U+0027). La plupart des chaînes utilisaient une apostrophe droite. Ce commit harmonise le type d’apostrophe utilisé en remplaçant toutes les apostrophes droites par des apostrophes courbes. In French, the apostrophe used is the curly one (U+2019) and not the vertical one (U+0027). Almost all the strings used a vertical apostrophe. This commit harmonize the kind of apostrophe used in the French localization by replacing all the vertical apostrophes by curly apostrophes. * Remplacement de « ... » par « … » Certaines chaînes utilisaient trois points d’affilié afin de représenter les points de suspension au lieu d’utiliser le caractère dédié « … » (U+2026). Ce commit harmonise la façon de représenter des points en remplaçant toutes les séries de trois points par le caractère dédié. Some chains used a series of three dots to show the ellipsis instead of using the dedicated character "…" (U+2026). This commit harmonize how the ellipsis is shown in the French localization by replacing all the series of three dots by the dedicated character. * Ajout d’un point final Il manque un point à la fin de la dernière phrase de la chaîne « compose_form.privacy_disclaimer ». Ce commit le rajoute. The last sentence of the "compose_form.privacy_disclaimer" string is missing a final dot. This commit will add it. * Retrait d’un « s » final à « Mastodon » Suite à la remarque de @wxcafe, retrait du « s » final à « Mastodon ». Following @wxcafe comment, this commit remove the final "s" in the word "Mastodon".
2017-04-30Update ar.jsx (#2647)ButterflyOfFire
* Update ar.jsx Updating some (ar) translation. * Update ar.yml Pushing some missing translation strings on ar.yml
2017-04-30Minor changes to Norwegian locale (#2652)Audun Larsen
2017-04-30Revert "Use PostgreSQL inheritance for blocks and mutes (#2520)" (#2634)Akihiko Odaki
This reverts commit 5135d609b774b177d3d3894b176a822d86b73d3c.
2017-04-30Add target=_blank to user note (#2622)Yamagishi Kazutoshi
* Add target=_blank to user note Open new window when click link from user profile in remote instance. * fix rubocop
2017-04-30Extract user tracking into concern (#2600)Matt Jankowski
2017-04-30allow localhost to bypass the ratelimit (#2554)Tristan Mahé
2017-04-30Use PostgreSQL inheritance for blocks and mutes (#2520)Akihiko Odaki
2017-04-30More coverage yes more even more (#2627)Matt Jankowski
* Add coverage for admin/confirmations controller * Coverage for statuses controller show action * Add coverage for admin/domain_blocks controller * Add coverage for settings/profiles#update
2017-04-30Downgrade rubocop 0.48.1 => 0.46.0 (#2628)yhirano
* downgrade rubocop 0.48.1 => 0.46.0 * exclude vendor/**/* from rubocop target files * add frozen_string_literal comment line * fix percent literal delimited by ( and ) * fix alignment * remove comment disabling unknown cop
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