321 Commits (00fcdebed758f031b486ec239fd425fc54a180b3)

Author	SHA1	Message	Date
Thibaut Girka	00fcdebed7	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.	7 years ago
Eugen Rochko	186024a058	Add tootctl settings registrations open (#8829)	7 years ago
Thibaut Girka	c91d9b7389	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb	8 years ago
Eugen Rochko	ac07bfb018	Fix tootctl accounts reattaching not unsuspending deleted account (#8812)	8 years ago
Eugen Rochko	38f5f9cf5b	Add tootctl accounts backup (#8811)	8 years ago
Thibaut Girka	3b05eb8002	Add -glitch suffix to version string ... Fixes #715	8 years ago
Thibaut Girka	91bef4759f	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js	8 years ago
ThibG	382cdd7f95	Unconditionally re-encode locally-uploaded images to strip metadata ... This strips metadata on file upload by re-encoding the files, at the cost of possible slight image quality decrease and processing resources.	8 years ago
ThibG	9b32898e3c	Unconditionally re-encode locally-uploaded images to strip metadata (#8714) ... This strips metadata on file upload by re-encoding the files, at the cost of possible slight image quality decrease and processing resources.	8 years ago
Eugen Rochko	6a3f9b7e53	Move more tasks to tootctl (#8675) ... * Move more tasks to tootctl - tootctl feeds build - tootctl feeds clear - tootctl accounts refresh Clean up exit codes and help messages * Move user modifying to tootctl * Improve user modification through CLI, rename commands add -> create mod -> modify del -> delete To remove ambiguity * Fix code style issues * Fix not being able to unset admin/mod role	8 years ago
luzpaz	40dd19be37	Misc. typos (#8694) ... Found via `codespell -q 3 --skip="./app/javascript/mastodon/locales,./config/locales"`	8 years ago
Thibaut Girka	cd99255698	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.	8 years ago
rinsuki	25dd523887	using mailto scheme in AUTHORS.md (#8663)	8 years ago
nightpool	b0b484ba18	Add rake task for generating AUTHORS.md (#8661) ... * add rake task for generating AUTHORS.md * update AUTHORS.md * rubocop	8 years ago
Eugen Rochko	47ea318479	tootctl accounts [add|del|cull] (#8642) ... * CLI interface for creating/deleting local users - tootctl accounts add USERNAME - tootctl accounts del USERNAME * Add CLI interface for culling remote users that no longer exist - tootctl accounts cull	8 years ago
Thibaut Girka	6c233a04a0	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: README.md Discarded upstream changes to the README, kept our version.	8 years ago
Eugen Rochko	b65a9b7243	Bump version to 2.5.0	8 years ago
Thibaut Girka	a74a7d5fe3	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
Eugen Rochko	08721170da	Bump version to 2.5.0rc2	8 years ago
Eugen Rochko	50f226348f	Fix wrong string being used on login failure when using LDAP (#8534) ... Fix #8527	8 years ago
Thibaut Girka	6f75a9001f	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml	8 years ago
mayaeh	18eb565755	Add --verbose and --dry-run option to tootctl media remove (#8519) ... * Add --verbose and --dry-run options to CLI interface for removing remote media. * Fix coding style problem.	8 years ago
mayaeh	cc26fd71ac	Fix CLI interface for removing remote media (#8506) ... * Fix that can't delete media files even if "tootctl media remove" execute when "--background" not attached. * Revert This reverts commit 5aa7e09645. * Change to obtain and pass all columns when "--background" option is false.	8 years ago
Thibaut Girka	53b7bb9d04	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml	8 years ago
Eugen Rochko	cabdbb7f9c	Add CLI task for rotating keys (#8466) ... * If an Update is signed with known key, skip re-following procedure Because it means the remote actor did *not* lose their database * Add CLI method for rotating keys bin/tootctl accounts rotate [USERNAME] Generates a new RSA key per account and sends out an Update activity signed with the old key. * Key rotation: Space out Update fan-outs every 5 minutes per 1000 accounts * Skip suspended accounts in key rotation	8 years ago
Quint Guvernator	da13fa5021	Fix low-hanging rubocop gripes (#8458) ... * rubocop: quit being so picky * rubocop: miscellany * rubocop: prefer present to blank	8 years ago
Thibaut Girka	be20eb4b2f	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
Eugen Rochko	b9c3788485	Fix NUM_DAYS in rake mastodon:media:remove_remote and print warning (#8462) ... Remove old deprecated rake tasks	8 years ago
Eugen Rochko	b378b4c5c7	Add CLI interface for importing custom emoji (#8437) ... bin/tootctl emoji import PATH_TO_TAR Fix #8435	8 years ago
Thibaut Girka	36393e1d2b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.	8 years ago
M Somerville	2bba6e582d	Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423) ... Still check for S3_CLOUDFRONT_HOST for existing installs.	8 years ago
Eugen Rochko	793eea2982	Add improved CLI interface for removing remote media (#8411) ... ./bin/tootctl media remove --days 7 --background Make the old rake task point to it	8 years ago
Thibaut Girka	246c313d45	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.	8 years ago
Eugen Rochko	23752639b2	Bump version to 2.5.0rc1 (#8356)	8 years ago
Thibaut Girka	8b4abaa90d	Merge branch 'master' into glitch-soc/master ... Conflicts: config/routes.rb Added the “endorsements” route from upstream.	8 years ago
Eugen Rochko	d98de8ada7	Get rid of all batch order warnings (#8334)	8 years ago
Thibaut Girka	280d7b1df8	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).	8 years ago
Immae	b0f4fe456b	Add ldap search filter (#8151)	8 years ago
Eugen Rochko	fcb527cdd6	Add post-deployment migration system (#8182) ... Adopted from GitLab CE. Generate new migration with: rails g post_deployment_migration name_of_migration_here By default they are run together with db:migrate. To not run them, the env variable SKIP_POST_DEPLOYMENT_MIGRATIONS must be set Code by Yorick Peterse <yorickpeterse@gmail.com>, see also: 83c8241160	8 years ago
ThibG	19da279703	Add some feedback to maintenance rake tasks (#8173)	8 years ago
Eugen Rochko	018a9e4e7f	Add post-deployment migration system (#8182) ... Adopted from GitLab CE. Generate new migration with: rails g post_deployment_migration name_of_migration_here By default they are run together with db:migrate. To not run them, the env variable SKIP_POST_DEPLOYMENT_MIGRATIONS must be set Code by Yorick Peterse <yorickpeterse@gmail.com>, see also: 83c8241160	8 years ago
ThibG	110b3f6335	Add some feedback to maintenance rake tasks (#8173)	8 years ago
Thibaut Girka	c1c514ca70	Merge branch 'master' into glitch-soc/merge-upstream ... Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.	8 years ago
Thibaut Girka	5f1bdca4c8	Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream ... Merge upstream changes right before the public profile redesign.	8 years ago
Eugen Rochko	bb71538bb5	Redesign public profiles and toots (#8068)	8 years ago
Eugen Rochko	0fb0037ca7	Resize images by area instead of fixed dimensions (#8083) ... To improve the way super tall or super ride images are treated, the numbers remain the same, 1280x1280 and 400x400, but if an image is less in one dimension than the other, the other can become larger Thanks to @WAHa_06x36@mastodon.social for the tip	8 years ago
Thibaut Girka	f26f1145ac	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x	8 years ago
Eugen Rochko	5a6645c922	Fix static GIFs being saved as empty files when using local storage (#8012) ... Fix #7997 Fix #6237	8 years ago
Thibaut Girka	6f0f583abe	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
Eugen Rochko	7ac5151b74	Bump version to 2.4.3	8 years ago