774 Commits (8d224ad23bca8d4923e230e5495ee60197e44c3b)

Author	SHA1	Message	Date
Eugen Rochko	ed7dc1704d	Bind web UI access tokens to sessions (#3940) ... * Add overview of active sessions * Better display of browser/platform name * Improve how browser information is stored and displayed for sessions overview * Fix test * Fix #2347 - Bind web UI access token to session When you logout, session also destroys the access token, so it's no longer valid. If access token is destroyed some other way, the session is also destroyed, requiring a re-login. Fix #1681 - Add scheduler to remove revoked access tokens and grants * Fix test	8 years ago
amazedkoumei	436ce03772	fix unnecessary variable (#3947)	8 years ago
Eugen Rochko	d821aba002	Rename "Credentials" page to "Security" for clarity (#3941) ... * Rename "Credentials" page to "Security" for clarity * Change "security" icon from cog to lock	8 years ago
amazedkoumei	87efa38721	more free pgconfig by .env (#3909) ... * more free pgconfig for streaming by .env * fix wrong default values * database.yml read ENV as same as streaming server	8 years ago
Eugen Rochko	f7301bd5b9	Add overview of active sessions (#3929) ... * Add overview of active sessions * Better display of browser/platform name * Improve how browser information is stored and displayed for sessions overview * Fix test	8 years ago
unarist	68dca26a5d	Fix react-intl/locale-data import issue on production build (#3937) ... Webpack seems to fail to import `react-intl/locale-data/*.js` if those files has been proceed by babel, and this also breaks applying our translation. Note that this won't be a problem on English locale, because react-intl includes it as default and works fine without manually added locale-data. Also this issue seems to only occurs on production build, but I'm not sure about reason.	8 years ago
unarist	138e5a0b1e	Fix webpack config for Windows (#3926)	8 years ago
Sorin Davidoi	2211e8d1cd	Revocable sessions (#3616) ... * feat: Revocable sessions * fix: Tests using sign_in * feat: Configuration entry for the maximum number of session activations	8 years ago
Nolan Lawson	3783cadf2d	Apply babel to react-intl to remove prop-types (#3914)	8 years ago
Nolan Lawson	e078919f07	Upgrade to Webpack 3 with module concatenation (#3912)	8 years ago
Ratmir Karabut	9ca02a00a6	Update Russian translation (#3902) ... * 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	8 years ago
Quent-in	98fab24bea	Update of doorkeeper.oc.yml (#3896) ... Just some adjustements	8 years ago
m4sk1n	da6fa029f6	i18n: Fixed typo in Polish translation (#3864)	8 years ago
のら	5cc7cd8518	Add Japanese translation "Action taken by" (#3850)	8 years ago
masarakki	ff142eb64d	setting-for-account-deletable (#3852)	8 years ago
Yamagishi Kazutoshi	500e28442f	Re-add disableHostCheck (regression #3729) (#3854) ... ref #2790	8 years ago
spla	4367443287	Added new Catalan strings (#3843) ... * 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	8 years ago
Eugen Rochko	f3be605286	Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847) ... Rename Activitypub to ActivityPub	8 years ago
Yamagishi Kazutoshi	53e42bf91e	Upgrade Webpacker to version 2.0 (#3729)	8 years ago
Quent-in	8fd931dc12	l10n update for account deletion (#3820) ... * l10n update for acount deletion * l10n little change * l10n little changes Less passive voice, more natural. * Update oc.yml Correction, " added	8 years ago
m4sk1n	6f34fdb616	updated Polish translation (#3751) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
unarist	da0333f1cb	Add Japanese translation for Account deletion (#3747)	8 years ago
m4sk1n	98eacb2238	i18n: updated Polish translation (#3744)	8 years ago
Eugen Rochko	4a618908e8	Account deletion (#3728) ... * 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	8 years ago
Eugen Rochko	85af2405cf	Exclude packs/custom.js from webpack compilation to prevent breakage (#3719) ... due to the change in #3373	8 years ago
Ratmir Karabut	9e53fe5c29	Update Russian translation (#3692)	8 years ago
Yamagishi Kazutoshi	3690f04e4a	Remove comments for eslint-disable (#3691)	8 years ago
Matt Jankowski	2925372ff4	Move create/destroy actions for api/v1/statuses to namespace (#3678) ... 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	8 years ago
m4sk1n	778430b54a	i18n: Minor fixes in Polish translation (#3674) ... * i18n * i18n * i18n * i18n * i18n	8 years ago
Matt Jankowski	5282ba862a	Move reblogged_by and favourited_by actions out of api/v1/statuses and into 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	8 years ago
m4sk1n	1a065fb146	i18n: updated Polish translation (#3670)	8 years ago
Yamagishi Kazutoshi	1be48dd805	Refactor views/admin/reports/show.html.haml (#3656)	8 years ago
unarist	65d8c73bae	Add Japanese translation for #3640 (#3650)	8 years ago
Eugen Rochko	8902e265b4	Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640) ... * Add explit admin actions to (re)subscribe/unsubscribe remote accounts and re-download avatar/header * Improve how admin NSFW toggle looks	8 years ago
nullkal	b8ea28d6d0	Support multiple trusted proxy ip addresses (#3639) ... * Support multiple trusted proxy ip addresses * correct coding style	8 years ago
Yamagishi Kazutoshi	7d2b4186c3	Add Japanese translations (#3635)	8 years ago
m4sk1n	90689190a3	i18n: Update Polish translation (#3637)	8 years ago
Sorin Davidoi	8acadeea76	fix: Warn if JavaScript is disabled (#3634)	8 years ago
jeroenpraat	92bb166246	Rest of 2FA translated + small fix (#3630)	8 years ago
Eugen Rochko	722d152082	Fix #3063 - Add dynamic app manifest (#3563) ... * Fix #3063 - Add dynamic app manifest * Added short_name * Add background_color	8 years ago
Yamagishi Kazutoshi	ad4a28f4f6	Refactor translationRunner.js (#3604) ... - Use yargs instead of minimist - Simplify validators - Fix typo (RFC5626 -> RFC5646)	8 years ago
m4sk1n	30fa5fe1a4	i18n: updated Polish translation (#3597) ... * 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.	8 years ago
Yamagishi Kazutoshi	7a7bfa5170	Add quotes ESLint rules (#3602) ... * Add quotes ESLint rule * Add jsx-quotes ESlint rule * Sort ESLint rules	8 years ago
Daigo 3 Dango	2985d08951	Redirect to streaming_api_base_url (#3579) ... * 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	8 years ago
Quent-in	370fa70924	l10n update for occitan language (#3557) ... * 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	8 years ago
Eugen Rochko	f7a30e2fae	Added support for configurable reserved usernames (fix of #1382) (#3566) ... * Added support for configurable reserved usernames * Added reserved usernames from mastodon issue 1355 * Fix reserved usernames	8 years ago
Yamagishi Kazutoshi	3f815b2052	Add date to ignore_missing and ignore_unused in config/i18n-tasks.yml (#3572)	8 years ago
Nolan Lawson	edddc7c791	Enable stats.json analysis with Webpack Visualizer (#3509)	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	e98559c3ff	Resolve custom application stylesheet with Webpack (#3373) ... 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.	8 years ago
Matt Jankowski	2212dc4aaa	Update Rails to version 5.1.1 (#3121) ... * 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	8 years ago
Yamagishi Kazutoshi	1162f61ca3	Remove unused loaders of webpack (#3495)	8 years ago
Yamagishi Kazutoshi	fda5c699c2	Add ESLint rule (object-curly-spacing) (#3498)	8 years ago
Matt Jankowski	5c63523972	Spec coverage and refactor for the api/v1/accounts controllers (#3451)	8 years ago
Matt Jankowski	de4681b2be	Move admin/pubsubhubbub controller to admin/subscriptions (#3442)	8 years ago
spla	93de41b39b	Catalan language updates (#3454) ... * 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	8 years ago
Naouak	499cc7b803	Fix webpack building on Windows (#3426) ... * 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...	8 years ago
Daniel Hunsaker	9ead3d1cdb	[nanobox] Adjustments for Nanobox development (#3295) ... 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.	8 years ago
Atsushi Yamamoto	402c19a924	Add preference setting for delete toot modal (#3368) ... * 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	8 years ago
Akihiko Odaki	189a06d2a2	Fix Webpack Bundle Analyzer output for Webpacker (#3374) ... Webpacker failed to parse output of Webpack when a module requires non-existent module or has similar errors. This commit fixes the bug.	8 years ago
vidarlee	450441fc11	i18n: Add some tags for Chinese translation (#3379) ... * 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	8 years ago
Masoud Abkenar	b619362a36	Persian translation fixes and updates (#3380) ... * Persian translation fix * Persian translation of new strings	8 years ago
Eugen Rochko	62ca37884a	Fix #2922 - Load stylesheet from "custom.css" entrypoint when present (#3332) ... * 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	8 years ago
jeroenpraat	f9180823bc	Update Dutch strings for 1.4 (#3363) ... * 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	8 years ago
Quent-in	4b0c667c09	i18n update for Occitan language (#3362) ... * 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	8 years ago
m4sk1n	1b732cad61	i18n: pl: pluralized (#3344) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
m4sk1n	ef80ad17b3	Updated Polish translation (#3335) ... * 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	8 years ago
Ira	2241a15ee9	i18n: New strings translated to Hebrew (#3282)	8 years ago
Nolan Lawson	2469fd1cdc	Add improved performance marks for development mode (#3297)	8 years ago
alpaca-tc	7ee5fc5d68	Toggle sensitive from admin page (#3261)	8 years ago
Matt Jankowski	4289ed1d13	Refactor of API timeline actions (#3263) ... - 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	8 years ago
Ira	1baa75f79f	i18n: Latest Hebew strings translated (#3250)	8 years ago
Eugen Rochko	9afd7dadbf	Fix more locale regressions from #3055 (#3242)	8 years ago
Eugen Rochko	48e7a22e34	Fix locale regression from #3055 (#3231)	8 years ago
Ratmir Karabut	2bb5486357	Update Russian translation (#3225) ... * 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	8 years ago
Nolan Lawson	60e2b951de	Add webpack-bundle-analyzer for production builds (#3170)	8 years ago
Immae	a94c152fd3	Allow alternate domains for mastodon handlers (#3187)	8 years ago
Nolan Lawson	9d04de1c8d	Only load Intl data for current language (#3130) ... * 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	8 years ago
m4sk1n	fbbd80b40b	Updated Polish translation (#3204) ... * 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	8 years ago
Clworld	df92f010ad	Set config.cache_store in environments file. (#3219) ... * Set config.cache_store in application.rb * Set config.cache_store in environments. * fix code format.	8 years ago
Yamagishi Kazutoshi	84608c3ff8	Add translations for counter of profile (#3214) ... ref #3101	8 years ago
Masoud Abkenar	b69365e397	Persian translation update (#3206) ... * Persian translation update * Persian translation update: new files * Persian translation update * activerecord.fa.yml language code * Persian translation update * fix indent	8 years ago
vidarlee	440441ccb3	Enhance for the Chinese translation (#3198) ... * Enhance for the Chinese translation * Add filtered_languages for Chinese Translation include CN/HK/TW for PR #3175	8 years ago
Daigo 3 Dango	3eb13307ca	Add a Japanese translation for PR #3175 (#3192)	8 years ago
Eugen Rochko	20c0054460	Adjust REDIS_URL usage in node_redis (#3183) ... Resolves #2780	8 years ago
Eugen Rochko	ef900789bc	Replace mastodon:media:clear and mastodon:feeds:clear rake tasks with (#3180) ... sidekiq-scheduler jobs Resolves #2495	8 years ago
Eugen Rochko	d78f555254	Improve language filter preferences look (#3184)	8 years ago
Eugen Rochko	c2f70829d9	Adds bootsnap. Faster boot time (#3176)	8 years ago
spla	b75f13927e	Catalan translation update (#3177) ... * 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	8 years ago
Matt Jankowski	8f4b7c1820	Filter languages with opt out (#3175) ... * Remove allowed_languages and add filtered_languages * Use filtered_languages instead of allowed_languages	8 years ago
Yamagishi Kazutoshi	2e112e2406	Improve eslint rules (#3147) ... * Add semi to ESLint rules * Add padded-blocks to ESLint rules * Add comma-dangle to ESLint rules * add config/webpack and storyboard * add streaming/ * yarn test:lint -- --fix	8 years ago
Yamagishi Kazutoshi	da0a18a318	Add Japanese translations (domain block & admin page) (#3160) ... https://github.com/tootsuite/mastodon/pull/3100 https://github.com/tootsuite/mastodon/pull/3127	8 years ago
Ira	550863198c	i18n: Hebrew Spam folder check warning added (#3134)	8 years ago
Eugen Rochko	620d0d8029	Account domain blocks (#2381) ... * Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Conversation muting - prevents notifications that reference a conversation (including replies, favourites, reblogs) from being created. API endpoints /api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute Currently no way to tell when a status/conversation is muted, so the web UI only has a "disable notifications" button, doesn't work as a toggle * Display "Dismiss notifications" on all statuses in notifications column, not just own * Add "muted" as a boolean attribute on statuses JSON For now always false on contained reblogs, since it's only relevant for statuses returned from the notifications endpoint, which are not nested Remove "Disable notifications" from detailed status view, since it's only relevant in the notifications column * Up max class length * Remove pending test for conversation mute * Add tests, clean up * Rename to "mute conversation" and "unmute conversation" * Raise validation error when trying to mute/unmute status without conversation * Adding account domain blocks that filter notifications and public timelines * Add tests for domain blocks in notifications, public timelines Filter reblogs of blocked domains from home * Add API for listing and creating account domain blocks * API for creating/deleting domain blocks, tests for Status#ancestors and Status#descendants, filter domain blocks from them * Filter domains in streaming API * Update account_domain_block_spec.rb	8 years ago
Ira	b11c4326d2	i18l: Hebrew translation updates (#3109)	8 years ago
Quent-in	cf6f67997e	Update oc.yml (#3112) ... Normally fully complete	8 years ago
Eugen Rochko	76449df903	Fix character counter not updating for bio (#3101)	8 years ago
Eugen Rochko	226c9836e4	Add reset button to admin accounts search, improve looks a little (#3100)	8 years ago
alpaca-tc	e89e4355eb	Add filter to AccountFilter (#2968)	8 years ago
jeroenpraat	7c1f3f8163	Added a warning to look into the spam folder (#2921) ... Inspired by a user who received the email confirmation in Gmail's spam folder. This happened with Sparkpost correctly setup.	8 years ago
spla	a51c8074df	Add catalan language (#3084) ... * 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	8 years ago