about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-25Adjust status action bar icons (#2424)Stephen Burgess
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.
2017-04-25Refactor seed.rb (#2430)Hiroe Jun
2017-04-25Localize with i18n for Devise::FailureApp (#2309)alpaca-tc
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.
2017-04-25Login link for single user instances (#2393)STJrInuyasha
* Login link for single user instances * Flip the if statement around Fixes AuthorizationController tests
2017-04-25Change ActivityPub paging to match spec. Clean up ActivityPub outbox ↵Evan Minto
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.
2017-04-25Fix #2402 - Add Idempotency-Key header to PostStatusService that prevents ↵Eugen Rochko
(#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
2017-04-25Decodes URL containing IDN (#2436)Yamagishi Kazutoshi
2017-04-25Fix Persian translation (#2428) (#2432)Matt Jankowski
Settings page contained labels in Persian, when I was using English.
2017-04-25Username above toot box UI changes (#2418)Ash Furrow
* Makes username above toot box into a link. * Prepends username above toot box with an @.
2017-04-25Optimize account search (#2421)178inaba
2017-04-25Punycode URI normalization (#2370)Eugen
* 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
2017-04-24Persian translation (#2405)Masoud Abkenar
* 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
2017-04-24Add more FeedManager#filter? tests (#2413)Eugen
2017-04-24Run i18n-tasks normalize (#2412)Eugen
2017-04-24fix(styles): Spoiler trigger zindex, close modal button position (#2406)Stephen Burgess
#2338
2017-04-24add `patch` method support to CORS (#2408)Shin Adachi
2017-04-24Only show upload modal when drag event contains files (#2409)Stephen Burgess
* 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
2017-04-24Add an RTL stylesheet for Arabic i18n (#2378)Eugen
2017-04-24Force wrap long email address (#2395)Yamagishi Kazutoshi
2017-04-24Fix flashes partial render error for controllers which don't inherit from ↵Matt Jankowski
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.
2017-04-24Add index to statuses_tags#status_id (#2394)alpaca-tc
2017-04-24Hide some components rather than unmounting (#2271)Akihiko Odaki
Hide some components rather than unmounting them to allow to show again quickly and keep the view state such as the scrolled offset.
2017-04-24Fix background-size being overwritten (#2382)Yamagishi Kazutoshi
2017-04-24Language: Missing keys for pt and pt-BR (#2355)Eduardo Elias
2017-04-24Return force_ssl to the controller (#2380)Matt Jankowski
2017-04-24Simplify browserify+babelify config (#2377)Nolan Lawson
2017-04-24Improve Japanese translation (#2376)Yamagishi Kazutoshi
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
2017-04-24Report processing improvements (#2349)Effy Elden
* 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
2017-04-24Followers-only post federation (#2111)Eugen
* 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
2017-04-23Fixes problem with showing non-local accounts. (#2371)Ash Furrow
2017-04-23Add link for domain in land strip (#2306)ymmtmdk
* Add link for domain in land strip * Use root_path * Avoid repeating code
2017-04-23Update Japanese translation (#2360)Yamagishi Kazutoshi
for #2181
2017-04-23fix(style): Fix styles after classname refactor (#2368)Stephen Burgess
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.
2017-04-23feat(cw-button): Add aria controls to CW trigger (#2303)Stephen Burgess
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.
2017-04-23Fix deprecation warnings on activitypub controller specs (#2357)Matt Jankowski
2017-04-23Ensure i18n matches options (#2358)Matt Jankowski
* 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
2017-04-23Add Japanese translation to EmojiPicker component (#2359)Yamagishi Kazutoshi
2017-04-23Show multibyte URI preview card (#2363)Yamagishi Kazutoshi
2017-04-23Make HSTS enable optional with force_ssl (#2364)Matt Jankowski
2017-04-23Add simple_format to simplified_format (#2198)178inaba
2017-04-23Alter Vagrantfile to use RVM for Ruby installation (#2346)Effy Elden
2017-04-23Export environment variables from .env.vagrant before running rails commands ↵Effy Elden
in Vagrant provisioning (#2343)
2017-04-23Allow webfinger controller to reply to user@WEB_DOMAIN in addition to ↵ThibG
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.
2017-04-23Halved padding for emoji (#2344)Ashley
2017-04-23fix(style): Fix regressions introduced by #2338 (#2345)Stephen Burgess
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.
2017-04-23Test embedded_view related code in a helper (#2282)Joël Quenneville
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.
2017-04-23Add test coverage to CSS class generation (#2285)Joël Quenneville
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`
2017-04-23Adding arabic string localization (rebased) (#1895)Koala Yeung
* 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
2017-04-23Tooltip for boosting depends on toot visibility (#1394) (#1754)Ashley
* 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'
2017-04-23Remove unnecessary variable in ColumnLink component (#2341)Yamagishi Kazutoshi
Fix bug in cca41ea544fe7de3e7afdc250992a1c6e48d2a31 .