| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
Conflicts:
- app/models/status.rb
Resolved by taking both changes (not a real conflict, just changes too close
to each other).
|
|
Just the color is not enough change since not everyone uses colored
terminals.
Touching the account makes it so that the account is not in the
threshold window in case of running again
|
|
* Fixed an issue where "tootctl media remove" can not count the file size.
* Fixed the problem pointed out by codeclimate.
|
|
|
|
Fix #9237
|
|
* Display amount of freed disk space in tootctl media remove
Fix #9213
* Fix code style issue
|
|
|
|
|
|
* Bump version to 2.6.0
* Update CHANGELOG.md
|
|
Conflicts:
- app/controllers/auth/sessions_controller.rb
Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
|
|
* Bump version to 2.6.0rc4
* Update CHANGELOG.md
|
|
|
|
* Bump version to 2.6.0rc3
* Update CHANGELOG.md
|
|
|
|
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
|
|
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.
|
|
|
|
* Bump version to 2.6.0rc2
* Update CHANGELOG.md
|
|
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.
|
|
Fix #8741
|
|
* Delete first 9 accounts on dead servers
* Clean up code by moving dead server culling to the end
|
|
|
|
* Bump version to 2.6.0rc1
* Update AUTHORS.md
* Update CHANGELOG.md
|
|
|
|
|
|
|
|
* cleanup pass
* undo mistakes
* fixed.
* revert
|
|
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.
|
|
|
|
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
|
|
|
|
|
|
Fixes #715
|
|
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
|
|
This strips metadata on file upload by re-encoding the files, at the cost
of possible slight image quality decrease and processing resources.
|
|
This strips metadata on file upload by re-encoding the files, at the cost
of possible slight image quality decrease and processing resources.
|
|
* 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
|
|
Found via `codespell -q 3 --skip="./app/javascript/mastodon/locales,./config/locales"`
|
|
Conflicts:
app/controllers/oauth/authorizations_controller.rb
Just two changes being too close to one another.
Took both.
|
|
|
|
* add rake task for generating AUTHORS.md
* update AUTHORS.md
* rubocop
|
|
* 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
|
|
Conflicts:
README.md
Discarded upstream changes to the README, kept our version.
|
|
|
|
|
|
|
|
Fix #8527
|
|
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
|
