]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoMinor changes to Norwegian locale (#2652)
Audun Larsen [Sun, 30 Apr 2017 12:50:49 +0000 (14:50 +0200)]
Minor changes to Norwegian locale (#2652)

8 years agoRevert "Use PostgreSQL inheritance for blocks and mutes (#2520)" (#2634)
Akihiko Odaki [Sun, 30 Apr 2017 12:49:24 +0000 (21:49 +0900)]
Revert "Use PostgreSQL inheritance for blocks and mutes (#2520)" (#2634)

This reverts commit 5135d609b774b177d3d3894b176a822d86b73d3c.

8 years agoAdd target=_blank to user note (#2622)
Yamagishi Kazutoshi [Sat, 29 Apr 2017 22:28:41 +0000 (07:28 +0900)]
Add target=_blank to user note (#2622)

* Add target=_blank to user note

Open new window when click link from user profile in remote instance.

* fix rubocop

8 years agoExtract user tracking into concern (#2600)
Matt Jankowski [Sat, 29 Apr 2017 22:28:16 +0000 (18:28 -0400)]
Extract user tracking into concern (#2600)

8 years agoallow localhost to bypass the ratelimit (#2554)
Tristan Mahé [Sat, 29 Apr 2017 22:27:49 +0000 (15:27 -0700)]
allow localhost to bypass the ratelimit (#2554)

8 years agoUse PostgreSQL inheritance for blocks and mutes (#2520)
Akihiko Odaki [Sat, 29 Apr 2017 22:27:31 +0000 (07:27 +0900)]
Use PostgreSQL inheritance for blocks and mutes (#2520)

8 years agoMore coverage yes more even more (#2627)
Matt Jankowski [Sat, 29 Apr 2017 22:25:38 +0000 (18:25 -0400)]
More coverage yes more even more (#2627)

* 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

8 years agoDowngrade rubocop 0.48.1 => 0.46.0 (#2628)
yhirano [Sat, 29 Apr 2017 22:23:45 +0000 (07:23 +0900)]
Downgrade rubocop 0.48.1 => 0.46.0 (#2628)

* 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

8 years agoBump version to 1.3.2 (#2623)
Eugen Rochko [Sat, 29 Apr 2017 17:26:32 +0000 (19:26 +0200)]
Bump version to 1.3.2 (#2623)

8 years agofix(video): Position of play icon (#2608)
Stephen Burgess [Sat, 29 Apr 2017 13:23:27 +0000 (09:23 -0400)]
fix(video): Position of play icon (#2608)

* 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

8 years agoUpdate index.js (#2612)
YOU [Sat, 29 Apr 2017 12:35:16 +0000 (21:35 +0900)]
Update index.js (#2612)

8 years agoExpand uploaded thumbnail (#2611)
alpaca-tc [Sat, 29 Apr 2017 12:29:13 +0000 (21:29 +0900)]
Expand uploaded thumbnail (#2611)

8 years agoRemove uneeded `ORDER BY` query (#2615)
alpaca-tc [Sat, 29 Apr 2017 08:50:10 +0000 (17:50 +0900)]
Remove uneeded `ORDER BY` query (#2615)

8 years agoSet unknown attachment type when adding domain blocks (#2605)
Patrick Figel [Sat, 29 Apr 2017 00:44:03 +0000 (02:44 +0200)]
Set unknown attachment type when adding domain blocks (#2605)

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`.

8 years agoAdd tests to the Feed model (#2594)
Joël Quenneville [Fri, 28 Apr 2017 22:21:35 +0000 (18:21 -0400)]
Add tests to the Feed model (#2594)

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).

8 years agoSet correct attachment type for rejected media (#2599)
Patrick Figel [Fri, 28 Apr 2017 22:18:32 +0000 (00:18 +0200)]
Set correct attachment type for rejected media (#2599)

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.

8 years agoFix broken view spec for about/links (#2591)
Matt Jankowski [Fri, 28 Apr 2017 15:54:03 +0000 (11:54 -0400)]
Fix broken view spec for about/links (#2591)

8 years agoFix API for Mastodon version (#2590)
Yamagishi Kazutoshi [Fri, 28 Apr 2017 15:53:37 +0000 (00:53 +0900)]
Fix API for Mastodon version (#2590)

Fix #2589

8 years agoMinor updates to zh-CN JS translation (#2557)
Mingye Wang [Fri, 28 Apr 2017 14:45:41 +0000 (10:45 -0400)]
Minor updates to zh-CN JS translation (#2557)

* 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)

部 [份→分]

8 years agoFix broken spec for about/links view partial (#2586)
Matt Jankowski [Fri, 28 Apr 2017 14:45:24 +0000 (10:45 -0400)]
Fix broken spec for about/links view partial (#2586)

8 years agoFix spec for hide get started (#2585)
Yamagishi Kazutoshi [Fri, 28 Apr 2017 14:44:57 +0000 (23:44 +0900)]
Fix spec for hide get started (#2585)

8 years agoHide get started link when register closed (#2583)
Yamagishi Kazutoshi [Fri, 28 Apr 2017 13:45:37 +0000 (22:45 +0900)]
Hide get started link when register closed (#2583)

8 years agoMore controller specs (#2561)
Matt Jankowski [Fri, 28 Apr 2017 13:12:37 +0000 (09:12 -0400)]
More controller specs (#2561)

* 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

8 years agoUpdate en locale federation description (#2558)
Wonderfall [Fri, 28 Apr 2017 13:11:54 +0000 (15:11 +0200)]
Update en locale federation description (#2558)

8 years agoUpdate Russian translation (pluralizations) (#2565)
Ratmir Karabut [Fri, 28 Apr 2017 13:11:36 +0000 (16:11 +0300)]
Update Russian translation (pluralizations) (#2565)

* 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)

8 years agoReturn missing page when tag does not exist (#2563)
Matt Jankowski [Fri, 28 Apr 2017 13:11:21 +0000 (09:11 -0400)]
Return missing page when tag does not exist (#2563)

8 years agoGem version updates (#2566)
Matt Jankowski [Fri, 28 Apr 2017 13:10:58 +0000 (09:10 -0400)]
Gem version updates (#2566)

* 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

8 years agoMore status specs (#2564)
Matt Jankowski [Fri, 28 Apr 2017 13:10:41 +0000 (09:10 -0400)]
More status specs (#2564)

* 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

8 years agoUpdate Russian translation (#2570)
Ratmir Karabut [Fri, 28 Apr 2017 13:08:23 +0000 (16:08 +0300)]
Update Russian translation (#2570)

New column subheadings

8 years agoUpdate version to 1.3.1 (#2571)
Ash Furrow [Fri, 28 Apr 2017 13:07:48 +0000 (15:07 +0200)]
Update version to 1.3.1 (#2571)

8 years agoUse the new Ruby 1.9 hash syntax (#2577)
y-temp4 [Fri, 28 Apr 2017 13:07:16 +0000 (22:07 +0900)]
Use the new Ruby 1.9 hash syntax (#2577)

8 years agoUpdate settings_helper.rb (#2556)
ButterflyOfFire [Thu, 27 Apr 2017 23:59:19 +0000 (00:59 +0100)]
Update settings_helper.rb (#2556)

Correcting language name arabic = العربية

8 years agoUpdate onboard federation description (#2555)
Wonderfall [Thu, 27 Apr 2017 23:58:45 +0000 (01:58 +0200)]
Update onboard federation description (#2555)

8 years agoAdd render_views to admin/reports controller spec (#2548)
Matt Jankowski [Thu, 27 Apr 2017 23:21:38 +0000 (19:21 -0400)]
Add render_views to admin/reports controller spec (#2548)

8 years agoCopy edits to reflect changes in post privacy (#2552)
Shel Raphen [Thu, 27 Apr 2017 23:21:26 +0000 (19:21 -0400)]
Copy edits to reflect changes in post privacy (#2552)

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.

8 years agoFix remote follow (#2547)
Matt Jankowski [Thu, 27 Apr 2017 22:16:44 +0000 (18:16 -0400)]
Fix remote follow (#2547)

* Add coverage for remote_follow#new

* Fix reference to authorize_follows/card partial

8 years agoFix typo and wording in follower auth settings (#2544)
Ratmir Karabut [Thu, 27 Apr 2017 22:16:31 +0000 (01:16 +0300)]
Fix typo and wording in follower auth settings (#2544)

8 years agofix partial path in admin/reports (#2546)
Patrick Figel [Thu, 27 Apr 2017 22:09:25 +0000 (00:09 +0200)]
fix partial path in admin/reports (#2546)

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.

8 years agoHotfix remote status formatting (#2543)
Eugen Rochko [Thu, 27 Apr 2017 21:37:22 +0000 (23:37 +0200)]
Hotfix remote status formatting (#2543)

8 years agoLanguage: Missing keys for pt-BR (#2540)
Eduardo Elias [Thu, 27 Apr 2017 20:32:38 +0000 (21:32 +0100)]
Language: Missing keys for  pt-BR (#2540)

8 years agoUpdate Japanese translation (and English translation file) for JavaScript (#2538)
unarist [Thu, 27 Apr 2017 18:41:25 +0000 (03:41 +0900)]
Update Japanese translation (and English translation file) for JavaScript (#2538)

* Update English translation file for JavaScript

* Update Japanese translation for JavaScript

8 years agoChange permission from 0755 to 0644 (#2536)
yhirano [Thu, 27 Apr 2017 17:29:41 +0000 (02:29 +0900)]
Change permission from 0755 to 0644 (#2536)

* chmod -x assets.rb

* chmod -x assets/fonts

* raname extname from jpeg to jpg

8 years agoFix broken oEmbed provider (#2537)
Yamagishi Kazutoshi [Thu, 27 Apr 2017 17:29:11 +0000 (02:29 +0900)]
Fix broken oEmbed provider (#2537)

8 years agoFix Doorkeeper error (#2534)
Yamagishi Kazutoshi [Thu, 27 Apr 2017 16:04:28 +0000 (01:04 +0900)]
Fix Doorkeeper error (#2534)

* Fix Doorkeeper error

* use Doorkeeper::OAuth::Scopes.from_string

8 years agoAnother (less urgent) Dutch string update (#2533)
jeroenpraat [Thu, 27 Apr 2017 15:54:34 +0000 (17:54 +0200)]
Another (less urgent) Dutch string update (#2533)

* Another (less urgent) update

* Another (less urgent) update

* Dutch strings: consistency:  let's use 'voorkeuren' as a subset of 'instellingen'

8 years agoCache Status#ancestors recursive query results (#2527)
Eugen Rochko [Thu, 27 Apr 2017 15:07:15 +0000 (17:07 +0200)]
Cache Status#ancestors recursive query results (#2527)

8 years agoImprove shared status verification (#2525)
Eugen Rochko [Thu, 27 Apr 2017 15:06:47 +0000 (17:06 +0200)]
Improve shared status verification (#2525)

* 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

8 years agoLast minute Dutch update and fix (after checking on live 1.3RC) (#2529)
jeroenpraat [Thu, 27 Apr 2017 15:00:03 +0000 (17:00 +0200)]
Last minute Dutch update and fix (after checking on live 1.3RC) (#2529)

* Update and fix

* Update and fix Dutch strings

8 years agoBump version, improve how version is stored for better commit history (#2526)
Eugen Rochko [Thu, 27 Apr 2017 13:22:19 +0000 (15:22 +0200)]
Bump version, improve how version is stored for better commit history (#2526)

8 years agoCatch error when server decryption fails on 2FA (#2512)
Matt Jankowski [Thu, 27 Apr 2017 13:18:21 +0000 (09:18 -0400)]
Catch error when server decryption fails on 2FA (#2512)

8 years agoAdded '(dev)' to the title in development mode (#2524)
Ashley [Thu, 27 Apr 2017 13:17:55 +0000 (01:17 +1200)]
Added '(dev)' to the title in development mode (#2524)

* Added different title for dev

* Changed indentation

8 years agoOEmbed support for PreviewCard (#2337)
Eugen Rochko [Thu, 27 Apr 2017 12:42:22 +0000 (14:42 +0200)]
OEmbed support for PreviewCard (#2337)

* 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

8 years agoSync a locale files for JavaScript (#2513)
Yamagishi Kazutoshi [Thu, 27 Apr 2017 10:03:28 +0000 (19:03 +0900)]
Sync a locale files for JavaScript (#2513)

There are multiple messages missing in en.jsx.
It is very troublesome when translating other languages.

8 years agoDon't need to include ActiveModel::Validations (#2521)
Tomohiro Suwa [Thu, 27 Apr 2017 10:02:55 +0000 (19:02 +0900)]
Don't need to include ActiveModel::Validations (#2521)

8 years agoAdd ActivityPub Actor id to WebFinger JSON. (#2522)
Evan Minto [Thu, 27 Apr 2017 10:02:41 +0000 (03:02 -0700)]
Add ActivityPub Actor id to WebFinger JSON. (#2522)

8 years agoAdd aria-label to icon driven dropdown menus (#2516)
Lindsey Bieda [Thu, 27 Apr 2017 10:01:36 +0000 (06:01 -0400)]
Add aria-label to icon driven dropdown menus (#2516)

8 years agoCopy over "Boost" hover text fix to detailed view. (#2508)
Kaylee [Wed, 26 Apr 2017 23:53:55 +0000 (00:53 +0100)]
Copy over "Boost" hover text fix to detailed view. (#2508)

from #1754, should close out #1394

8 years agoAdd spec coverage and refactor authorize_follows controller (#2505)
Matt Jankowski [Wed, 26 Apr 2017 22:19:53 +0000 (18:19 -0400)]
Add spec coverage and refactor authorize_follows controller (#2505)

8 years agoUpdate Russian translation (rebased) (#2503)
Koala Yeung [Wed, 26 Apr 2017 20:33:54 +0000 (04:33 +0800)]
Update Russian translation (rebased) (#2503)

* 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

* Update Russian translation

* Fix merge conflicts

Redid Works by @rkarabut

8 years agotravis: Add yarn and nodejs caching (#2504)
Koala Yeung [Wed, 26 Apr 2017 20:32:23 +0000 (04:32 +0800)]
travis: Add yarn and nodejs caching (#2504)

Also cache node_module and yarn cache in Travis test process.
Improves speed for Travis tests.

8 years agoDomain block service cleanup (#2490)
Matt Jankowski [Wed, 26 Apr 2017 18:09:01 +0000 (14:09 -0400)]
Domain block service cleanup (#2490)

* Add coverage for domain block service with silence

* Get rid of warning about find_each and order

* Move domain_block to attr_reader

* Move optional clear_media into silence_accounts method

* Use blocked_domain method to reduce passed vars

* Extract blocked_domain_accounts method to find accounts on the domain

* Extract media_from_blocked_domain method to find relevant attachments

* Separate destruction of account images and account attachments

8 years agoAdd spec for Status.as_home_timeline (#2451)
Matt Jankowski [Wed, 26 Apr 2017 18:08:30 +0000 (14:08 -0400)]
Add spec for Status.as_home_timeline (#2451)

8 years agoUpdated renamed i18n keys in `de` translation (#2500)
Matt Jankowski [Wed, 26 Apr 2017 17:33:10 +0000 (13:33 -0400)]
Updated renamed i18n keys in `de` translation (#2500)

8 years agofix indentation in translation file (#2498)
Matthieu Paret [Wed, 26 Apr 2017 16:48:43 +0000 (18:48 +0200)]
fix indentation in translation file (#2498)

8 years agoadd task to report code statistics (#2489)
yhirano [Wed, 26 Apr 2017 16:47:22 +0000 (01:47 +0900)]
add task to report code statistics (#2489)

8 years agoUpdate German translation (#2485)
Benedikt Geißler [Wed, 26 Apr 2017 13:46:14 +0000 (15:46 +0200)]
Update German translation (#2485)

8 years agoUpdate of simple_forum OC (#2486)
Quent-in [Wed, 26 Apr 2017 13:45:58 +0000 (15:45 +0200)]
Update of simple_forum OC (#2486)

Now perfectly similar to the English one.

8 years agoUpdate Japanese translation (#2487)
Yamagishi Kazutoshi [Wed, 26 Apr 2017 13:45:47 +0000 (22:45 +0900)]
Update Japanese translation (#2487)

follow up #1309 & #2279

8 years agoRed favicon for dev (#2470)
Lindsey Bieda [Wed, 26 Apr 2017 13:45:27 +0000 (09:45 -0400)]
Red favicon for dev (#2470)

* Set a dev specific favicon

* Consistent spacing

* Add trailing slash for consistency

* Update to remove interpolation

8 years agoDon't toot request with only blank characters (#2154)
Tomohiro Suwa [Wed, 26 Apr 2017 13:18:09 +0000 (22:18 +0900)]
Don't toot request with only blank characters (#2154)

* Don't toot request with only blank characters

* Enable toot button if no text

8 years agoFix undefined variable in OnboardingModal (#2482)
Yamagishi Kazutoshi [Wed, 26 Apr 2017 13:15:47 +0000 (22:15 +0900)]
Fix undefined variable in OnboardingModal (#2482)

8 years agoUpdate ar.jsx (#2469)
Koala Yeung [Wed, 26 Apr 2017 12:55:15 +0000 (20:55 +0800)]
Update ar.jsx (#2469)

Adding more missing strings.

8 years agoUpdate Japanese translation for activitypub and authorized followers (#2471)
anon [Wed, 26 Apr 2017 12:54:35 +0000 (21:54 +0900)]
Update Japanese translation for activitypub and authorized followers (#2471)

* Update Japanese translation for activitypub and authorized followers

* Fixed Japanese translation by review

8 years agofix onboarding modal (#2477)
Wonderfall [Wed, 26 Apr 2017 12:54:12 +0000 (14:54 +0200)]
fix onboarding modal (#2477)

8 years agoFix various regressions (#2466)
Eugen Rochko [Wed, 26 Apr 2017 02:40:27 +0000 (04:40 +0200)]
Fix various regressions (#2466)

8 years agoFix #2261 - noopener typo (#2463)
Eugen Rochko [Wed, 26 Apr 2017 01:55:51 +0000 (03:55 +0200)]
Fix #2261 - noopener typo (#2463)

8 years agoAdd media dimensions (#2448)
Francis Chong [Wed, 26 Apr 2017 01:48:12 +0000 (09:48 +0800)]
Add media dimensions (#2448)

* Fixes #1985

- add migration AddMediaAttachmentMeta, which add meta field to media_attachments
- before saving attachment, set file meta if needed
- add meta in api

* add spec

* align the “size” format for image and video

* fix code climate

* fixes media_attachment_spec.rb

8 years agoattach_media should be in transaction of creation status (#2426)
Keiji, Yoshimi [Wed, 26 Apr 2017 01:47:44 +0000 (10:47 +0900)]
attach_media should be in transaction of creation status (#2426)

8 years agoMove a locale files for ActiveRecord (#2461)
Yamagishi Kazutoshi [Wed, 26 Apr 2017 00:16:30 +0000 (09:16 +0900)]
Move a locale files for ActiveRecord (#2461)

ref #2162 and fix #2460

8 years agoAdded the repository field and a script for after npm version (#2459)
Michael Deeb [Tue, 25 Apr 2017 23:51:51 +0000 (16:51 -0700)]
Added the repository field and a script for after npm version (#2459)

8 years agoToolbar icons accessible names (#1424)
JP DeVries [Tue, 25 Apr 2017 23:44:50 +0000 (01:44 +0200)]
Toolbar icons accessible names (#1424)

Closes tootsuite/mastodon#1349

This is my first PR and I’m only checking in the source JSX file.
Please let me know if it should be checked in after being built also.

8 years agoStricter whitelist rules (#2213)
Guillaume Lo Re [Tue, 25 Apr 2017 23:22:51 +0000 (01:22 +0200)]
Stricter whitelist rules (#2213)

* Stricter whitelist rules

* Linting

* Added spec for blacklisting

* Test subdomain blacklist on domain whitelist

* No need to split

* Change spec name

8 years agoMake the getting started ui more intuitive (#1309)
Amelia [Tue, 25 Apr 2017 23:21:05 +0000 (16:21 -0700)]
Make the getting started ui more intuitive (#1309)

8 years agoMissing occitan locale file (#2446)
Quent-in [Tue, 25 Apr 2017 21:26:53 +0000 (23:26 +0200)]
Missing occitan locale file (#2446)

Based on the device.en file

8 years agoRefine CW placeholder in Chinese jsx files (#2447)
Mingye Wang [Tue, 25 Apr 2017 21:26:46 +0000 (17:26 -0400)]
Refine CW placeholder in Chinese jsx files (#2447)

8 years agoComplete proofreading and addition for zh-CN YML translations (#2445)
Mingye Wang [Tue, 25 Apr 2017 21:26:33 +0000 (17:26 -0400)]
Complete proofreading and addition for zh-CN YML translations (#2445)

* proofread & update zh-CN setting form locale

* Pull in new devise zh-CN translations from their wiki

https://github.com/plataformatec/devise/wiki/I18n,
more precisely https://gist.github.com/Artoria2e5/6d2a06ca9e92a417afc627b5000f4690

* pull in zh-CN translation for doorkeeper

... from https://github.com/doorkeeper-gem/doorkeeper-i18n/pull/31/

8 years agofix typo on daily tasks logging (#2450)
esetomo [Tue, 25 Apr 2017 18:35:20 +0000 (03:35 +0900)]
fix typo on daily tasks logging (#2450)

8 years agoConvert to "container-based" travis build (#2449)
Mingye Wang [Tue, 25 Apr 2017 18:14:34 +0000 (14:14 -0400)]
Convert to "container-based" travis build (#2449)

* Convert to "container-based" travis build

Since all ppa sources used are currently whitelisted by Travis, why don't we convert to a "sudo-less" structure that promises a shorter build start time?

* Explicitly disable sudo in Travis

8 years agoFixes string length issue for multibyte characters. (#2443)
Ash Furrow [Tue, 25 Apr 2017 15:37:51 +0000 (17:37 +0200)]
Fixes string length issue for multibyte characters. (#2443)

8 years agoAdds logging for daily tasks (#2438)
Ash Furrow [Tue, 25 Apr 2017 14:44:48 +0000 (16:44 +0200)]
Adds logging for daily tasks (#2438)

* Adds logging for daily tasks.

* Fixes Code Climate issues in #2438.

8 years agoAdjust status action bar icons (#2424)
Stephen Burgess [Tue, 25 Apr 2017 13:16:09 +0000 (08:16 -0500)]
Adjust status action bar icons (#2424)

Set status action bar to have display flex and center align items so dropdown icon appears center aligned with other icons. Make styles alpha organized.

Add hover state to boost icon - lighten color on hover.

8 years agoRefactor seed.rb (#2430)
Hiroe Jun [Tue, 25 Apr 2017 13:15:37 +0000 (22:15 +0900)]
Refactor seed.rb (#2430)

8 years agoLocalize with i18n for Devise::FailureApp (#2309)
alpaca-tc [Tue, 25 Apr 2017 13:06:41 +0000 (22:06 +0900)]
Localize with i18n for Devise::FailureApp (#2309)

This PR fixes I18n.locale for rake middlewares. Mastodon uses Devise that depends on Warden.
Warden::Manager can be found in rake middleware. It is outside of the controller.

In the case of authentication failed, warden calls throw(:warden). At the time Warden::Manager
delegates request to failure_app to generate response and flash[:alert] after catching it.
Unfortunately, I18n.locale is already reset then because I18n.with_locale is enabled only
inside the controller. If we used I18n.locale=, Devise::FailureApp could get the current locale.

8 years agoLogin link for single user instances (#2393)
STJrInuyasha [Tue, 25 Apr 2017 13:06:24 +0000 (06:06 -0700)]
Login link for single user instances (#2393)

* Login link for single user instances

* Flip the if statement around
Fixes AuthorizationController tests

8 years agoChange ActivityPub paging to match spec. Clean up ActivityPub outbox changes. (#2410)
Evan Minto [Tue, 25 Apr 2017 13:06:06 +0000 (06:06 -0700)]
Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes. (#2410)

* Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes.

* Fix code style and test failures for OutboxController.

* Attempt to fix CI errors.

8 years agoFix #2402 - Add Idempotency-Key header to PostStatusService that prevents (#2419)
Eugen Rochko [Tue, 25 Apr 2017 13:04:49 +0000 (15:04 +0200)]
Fix #2402 - Add Idempotency-Key header to PostStatusService that prevents (#2419)

duplicates. Web UI regenerates UUID for that header every time the compose
form is changed or successfully submitted

Also, fix Farsi i18n overwriting the English one

8 years agoDecodes URL containing IDN (#2436)
Yamagishi Kazutoshi [Tue, 25 Apr 2017 13:03:51 +0000 (22:03 +0900)]
Decodes URL containing IDN (#2436)

8 years agoFix Persian translation (#2428) (#2432)
Matt Jankowski [Tue, 25 Apr 2017 09:17:52 +0000 (05:17 -0400)]
Fix Persian translation (#2428) (#2432)

Settings page contained labels in Persian, when I was using English.

8 years agoUsername above toot box UI changes (#2418)
Ash Furrow [Tue, 25 Apr 2017 02:45:27 +0000 (04:45 +0200)]
Username above toot box UI changes (#2418)

* Makes username above toot box into a link.

* Prepends username above toot box with an @.

8 years agoOptimize account search (#2421)
178inaba [Tue, 25 Apr 2017 02:44:43 +0000 (11:44 +0900)]
Optimize account search (#2421)