721 Commits (dfb494e69e0afb85769860d7695f1e54b5507566)

Author	SHA1	Message	Date
Charlotte Fields	a7a7613e71	cybre cleanup	7 years ago
Chronister	2edadd7fe7	All cybrespace changes through 5/28	7 years ago
beatrix-bitrot	4f54d53a84	update local modifications for cors and cp	7 years ago
Beatrix Bitrot	6a5afc6fe8	CORS tweaks	7 years ago
Sorin Davidoi	1280559503	Revocable sessions (#3616) ... * feat: Revocable sessions * fix: Tests using sign_in * feat: Configuration entry for the maximum number of session activations	7 years ago
Nolan Lawson	9c246cac5c	Apply babel to react-intl to remove prop-types (#3914)	7 years ago
Nolan Lawson	61634505c1	Upgrade to Webpack 3 with module concatenation (#3912)	7 years ago
Ratmir Karabut	d9eeb1340d	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	7 years ago
Quent-in	b0debe35d6	Update of doorkeeper.oc.yml (#3896) ... Just some adjustements	7 years ago
m4sk1n	3c355ed26b	i18n: Fixed typo in Polish translation (#3864)	7 years ago
のら	8b65b64428	Add Japanese translation "Action taken by" (#3850)	7 years ago
masarakki	d947978192	setting-for-account-deletable (#3852)	7 years ago
Yamagishi Kazutoshi	0a2e331bd5	Re-add disableHostCheck (regression #3729) (#3854) ... ref #2790	7 years ago
spla	7a96f422db	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	7 years ago
Eugen Rochko	8bed91d94c	Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847) ... Rename Activitypub to ActivityPub	7 years ago
Yamagishi Kazutoshi	dece663cd0	Upgrade Webpacker to version 2.0 (#3729)	7 years ago
Quent-in	d792a958fb	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	7 years ago
m4sk1n	a15a1827ab	updated Polish translation (#3751) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
unarist	54addd93c5	Add Japanese translation for Account deletion (#3747)	7 years ago
m4sk1n	cc22f75a94	i18n: updated Polish translation (#3744)	7 years ago
Eugen Rochko	1c7e2ddd65	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	7 years ago
Eugen Rochko	baf07bc83b	Exclude packs/custom.js from webpack compilation to prevent breakage (#3719) ... due to the change in #3373	7 years ago
Ratmir Karabut	0962301493	Update Russian translation (#3692)	7 years ago
Yamagishi Kazutoshi	eb34081815	Remove comments for eslint-disable (#3691)	7 years ago
Matt Jankowski	e31cd944c2	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	7 years ago
m4sk1n	8ceff751e2	i18n: Minor fixes in Polish translation (#3674) ... * i18n * i18n * i18n * i18n * i18n	7 years ago
Matt Jankowski	dc717cf425	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	7 years ago
m4sk1n	caa3d4acbd	i18n: updated Polish translation (#3670)	7 years ago
Yamagishi Kazutoshi	7f99456ab0	Refactor views/admin/reports/show.html.haml (#3656)	7 years ago
unarist	6c2359ce87	Add Japanese translation for #3640 (#3650)	7 years ago
Eugen Rochko	9eefd60136	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	7 years ago
nullkal	9335e15763	Support multiple trusted proxy ip addresses (#3639) ... * Support multiple trusted proxy ip addresses * correct coding style	7 years ago
Yamagishi Kazutoshi	26e4a2cc3c	Add Japanese translations (#3635)	7 years ago
m4sk1n	28c83a27f3	i18n: Update Polish translation (#3637)	7 years ago
Sorin Davidoi	4ce6597e3a	fix: Warn if JavaScript is disabled (#3634)	7 years ago
jeroenpraat	fa04340b99	Rest of 2FA translated + small fix (#3630)	7 years ago
Eugen Rochko	143ab47410	Fix #3063 - Add dynamic app manifest (#3563) ... * Fix #3063 - Add dynamic app manifest * Added short_name * Add background_color	7 years ago
Yamagishi Kazutoshi	d66a5fb801	Refactor translationRunner.js (#3604) ... - Use yargs instead of minimist - Simplify validators - Fix typo (RFC5626 -> RFC5646)	7 years ago
m4sk1n	3d1ea01df1	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.	7 years ago
Yamagishi Kazutoshi	615c580665	Add quotes ESLint rules (#3602) ... * Add quotes ESLint rule * Add jsx-quotes ESlint rule * Sort ESLint rules	7 years ago
Daigo 3 Dango	e1142e190b	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	7 years ago
Quent-in	f4d830d5ec	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	7 years ago
Eugen Rochko	4a6ceb24c9	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	7 years ago
Yamagishi Kazutoshi	3dc92003b1	Add date to ignore_missing and ignore_unused in config/i18n-tasks.yml (#3572)	7 years ago
Nolan Lawson	1a543944c8	Enable stats.json analysis with Webpack Visualizer (#3509)	7 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	6b0fdf95b9	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.	7 years ago
Matt Jankowski	eea027c5c2	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	7 years ago
Yamagishi Kazutoshi	59ff072fcf	Remove unused loaders of webpack (#3495)	7 years ago
Yamagishi Kazutoshi	c7be992701	Add ESLint rule (object-curly-spacing) (#3498)	7 years ago
Matt Jankowski	1066fd1ab5	Spec coverage and refactor for the api/v1/accounts controllers (#3451)	7 years ago