about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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
2017-05-23Spec AuthorizeFollowsController assigns @account (#3246)Akihiko Odaki
@account is used by the view.
2017-05-23Introduce recent to Follow (#3247)Akihiko Odaki
Introduce recent to Follow, as Account and other models have. This change also adds specs for the scope and the dependents.
2017-05-23Focus the submit button (#3253)Yamagishi Kazutoshi
Focus the submit button when confirmation modal is opened. Also, changed cancellation link to button. This makes the meaning clearer.
2017-05-23Updates Norwegian translation (#3252)Audun Larsen
2017-05-23i18n: Latest Hebew strings translated (#3250)Ira
2017-05-23Refactoring. Removed useless import. (#3254)Yamagishi Kazutoshi
original: https://github.com/tootsuite/mastodon/pull/2618
2017-05-23Cover AccountsController more in spec (#3229)Akihiko Odaki
* Introduce recent scope to Status and StreamEntry Introduce recent scope to Status and StreamEntry as Account has. * Cover AccountsController more in AccountsController
2017-05-23Fix more locale regressions from #3055 (#3242)Eugen Rochko
2017-05-22Use local default for postgres host in node streaming service (#3240)Matt Jankowski
This location varies across postgres installations, and it seems like the pg package knows how to guess correctly on each system.
2017-05-22Coverage for api/web/settings controller (#3238)Matt Jankowski
2017-05-22Add coverage for ReportFilter and AccountFilter (#3236)Matt Jankowski
2017-05-22Bump versionEugen Rochko
2017-05-22Specs for cleanup workers (#3235)Matt Jankowski
* Add spec files for feed and media cleanup workers * Add coverage for feed and media cleanup schedulers * Clean up feed and media cleanup workers
2017-05-22Similarly to #2426, put creation of remote statuses in a transaction, (#3233)Eugen Rochko
so that public timeline/caching would not encounter incomplete data
2017-05-22Cover ApplicationController more in spec (#3230)Akihiko Odaki
2017-05-22Cover AccountUnfollowController more in spec (#3228)Akihiko Odaki
2017-05-22Fix locale bug when change it on preferences (#3223) (#3232)Tomonori Murakami
2017-05-22Cover AccountFollowController more in spec (#3227)Akihiko Odaki
2017-05-22Cover AboutController more in spec (#3226)Akihiko Odaki
2017-05-22Fix locale regression from #3055 (#3231)Eugen Rochko
2017-05-22Update Russian translation (#3225)Ratmir Karabut
* 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) * Update Russian translation * Update Russian translation
2017-05-22Add webpack-bundle-analyzer for production builds (#3170)Nolan Lawson
2017-05-22Allow alternate domains for mastodon handlers (#3187)Immae
2017-05-22Only load Intl data for current language (#3130)Nolan Lawson
* Only load Intl data for current language * Extract common chunk only from application.js and public.js * Generate locale packs, avoid caching on window object
2017-05-22Change "Account.any?" to "Account.exists?" (#3217)Yamagishi Kazutoshi
2017-05-22Updated Polish translation (#3204)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
2017-05-22Keep children of the column-collapsable until the transition is completed ↵unarist
(#3218)
2017-05-22Set config.cache_store in environments file. (#3219)Clworld
* Set config.cache_store in application.rb * Set config.cache_store in environments. * fix code format.
2017-05-22Fix "Edit profile" on the account action bar (#3222)unarist
2017-05-22single_user_mode? always returns boolean (#3215)Akihiko Odaki
This change also adds a specification for the method.
2017-05-22Add translations for counter of profile (#3214)Yamagishi Kazutoshi
ref #3101
2017-05-22Persian translation update (#3206)Masoud Abkenar
* Persian translation update * Persian translation update: new files * Persian translation update * activerecord.fa.yml language code * Persian translation update * fix indent
2017-05-21Fix forgotten to include language attribute in statuses JSON (#3209)Eugen Rochko
2017-05-21Allow access token in URI (#3208)happycoloredbanana
2017-05-21Update Ukrainian translation (#3203)ster
2017-05-21Fix mutes_controller error and incorrect statuses_controller report (#3202)Akihiko Odaki
This commit fixes a regression in commit f55480756337dd4df7513e89673e81e003f1201a.
2017-05-21Update .gitignore (#3197)Hayato IZUMI
* Remove duplicate 'node_modules' * Replace 'public/packs'
2017-05-21Enhance for the Chinese translation (#3198)vidarlee
* Enhance for the Chinese translation * Add filtered_languages for Chinese Translation include CN/HK/TW for PR #3175
2017-05-21Add a Japanese translation for PR #3175 (#3192)Daigo 3 Dango