]> cat aescling's git repositories - mastodon.git/log
mastodon.git
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)

8 years agoPunycode URI normalization (#2370)
Eugen [Tue, 25 Apr 2017 00:47:31 +0000 (02:47 +0200)]
Punycode URI normalization (#2370)

* Fix #2119 - Whenever about to send a HTTP request, normalize the URI

* Add test for IDN request in FetchLinkCardService

* Perform IDN normalization on domains before they are stored in the DB

8 years agoPersian translation (#2405)
Masoud Abkenar [Mon, 24 Apr 2017 20:39:15 +0000 (22:39 +0200)]
Persian translation (#2405)

* Persian translation

* adding :fa to make the site use the rtl stylesheet

based on [this comment](https://github.com/tootsuite/mastodon/pull/2405#issuecomment-296721105)

* fix missing quotes

* add 'fa' locale

8 years agoAdd more FeedManager#filter? tests (#2413)
Eugen [Mon, 24 Apr 2017 20:37:24 +0000 (22:37 +0200)]
Add more FeedManager#filter? tests (#2413)

8 years agoRun i18n-tasks normalize (#2412)
Eugen [Mon, 24 Apr 2017 18:52:55 +0000 (20:52 +0200)]
Run i18n-tasks normalize (#2412)

8 years agofix(styles): Spoiler trigger zindex, close modal button position (#2406)
Stephen Burgess [Mon, 24 Apr 2017 18:20:16 +0000 (13:20 -0500)]
fix(styles): Spoiler trigger zindex, close modal button position (#2406)

#2338

8 years agoadd `patch` method support to CORS (#2408)
Shin Adachi [Mon, 24 Apr 2017 18:19:51 +0000 (03:19 +0900)]
add `patch` method support to CORS (#2408)

8 years agoOnly show upload modal when drag event contains files (#2409)
Stephen Burgess [Mon, 24 Apr 2017 18:19:33 +0000 (13:19 -0500)]
Only show upload modal when drag event contains files (#2409)

* fix(upload): Only show upload modal when drag even contains files

* fix(firefox): Close drag window ondragend also

Do not only end drag styles on drag leave, but also on drag end. Fixes firefox bug. #687

* fix(drag-modal): Remove drag modal trigger cruft

* fix(upload-modal): Allow close with escape button

8 years agoAdd an RTL stylesheet for Arabic i18n (#2378)
Eugen [Mon, 24 Apr 2017 16:03:53 +0000 (18:03 +0200)]
Add an RTL stylesheet for Arabic i18n (#2378)

8 years agoForce wrap long email address (#2395)
Yamagishi Kazutoshi [Mon, 24 Apr 2017 15:31:01 +0000 (00:31 +0900)]
Force wrap long email address (#2395)

8 years agoFix flashes partial render error for controllers which don't inherit from application...
Matt Jankowski [Mon, 24 Apr 2017 15:30:30 +0000 (11:30 -0400)]
Fix flashes partial render error for controllers which don't inherit from application controller (#2400)

* Add failing spec for oauth/authorized_applications controller

* Use explicit reference to flashes partial from admin layout

Because some of the controllers which use the admin layout do not inherit from
application controller, this partial is not in their view path.

8 years agoAdd index to statuses_tags#status_id (#2394)
alpaca-tc [Mon, 24 Apr 2017 13:10:14 +0000 (22:10 +0900)]
Add index to statuses_tags#status_id (#2394)

8 years agoHide some components rather than unmounting (#2271)
Akihiko Odaki [Mon, 24 Apr 2017 02:49:08 +0000 (11:49 +0900)]
Hide some components rather than unmounting (#2271)

Hide some components rather than unmounting them to allow to show again
quickly and keep the view state such as the scrolled offset.

8 years agoFix background-size being overwritten (#2382)
Yamagishi Kazutoshi [Mon, 24 Apr 2017 02:10:32 +0000 (11:10 +0900)]
Fix background-size being overwritten (#2382)

8 years agoLanguage: Missing keys for pt and pt-BR (#2355)
Eduardo Elias [Mon, 24 Apr 2017 00:49:29 +0000 (01:49 +0100)]
Language: Missing keys for pt and pt-BR (#2355)

8 years agoReturn force_ssl to the controller (#2380)
Matt Jankowski [Mon, 24 Apr 2017 00:44:05 +0000 (20:44 -0400)]
Return force_ssl to the controller (#2380)

8 years agoSimplify browserify+babelify config (#2377)
Nolan Lawson [Mon, 24 Apr 2017 00:19:10 +0000 (17:19 -0700)]
Simplify browserify+babelify config (#2377)

8 years agoImprove Japanese translation (#2376)
Yamagishi Kazutoshi [Mon, 24 Apr 2017 00:18:41 +0000 (09:18 +0900)]
Improve Japanese translation (#2376)

ref #2359

- https://github.com/tootsuite/mastodon/pull/2359#discussion_r112838771
- https://github.com/tootsuite/mastodon/pull/2359#discussion_r112838772
- https://github.com/tootsuite/mastodon/pull/2359#discussion_r112838812
- https://github.com/tootsuite/mastodon/pull/2359#discussion_r112838823
- https://github.com/tootsuite/mastodon/pull/2359#discussion_r112838829

8 years agoReport processing improvements (#2349)
Effy Elden [Sun, 23 Apr 2017 22:44:37 +0000 (08:44 +1000)]
Report processing improvements (#2349)

* Expose media attachments on reported statuses directly

* Comment out unused bulk report checkbox. Add title to report comment for viewing full comment. Add 'contents' column, with icons and numerical indicators to show the number of referenced statuses and media attachments in the report

* Link account name on authorize_follow card back to account

* Add localisation string for report_contents

* Show new admin accounts card partial on report view. Apply simple_format to report comment so newlines are preserved.

* Add new admin accounts card partial, for display quick useful admin stats (e.g. report history, moderation status).

* Fix localized variable

8 years agoFollowers-only post federation (#2111)
Eugen [Sun, 23 Apr 2017 22:38:37 +0000 (00:38 +0200)]
Followers-only post federation (#2111)

* Make private toots get PuSHed to subscription URLs that belong to domains where you have approved followers

* Authorized followers controller, stub for bulk action

* Soft block in the background

* Add simple test for new controller

* Rename Settings::FollowersController to Settings::FollowerDomainsController, paginate results,
rename "private" post setting to "followers-only", fix pagination style, improve post privacy
preferences style, improve warning style

* Extract compose form warnings into own container, show warning when posting to followers-only with unlocked account

8 years agoFixes problem with showing non-local accounts. (#2371)
Ash Furrow [Sun, 23 Apr 2017 20:15:10 +0000 (22:15 +0200)]
Fixes problem with showing non-local accounts. (#2371)

8 years agoAdd link for domain in land strip (#2306)
ymmtmdk [Sun, 23 Apr 2017 19:45:03 +0000 (04:45 +0900)]
Add link for domain in land strip (#2306)

* Add link for domain in land strip

* Use root_path

* Avoid repeating code

8 years agoUpdate Japanese translation (#2360)
Yamagishi Kazutoshi [Sun, 23 Apr 2017 19:34:48 +0000 (04:34 +0900)]
Update Japanese translation (#2360)

for #2181

8 years agofix(style): Fix styles after classname refactor (#2368)
Stephen Burgess [Sun, 23 Apr 2017 19:34:33 +0000 (14:34 -0500)]
fix(style): Fix styles after classname refactor (#2368)

Float detailed status display avatar left. Only apply display block to display names in status info, not in detailed status. Thanks to @nightpool for finding those. Make star icon in notification show up as gold. Add anchor selector back to status__content__spoiler-link in order to override default anchor style elsewhere.

8 years agofeat(cw-button): Add aria controls to CW trigger (#2303)
Stephen Burgess [Sun, 23 Apr 2017 18:33:44 +0000 (13:33 -0500)]
feat(cw-button): Add aria controls to CW trigger (#2303)

Add an ID to the CW spoiler input field to give aria-controls a handle on it. Pass that id to the CW trigger button. Modify text icon button component to accept aria controls id value. Add aria-expanded value to text icon button to indicate when it is expanded.

8 years agoFix deprecation warnings on activitypub controller specs (#2357)
Matt Jankowski [Sun, 23 Apr 2017 17:10:04 +0000 (13:10 -0400)]
Fix deprecation warnings on activitypub controller specs (#2357)

8 years agoEnsure i18n matches options (#2358)
Matt Jankowski [Sun, 23 Apr 2017 17:09:52 +0000 (13:09 -0400)]
Ensure i18n matches options (#2358)

* Add failing spec showing that human_locales does not match what i18n knows about

* Add missing `ar` key for arabic to human locales

* Remove duplicate `id` key from available locales

* Sort keys in human locales list

* Add spec for human_locale helper

8 years agoAdd Japanese translation to EmojiPicker component (#2359)
Yamagishi Kazutoshi [Sun, 23 Apr 2017 17:09:34 +0000 (02:09 +0900)]
Add Japanese translation to EmojiPicker component (#2359)

8 years agoShow multibyte URI preview card (#2363)
Yamagishi Kazutoshi [Sun, 23 Apr 2017 17:08:59 +0000 (02:08 +0900)]
Show multibyte URI preview card (#2363)

8 years agoMake HSTS enable optional with force_ssl (#2364)
Matt Jankowski [Sun, 23 Apr 2017 17:08:32 +0000 (13:08 -0400)]
Make HSTS enable optional with force_ssl (#2364)

8 years agoAdd simple_format to simplified_format (#2198)
178inaba [Sun, 23 Apr 2017 12:23:27 +0000 (21:23 +0900)]
Add simple_format to simplified_format (#2198)

8 years agoAlter Vagrantfile to use RVM for Ruby installation (#2346)
Effy Elden [Sun, 23 Apr 2017 12:21:20 +0000 (22:21 +1000)]
Alter Vagrantfile to use RVM for Ruby installation (#2346)

8 years agoExport environment variables from .env.vagrant before running rails commands in Vagra...
Effy Elden [Sun, 23 Apr 2017 12:21:09 +0000 (22:21 +1000)]
Export environment variables from .env.vagrant before running rails commands in Vagrant provisioning (#2343)

8 years agoAllow webfinger controller to reply to user@WEB_DOMAIN in addition to user@LOCAL_DOMA...
ThibG [Sun, 23 Apr 2017 12:19:54 +0000 (14:19 +0200)]
Allow webfinger controller to reply to user@WEB_DOMAIN in addition to user@LOCAL_DOMAIN (#2351)

This provides a hotfix for outbound salmon requests to other Mastodon instances
as they currently will try to resovle user@WEB_DOMAIN instead of user@LOCAL_DOMAIN
(see #2012 and #20312).

Furthermore, this should ease transition from users switching from
LOCAL_DOMAIN = WEB_DOMAIN to another LOCAL_DOMAIN when WEB_DOMAIN does not change.

8 years agoHalved padding for emoji (#2344)
Ashley [Sun, 23 Apr 2017 12:19:25 +0000 (00:19 +1200)]
Halved padding for emoji (#2344)

8 years agofix(style): Fix regressions introduced by #2338 (#2345)
Stephen Burgess [Sun, 23 Apr 2017 12:18:58 +0000 (07:18 -0500)]
fix(style): Fix regressions introduced by #2338 (#2345)

Put Column Slim Back Button classnames in order so it is positioned right and top. Add icon button style back to privacy dropdown and upload buttons so they are positioned correctly and do not wiggle. Remove abstracted style from CSS. Add missed class for the upload form thumbnail. Add the missed styles for upload form thumnail. Alphabetize styles for column-back-button. Fix fontSize typo for media-spoiler-video-play-icon.

8 years agoTest embedded_view related code in a helper (#2282)
Joël Quenneville [Sun, 23 Apr 2017 04:05:52 +0000 (00:05 -0400)]
Test embedded_view related code in a helper (#2282)

The two methods `StreamEntriesHelper#stream_link_target` and
`StreamEntriesHelper#acct` are based on checking whether we are running
in an embedded view.

This adds some test helper code to make the testing easier. We extracted
some "magic strings" to constants to lower the coupling in the specs.

8 years agoAdd test coverage to CSS class generation (#2285)
Joël Quenneville [Sun, 23 Apr 2017 04:04:32 +0000 (00:04 -0400)]
Add test coverage to CSS class generation (#2285)

The code that generates CSS is based on a lot of boolean conditions.
The possible combinations of these grows exponentially as we add more
conditions.

Since most of the code is conditional on a single boolean, we tested the
following:

1. All `false`
2. All `true`
3. Each individual flag set to `true`

The methods tested are:

* `StreamEntriesHelper#style_classes`
* `StreamEntriesHelper#microformats_classes`
* `StreamEntriesHelper#microformats_h_class`

8 years agoAdding arabic string localization (rebased) (#1895)
Koala Yeung [Sun, 23 Apr 2017 03:58:47 +0000 (11:58 +0800)]
Adding arabic string localization (rebased) (#1895)

* Create ar.jsx

* Preparing file for translation.

* Create ar.yml

* Preparing file for translation.

* Create simple_form.ar.yml

* Preparing file for translation.

* Create devise.ar.yml

* Preparing file for translation.

* Create doorkeeper.ar.yml

* Preparing file for translation.

* Update index.jsx

Preparing file for translation.

* Update mastodon.jsx

* Preparing file to translation.
* Correction thanks to @Taekiro
  https://github.com/tootsuite/mastodon/pull/1798#pullrequestreview-32924922

* Update settings_helper.rb

Preparing file to translation.

* Update application.rb

* Preparing file to translation.

* Update simple_form.ar.yml

* Update doorkeeper.ar.yml

* Update devise.ar.yml

* Update ar.yml

* Fix i18n-tasks unused issue (ar)

Remove unused translation strings

* Update application.rb

* Update ar.jsx

* Fix various issues with Arabic translation

* Fix duplication caused in merge
* Fix syntax error in devise.ar.yml
* Fix import error Duplicated incorrect import in mastodon.jsx
* Fix duplication error in locales/index.jsx

* Update ar.yml

* Update ar.jsx

* Update ar.yml

* Update ar.jsx

* Fix ar translation

8 years agoTooltip for boosting depends on toot visibility (#1394) (#1754)
Ashley [Sun, 23 Apr 2017 03:36:40 +0000 (15:36 +1200)]
Tooltip for boosting depends on toot visibility (#1394) (#1754)

* Made tooltip for boosting depend on visibility

* Removed spaces that were added in merge conflict resolution

* Try again :P

* Added missing bracket

* Changed 'toot' to 'status'

8 years agoRemove unnecessary variable in ColumnLink component (#2341)
Yamagishi Kazutoshi [Sun, 23 Apr 2017 03:21:38 +0000 (12:21 +0900)]
Remove unnecessary variable in ColumnLink component (#2341)

Fix bug in cca41ea544fe7de3e7afdc250992a1c6e48d2a31 .

8 years agoActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce...
Evan Minto [Sun, 23 Apr 2017 03:21:10 +0000 (20:21 -0700)]
ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities (#2197)

* Clean up collapsible components

* Expose user Outboxes and AS2 representations of statuses

* Save work thus far.

* Fix bad merge.

* Save my work

* Clean up pagination.

* First test working.

* Add tests.

* Add Forbidden error template.

* Revert yarn.lock changes.

* Fix code style deviations and use localized instead of hardcoded English text.

8 years agoUpdate CA certificates in Dockerfile (#2339)
Yamagishi Kazutoshi [Sun, 23 Apr 2017 02:59:56 +0000 (11:59 +0900)]
Update CA certificates in Dockerfile (#2339)