about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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).
2017-05-26Replace onWheel listener with onScroll (#3324)Nolan Lawson
* Replace onWheel listener with onScroll * Update column.js
2017-05-26Fix "Cannot read property" on missing status (#3322)unarist
I've found this issue when I clicked replies to muted user on the timeline. Properties I've removed in here were added with lazy loading using IntersectionObserver (8e4d1cba), but those statuses are not need to be tracked anyway because it will be rendered as only empty div.
2017-05-26Improve shouldComponentUpdate for status and status_action_bar (#3323)Nolan Lawson
2017-05-26implement shouldComponentUpdate for relative_timestamp (#3320)Nolan Lawson
2017-05-25Fix style regression of buttons not inheriting document font by default (#3310)Eugen Rochko
2017-05-25Disable the Rubocop Style/GuardClause cop (#3316)Matt Jankowski
There are many spots throughout the codebase which are showing as covered by specs in the simplecov output -- but which are not actually run, because they are on the same line as a guard clause. I plan on fixing some of these issues, but don't want to keep triggering this rubocop style violation. My preference would be that we use the PR review process to identify places where a guard clause might be appropriate, but that we leave this cop turned off by default.
2017-05-25Fix "contains" CSS for Chromium <57 (#3317)Nolan Lawson
Fixes #3277. I've tested in QupZilla on Mac and can confirm it fixes the issue, and that Chrome 58 is not affected (because it has Grid).
2017-05-25Attach ReactPerf to window for easier debugging (#3318)Nolan Lawson
2017-05-25Add `flex: 0 0 auto` to some components to avoid bugs on iOS9 (#3313)unarist
2017-05-25Fix Firefox issue with performance marks (#3315)Nolan Lawson
2017-05-25More use of next link header on account (media) timelines (#3311)unarist
This will reduce requests on who have only few statuses. - Use next link header to detect more items from first request - Omit next link header if result items are fewer than requested count (It had omit it only if result was empty before)
2017-05-25i18n: New strings translated to Hebrew (#3282)Ira
2017-05-25Remove arguments in association reader (#3305)Yamagishi Kazutoshi
2017-05-25Fix an error on dragging into status_content component (#3308)unarist
2017-05-25Cover TagsController more (#3306)Akihiko Odaki
2017-05-25Remove unnecessary action bar wrapper divs (#3299)Nolan Lawson
2017-05-25Refactor Setting (#3302)alpaca-tc
* @object is not needed * Remove unneeded dependencies * Do not call private method * Prefer #respond_to_missing? over #respond_to? `#respond_to?` doesn't support `User.settings.method(:method_name)` * Use find_or_initialize_by instead of
2017-05-25Add improved performance marks for development mode (#3297)Nolan Lawson
2017-05-25Add localization of datetime in public page (#3296)Yamagishi Kazutoshi
2017-05-25Norwegian translation of the onboarding page (#3303)Audun Larsen
* Fixes translation placeholder * Translates onboarding page
2017-05-25Replace \u2014 with &mdash; (#3301)Daigo 3 Dango
2017-05-25fix storybook (#3292)Yamagishi Kazutoshi
2017-05-25Fix load more feature on the Account media gallery (#3293)unarist
* Add load more button for large screens * Fix `next` state value on the first loading * Don't load if `isLoading || !hasMore` * Start load on near the bottom
2017-05-25fix-cache-returns-nil (#3213)masarakki
2017-05-25Name the Webpack chunks (#3291)Nolan Lawson
2017-05-25Fix hovering default value for avatar component (#3290)Yamagishi Kazutoshi
2017-05-25Prevent contents of the status placeholder from overflowing (#3287)unarist
Since long lines may overflow and cause the status-list horizontally scrollable, I added `overflow: hidden` to placeholder contents to prevent it.
2017-05-24Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs (#3276)Daigo 3 Dango
This change adds mp4 support confirmed on Heroku-16 stack.
2017-05-24Remove unnecessary constructors (#3280)Yamagishi Kazutoshi
2017-05-24Lazy load toots using IntersectionObserver (#3191)Sorin Davidoi
* refactor(components/status_list): Lazy load using IntersectionObserver * refactor(components/status_list): Avoid setState bottleneck * refactor(components/status_list): Update state correctly * fix(components/status): Render if isIntersecting is undefined * refactor(components/status): Recycle timeout * refactor(components/status): Reduce animation duration * refactor(components/status): Use requestIdleCallback * chore: Split polyfill bundles * refactor(components/status_list): Increase rootMargin to 300% * fix(components/status): Check if onRef is not defined * chore: Add note about polyfill bundle splitting * fix(components/status): Reduce animation duration to 0.3 seconds
2017-05-24Show error message to suspended user (#3281)Yamagishi Kazutoshi
2017-05-24Add test when hashtag and URL are concatenated (#3279)abcang
2017-05-24Skip formatting for cashtag in status text (#3275)Yamagishi Kazutoshi
Resolve #3270
2017-05-24Fix DM being highlighted when it's inside a favourite notification (#3267)Eugen Rochko
2017-05-24Use node instead of babel-node for streaming (#3269)Nolan Lawson
2017-05-23Cover HomeController more (#3258)Akihiko Odaki
2017-05-23Fix following/followers API to return correct link headers (#3268)unarist
Link headers in following/followers API should include follow_id as max_id/since_id. However, these API use current_user's account_id instead of follow_id from #3167. This causes irrelevant result on loading more users.
2017-05-23Fix Devise destroy method being available to delete user record (#3266)Eugen Rochko
(You may think that we need account deletions, but this way would've just orphaned the db records)
2017-05-23don't notify me when my toot is faved by someone i muted (#3245)beatrix
2017-05-23Toggle sensitive from admin page (#3261)alpaca-tc
2017-05-23Refactor of API timeline actions (#3263)Matt Jankowski
- Increase coverage to exercise all parts of each action - Move into namespace to share common code - Misc refactor of each action for smaller methods, simpler code
2017-05-23Add Support for Nanobox (#1709)Daniel Hunsaker
* Nanobox Support - Added support for running Mastodon using Nanobox, both for local development, and for deployment to production - Dev mode tested and is working properly - Deployment is undergoing test as of this writing. If it works, this line will be amended to state success; if not, one or more subsequent commits will provide fixes. * [nanobox] Resolve Deploy Issues Everything seems to work except routing to the streaming API. Will investigate with the Nanobox staff and make fix commits if needed. Changes made: - Also need `NODE_ENV` in production - Node runs on `:4000` - Use `envsubst` to commit `.env.production` values, since `dotEnv` packages don't always support referencing other variables - Can't precompile assets after `transform` hook, but do this locally so it only has to be done once. - Rails won't create `production.log` on its own, so we do this ourselves. - Some `start` commands run from `/data/` for some reason, so use absolute paths in command arguments * [nanobox] Update Ruby version * [nanobox] Fix db.rake Ruby code style issues * [nanobox] Minor Fixes Some minor adjustments to improve functionality: - Fixed routing to `web.stream` instances - Adjust `.env.nanobox` to properly generate a default `SMTP_FROM_ADDRESS` via `envsubst` - Update Nginx configs to properly support the needed HTTP version and headers for proper functionality (the streaming API doesn't work without some of these settings in place) * [nanobox] Move usage info to docs repo * [nanobox] Updates for 1.2.x - Need to leave out `pkg-config` since Nanobox deploys without Ruby's headers - create a gem group to exclude the gem during Nanobox installs, but allow it to remain part of the default set otherwise - Update cron jobs to cover new/updated Rake tasks - Update `.env.nanobox` to include latest defaults and additions * [nanobox] Fix for nokogumbo, added in 1.3.x Apparently, nokogumbo (pulled in by sanitize, added with `OEmbed Support for PreviewCard` (#2337) - 88725d6) tries to install before nokogiri, despite needing nokogiri available to build properly. Instruct it to use the same settings as nokogiri does when building nokogiri directly, instead of via bundler. * [nanobox] Set NODE_ENV during asset compile The switch to WebPack will rely on the local value of the NODE_ENV evar, so set it to production during asset compilation. * [nanobox] Rebase on master; update Nginx configs - `pkg-config` Gem no longer causes issues in Nanobox, so revert the Gemfile change which allowed excluding it - Update Nginx configuration files with latest recommendations from production documentation - Rebase on master to Get This Merged™ Everything should be golden!
2017-05-23Cover StatusesController more (#3259)Akihiko Odaki
2017-05-23Cover StreamEntriesController more and remove redundant instructions (#3257)Akihiko Odaki
* Cover StreamEntriesController more * Remove redundant instructions in StreamEntriesController