735 Commits (7de01e789a84fef049f111640104a162517b32a4)

Author	SHA1	Message	Date
beatrix-bitrot	cdcb74ffb6	Merge remote-tracking branch 'upstream/master'	7 years ago
m4sk1n	e88228f0eb	i18n: E-mail notifications to admins about new reports (pl) (#3975)	7 years ago
Eugen Rochko	d0221b05bc	Fix #1624 - Send e-mail notifications to admins about new reports (#3949)	7 years ago
m4sk1n	196bd78b60	i18n: Updated Polish translation (#3956) ... * i18n: Updated Polish translation * Update pl.yml	7 years ago
m4sk1n	f37382eb68	i18n: Warning to look into the spam folder (pl) (#3955)	7 years ago
Alda Marteau-Hardi	103f87f9ae	Translate pin/unpin and fix some inconsistencies in gender neutral strings (#3952)	7 years ago
Eugen Rochko	b90a44b6d0	Fix #3910 - Require OTP authentication to disable 2FA (#3935) ... * Fix #3910 - Require OTP authentication to disable 2FA. Also, remove ability to generate new OTP backup codes *after* initial backup codes were handed out during activation * Restore recovery code re-generation * Improve display of some 2FA elements	7 years ago
Eugen Rochko	ad531f90b1	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	7 years ago
amazedkoumei	b686b4350c	fix unnecessary variable (#3947)	7 years ago
Eugen Rochko	7814133f0a	Rename "Credentials" page to "Security" for clarity (#3941) ... * Rename "Credentials" page to "Security" for clarity * Change "security" icon from cog to lock	7 years ago
amazedkoumei	a1fd5d7f61	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	7 years ago
Eugen Rochko	c465c5b3a8	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	7 years ago
unarist	7968c69df4	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.	7 years ago
unarist	741fd15f4e	Fix webpack config for Windows (#3926)	7 years ago
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