about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-05-29Spec Settings::Exports (#3384)Akihiko Odaki
* Spec output of Settings::Exports::BlockedAccountsController * Spec output of Settings::Exports::FollowingAccountsController * Spec output of Settings::Exports::MutedAccountsController * Spec Settings::Exports::BaseController This commit removes duplicate specs in classes inheriting Settings::Exports::BaseController as well.
2017-05-29Cover WellKnown::WebfingerController more (#3385)Akihiko Odaki
2017-05-29Cover Settings::TwoFactorAuthentication::ConfirmationsController more (#3386)Akihiko Odaki
2017-05-29Cover ApplicationHelper more (#3412)Akihiko Odaki
2017-05-29Spec Activitystreams2BuilderHelper (#3413)Akihiko Odaki
2017-05-29Spec FlashesHelper (#3414)Akihiko Odaki
2017-05-29Spec HomeHelper (#3415)Akihiko Odaki
2017-05-29Spec HttpHelper (#3416)Akihiko Odaki
2017-05-29Cover Admin::PubSubHubHubController more (#3343)Akihiko Odaki
2017-05-29Don't stream toots from users who have blocked the recipient user (#3300)unarist
* Don't stream toots from users who have blocked the recipient user This filter was already applied on the `/api/v1/timelines/public` API, but not yet for the Streaming API. * Boosted status' account_id doesn't need for filtering in streaming/index.js This filtering is only for public/hashtag timelines, but boosts already filtered on FanOutOnWriteService because those timelines don't show boosts.
2017-05-29[nanobox] Adjustments for Nanobox development (#3295)Daniel Hunsaker
Because Nanobox doesn't run data components in the same container as the code, there are a few tweaks that need to be made in the configuration to get WebPack to work properly in development mode. The same differences lead to needing to use `DATABASE_URL` by default in the `.env` file for Rails to work correctly. Limitations of our `.env` loader for Node.js mean the `.env` file needs to be compiled everywhere in order to work, so we compile it in development, now, too. Also, all the `.env.production` tweaks have been consolidated into a single command. Finally, since Nanobox actually creates the database when it sets up the database server, using the existence of the database alone to determine whether to migrate or setup is insufficient. So we add a condition to `rake db:migrate:setup` to check whether any migrations have run - if the database doesn't exist yet, `db:setup` will be called; if it does, but no migrations have been run, `db:migrate` and `db:seed` are called instead (the same basic idea as what `db:setup` does, but it skips `db:create`, which will only cause problems with an existing DB); otherwise, only `db:migrate` is called. None of these changes should affect development, and all are designed not to interfere with existing behaviors in other environments.
2017-05-29Add preference setting for delete toot modal (#3368)Atsushi Yamamoto
* Set delete_modal preference to true by default * Does not show confirmation modal if delete_modal is false * Add ja translation for preference setting page
2017-05-29Prevent wasted render in load_more.js (#3402)Nolan Lawson
2017-05-29fix-rails-minor-version (#3403)masarakki
2017-05-29l10n: Fix Japanese translation (#3410)lindwurm
* "メデイア" -> "メディア" Signed-off-by: lindwurm <lindwurm.q@gmail.com>
2017-05-29Use travis_retry to reduce spurious test failures (#3418)Nolan Lawson
2017-05-28Bump version to 1.4.1Eugen Rochko
2017-05-28Use immutable list in UploadButton to avoid wasteful re-render (#3394)Nolan Lawson
2017-05-28Re-add stream end log for WebSocket (#3397)Clworld
2017-05-28Fix video having black border on top due to regression from #2608 (#3392)Eugen Rochko
The combination of object-fit, relative position 50% from top and translating it back upwards 50% is what allows us to crop the video properly, so it needs to be +50%-50%
2017-05-28Ukrainian translation: fix typo (#3393)ster
2017-05-28Fix IntersectionObserver isIntersecting in Edge (#3365)Nolan Lawson
2017-05-28Bump version to 1.4.0.6Eugen Rochko
2017-05-28Update bootsnap to 0.3.0 (fix xattr.h error) (#3390)Eugen Rochko
2017-05-28Simplify isIntersecting in status_list.js (#3371)Nolan Lawson
2017-05-28Fix Webpack Bundle Analyzer output for Webpacker (#3374)Akihiko Odaki
Webpacker failed to parse output of Webpack when a module requires non-existent module or has similar errors. This commit fixes the bug.
2017-05-28i18n: Add some tags for Chinese translation (#3379)vidarlee
* Enhance for the Chinese translation * Add filtered_languages for Chinese Translation include CN/HK/TW for PR #3175 * i18n: Add some tags for Chinese translation * i18n: Add some tags for Chinese translation
2017-05-28Persian translation fixes and updates (#3380)Masoud Abkenar
* Persian translation fix * Persian translation of new strings
2017-05-28Improve streaming API cluster logging (#3370)Eugen Rochko
* Improve streaming API cluster logging * Less verbose error middleware logging (stack trace useless there) * Fix error logging * Prevent potential issue * Add missing "done()" in catch of Promise.all, websocket heartbeat re-implemented like in example * I actually forgot a done(), the absolute madman
2017-05-27Reject revoked access_token on Streaming API. (#3367)Clworld
2017-05-27Bump version to 1.4.0.5Eugen Rochko
2017-05-27Fix #2922 - Load stylesheet from "custom.css" entrypoint when present (#3332)Eugen Rochko
* Fix #2922 - Load stylesheet from "custom.css" entrypoint when present This is pretty much the same way it worked as before, albeit with having to create app/javascript/packs/custom.js with require('../styles/custom.scss') (or whatever you want really), which will be a blank slate for you to import whatever you want * Remove old assets directory * Extract font-awesome into common.css and always load it
2017-05-27Update Dutch strings for 1.4 (#3363)jeroenpraat
* Update nl strings for 1.4 * Update nl strings for 1.4 * Update nl strings for 1.4 * nl strings (+1) More new OTP strings will be translated another time
2017-05-27i18n update for Occitan language (#3362)Quent-in
* Update simple_form.oc.yml * Added check spam folder * Update oc.json abonats => seguidors * Update oc.yml * Update oc.json Added translations + corrections * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * i18n mailer * Update reset_password_instructions.oc.html.erb
2017-05-27i18n: pl: pluralized (#3344)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-05-27Fix empty flash message on the settings page (#3345)unarist
2017-05-27Avoid comparing domains when looking for an exact match of a local account ↵happycoloredbanana
(#3336)
2017-05-27Add missing background center on public profile headers (#3340)Eugen Rochko
2017-05-27Language filtering in streaming API (#3339)Eugen Rochko
2017-05-27Fix some nil errors (#3338)Eugen Rochko
* Fix nil input not handled well in AuthorExtractor concern * Fix hard error in ProcessFeedService when replied-to status has been deleted * Fix nil errors in ProcessInteractionService when favourited status cannot be found
2017-05-27Replace onboarding elephant with friendlier graphic, shorter animation (#3337)Eugen Rochko
on status fade-in, fix buttons not having pointer cursor
2017-05-26Updated Polish translation (#3335)m4sk1n
* i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: completed Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: corrected Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: Updated Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update simple_form.pl.yml * Update simple_form.pl.yml * updated Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Update pl.yml
2017-05-26Add "meta" attribute to return of POST /api/v1/media method as well (#3333)Eugen Rochko
2017-05-26Introduce react-textarea-autosize instead of using style.height side effects ↵Eugen Rochko
(#3334)
2017-05-26Remove redundant call of recent scope in AccountsController (#3330)Akihiko Odaki
recent is included in paginate_by_max_id.
2017-05-26Remove status context construction in the React side (#3331)unarist
because it may causes flicker on the conversation when it contains blocked/muted user's status. We use `/api/v1/statuses/{id}/context` to obtain status ids in the conversation which filters blocked/muted user, but also uses internal cache constructed from `in_reply_to_id` by `normalizeStatus()` in `reducers/timelines.js` on each status loading which doesn't filter. So statuses appears in conversation if those are cached, even those statuses are from blocked/muted user. Then context cache will be updated with the result of the context API and those statuses will be removed. I have left the `normalizeStatus()` function itself which is called many functions in the file as a placeholder for now, but maybe it should be removed completely.
2017-05-26Bump version to 1.4.0.4Eugen Rochko
2017-05-26Go to root after login in single user mode (#3289)Akinori MUSHA
In single user mode, visitors are redirected to the single user's profile page. So, if you are the owner without a session, you start from that page, click the login button and authenticate yourself expecting you'll soon get started with the home page, but in reality you'll get redirected back to where you started from -- your own profile page. This fixes the behavior by redirecting you home after login if you have started from your own profile page.
2017-05-26Spec Admin::BaseController (#3328)Akihiko Odaki
2017-05-26Change anchor to button element (#3321)Yamagishi Kazutoshi
Fix warning for ESLint (jsx-a11y/href-no-hash).