about summary refs log tree commit diff
path: root/config
AgeCommit message (Collapse)Author
2017-06-23Upgrade to Webpack 3 with module concatenation (#3912)Nolan Lawson
2017-06-22Update Russian translation (#3902)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 * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line
2017-06-22Update of doorkeeper.oc.yml (#3896)Quent-in
Just some adjustements
2017-06-20i18n: Fixed typo in Polish translation (#3864)m4sk1n
2017-06-19Add Japanese translation "Action taken by" (#3850)のら
2017-06-19setting-for-account-deletable (#3852)masarakki
2017-06-19Re-add disableHostCheck (regression #3729) (#3854)Yamagishi Kazutoshi
ref #2790
2017-06-19Added new Catalan strings (#3843)spla
* Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Update ca.json Removed : <<<<<<< HEAD "getting_started.support": "{faq} • {userguide} • {apps}", ======= >>>>>>> upstream/master
2017-06-19Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)Eugen Rochko
Rename Activitypub to ActivityPub
2017-06-18Upgrade Webpacker to version 2.0 (#3729)Yamagishi Kazutoshi
2017-06-17l10n update for account deletion (#3820)Quent-in
* l10n update for acount deletion * l10n little change * l10n little changes Less passive voice, more natural. * Update oc.yml Correction, " added
2017-06-15updated Polish translation (#3751)m4sk1n
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-06-14Add Japanese translation for Account deletion (#3747)unarist
2017-06-14i18n: updated Polish translation (#3744)m4sk1n
2017-06-14Account deletion (#3728)Eugen Rochko
* Add form for account deletion * If avatar or header are gone from source, remove them * Add option to have SuspendAccountService remove user record, add tests * Exclude suspended accounts from search
2017-06-13Exclude packs/custom.js from webpack compilation to prevent breakage (#3719)Eugen Rochko
due to the change in #3373
2017-06-11Update Russian translation (#3692)Ratmir Karabut
2017-06-11Remove comments for eslint-disable (#3691)Yamagishi Kazutoshi
2017-06-10Move create/destroy actions for api/v1/statuses to namespace (#3678)Matt Jankowski
Each of mute, favourite, reblog has been updated to: - Have a separate controller with just a create and destroy action - Preserve historical route names to not break the API - Mild refactoring to break up long methods
2017-06-09i18n: Minor fixes in Polish translation (#3674)m4sk1n
* i18n * i18n * i18n * i18n * i18n
2017-06-09Move reblogged_by and favourited_by actions out of api/v1/statuses and into ↵Matt Jankowski
unique controllers (#3646) * Add specs for api statuses routes * Update favourited_by and reblogged_by api routes * Move methods into new controllers * Use load_accounts methods to simplify index actions * Clean up load_accounts methods * Clean up link header generation * Check for link headers in specs * Remove unused actions from api/v1/statuses controller * Remove specs for moved actions
2017-06-09i18n: updated Polish translation (#3670)m4sk1n
2017-06-09Refactor views/admin/reports/show.html.haml (#3656)Yamagishi Kazutoshi
2017-06-09Add Japanese translation for #3640 (#3650)unarist
2017-06-08Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640)Eugen Rochko
* Add explit admin actions to (re)subscribe/unsubscribe remote accounts and re-download avatar/header * Improve how admin NSFW toggle looks
2017-06-08Support multiple trusted proxy ip addresses (#3639)nullkal
* Support multiple trusted proxy ip addresses * correct coding style
2017-06-08Add Japanese translations (#3635)Yamagishi Kazutoshi
2017-06-08i18n: Update Polish translation (#3637)m4sk1n
2017-06-08fix: Warn if JavaScript is disabled (#3634)Sorin Davidoi
2017-06-07Rest of 2FA translated + small fix (#3630)jeroenpraat
2017-06-06Fix #3063 - Add dynamic app manifest (#3563)Eugen Rochko
* Fix #3063 - Add dynamic app manifest * Added short_name * Add background_color
2017-06-06Refactor translationRunner.js (#3604)Yamagishi Kazutoshi
- Use yargs instead of minimist - Simplify validators - Fix typo (RFC5626 -> RFC5646)
2017-06-06i18n: updated Polish translation (#3597)m4sk1n
* i18n: updated Polish translation * i18n: updated Polish translation btw it would be nice to have master-based Mastodon instance (even isolated from others) to test translation.
2017-06-06Add quotes ESLint rules (#3602)Yamagishi Kazutoshi
* Add quotes ESLint rule * Add jsx-quotes ESlint rule * Sort ESLint rules
2017-06-05Redirect to streaming_api_base_url (#3579)Daigo 3 Dango
* Redirect to streaming_api_base_url When Rails receives a request to streaming API, it most likely means that there is another host which is configured to respond to it. This is to redirect clients to that host if `STREAMING_API_BASE_URL` is set as another host. * Use the new Ruby 1.9 hash syntax
2017-06-05l10n update for occitan language (#3557)Quent-in
* i18n Update : Add preference setting for delete toot modal Adding a line for "Add preference setting for delete toot modal" * i18n update for pin/unpin Update to add two more translations * i18n update to have the dates in plain occitan * Removed the blank line * %{selft} back in the translation
2017-06-05Added support for configurable reserved usernames (fix of #1382) (#3566)Eugen Rochko
* Added support for configurable reserved usernames * Added reserved usernames from mastodon issue 1355 * Fix reserved usernames
2017-06-05Add date to ignore_missing and ignore_unused in config/i18n-tasks.yml (#3572)Yamagishi Kazutoshi
2017-06-02Enable stats.json analysis with Webpack Visualizer (#3509)Nolan Lawson
2017-06-01Resolve custom application stylesheet with Webpack (#3373)Akihiko Odaki (@fn_aki@pawoo.net)
This implementation is a bit smaller and still has the following benefits: * No need of app/javascript/packs/custom.js For custom stylesheet, it typically has only "require('../styles/custom.scss')" and is redundant. * No need to extract vendor stylesheet to another asset Extracting vendor stylesheet could be forgotten by developers who do not use custom stylesheet.
2017-06-01Update Rails to version 5.1.1 (#3121)Matt Jankowski
* Update rails to version 5.1.1 * Run `rails app:update` * Remove the override of polymorphic activity relationship * Silence warning about otp_secret attribute being unknown to rails * We will only introduce form_with where we want to use remote data
2017-06-01Remove unused loaders of webpack (#3495)Yamagishi Kazutoshi
2017-06-01Add ESLint rule (object-curly-spacing) (#3498)Yamagishi Kazutoshi
2017-05-31Spec coverage and refactor for the api/v1/accounts controllers (#3451)Matt Jankowski
2017-05-31Move admin/pubsubhubbub controller to admin/subscriptions (#3442)Matt Jankowski
2017-05-31Catalan language updates (#3454)spla
* Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated
2017-05-30Fix webpack building on Windows (#3426)Naouak
* Path should not be constructed manually. Use path.join to ensure compatibility. * Path should not be constructed manually. Use path.join to ensure compatibility. * Fix regexp. * Fix my own stupidity. I forgot to check outside my test script the regexp...
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-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.