about summary refs log tree commit diff
path: root/lib
AgeCommit message (Collapse)Author
2018-10-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.
2018-10-30Bump version to 2.6.0rc4 (#9164)Eugen Rochko
* Bump version to 2.6.0rc4 * Update CHANGELOG.md
2018-10-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-29Bump version to 2.6.0rc3 (#9142)Eugen Rochko
* Bump version to 2.6.0rc3 * Update CHANGELOG.md
2018-10-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-27Do not remove "dead" domains in tootctl accounts cull (#9108)Eugen Rochko
Leave `tootctl accounts cull` to simply check removed accounts from live domains, and skip temporarily unavailable domains, while listing them in the final output for further action. Add `tootctl domains purge DOMAIN` to be able to purge a domain from that list manually
2018-10-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.
2018-10-25cli: set exit_on_failure for all CLI classes (#9094)Sascha
2018-10-25Bump version to 2.6.0rc2 (#9087)Eugen Rochko
* Bump version to 2.6.0rc2 * Update CHANGELOG.md
2018-10-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.
2018-10-22Fix cull tripping on nil in last_webfingered_at (#9051)Eugen Rochko
Fix #8741
2018-10-21Fix tootctl cull on dead servers (#9041)Jeong Arm
* Delete first 9 accounts on dead servers * Clean up code by moving dead server culling to the end
2018-10-21Handle if username is not found on tootctl feeds build (#9040)Jeong Arm
2018-10-21Bump version to 2.6.0rc1 (#9025)Eugen Rochko
* Bump version to 2.6.0rc1 * Update AUTHORS.md * Update CHANGELOG.md
2018-10-12Bump version to 2.5.2 (#8960)Eugen Rochko
2018-10-11Bump version to 2.5.1 (#8953)Eugen Rochko
2018-10-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-08rubocop issues - Cleaning up (#8912)ashleyhull-versent
* cleanup pass * undo mistakes * fixed. * revert
2018-10-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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.
2018-10-04Add tootctl settings registrations open (#8829)Eugen Rochko
2018-10-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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
2018-09-29Fix tootctl accounts reattaching not unsuspending deleted account (#8812)Eugen Rochko
2018-09-28Add tootctl accounts backup (#8811)Eugen Rochko
2018-09-26Add -glitch suffix to version stringThibaut Girka
Fixes #715
2018-09-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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
2018-09-17Unconditionally re-encode locally-uploaded images to strip metadataThibG
This strips metadata on file upload by re-encoding the files, at the cost of possible slight image quality decrease and processing resources.
2018-09-17Unconditionally re-encode locally-uploaded images to strip metadata (#8714)ThibG
This strips metadata on file upload by re-encoding the files, at the cost of possible slight image quality decrease and processing resources.
2018-09-14Move more tasks to tootctl (#8675)Eugen Rochko
* 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
2018-09-14Misc. typos (#8694)luzpaz
Found via `codespell -q 3 --skip="./app/javascript/mastodon/locales,./config/locales"`
2018-09-11Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/controllers/oauth/authorizations_controller.rb Just two changes being too close to one another. Took both.
2018-09-10using mailto scheme in AUTHORS.md (#8663)rinsuki
2018-09-10Add rake task for generating AUTHORS.md (#8661)nightpool
* add rake task for generating AUTHORS.md * update AUTHORS.md * rubocop
2018-09-09tootctl accounts [add|del|cull] (#8642)Eugen Rochko
* 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
2018-09-03Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: README.md Discarded upstream changes to the README, kept our version.
2018-09-02Bump version to 2.5.0Eugen Rochko
2018-09-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-09-01Bump version to 2.5.0rc2Eugen Rochko
2018-09-01Fix wrong string being used on login failure when using LDAP (#8534)Eugen Rochko
Fix #8527
2018-08-31Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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
2018-08-31Add --verbose and --dry-run option to tootctl media remove (#8519)mayaeh
* Add --verbose and --dry-run options to CLI interface for removing remote media. * Fix coding style problem.
2018-08-29Fix CLI interface for removing remote media (#8506)mayaeh
* Fix that can't delete media files even if "tootctl media remove" execute when "--background" not attached. * Revert This reverts commit 5aa7e09645b27bae38a26030148b23e553ee2662. * Change to obtain and pass all columns when "--background" option is false.
2018-08-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml
2018-08-26Add CLI task for rotating keys (#8466)Eugen Rochko
* 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
2018-08-26Fix low-hanging rubocop gripes (#8458)Quint Guvernator
* rubocop: quit being so picky * rubocop: miscellany * rubocop: prefer present to blank
2018-08-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-26Fix NUM_DAYS in rake mastodon:media:remove_remote and print warning (#8462)Eugen Rochko
Remove old deprecated rake tasks
2018-08-26Add CLI interface for importing custom emoji (#8437)Eugen Rochko
bin/tootctl emoji import PATH_TO_TAR Fix #8435
2018-08-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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.
2018-08-25Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)M Somerville
Still check for S3_CLOUDFRONT_HOST for existing installs.
2018-08-25Add improved CLI interface for removing remote media (#8411)Eugen Rochko
./bin/tootctl media remove --days 7 --background Make the old rake task point to it
generated by cgit-pink (git 2.37.1) at 2024-11-27 18:50:10 +0000