| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2018-12-23 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - config/routes.rb Upstream changed some admin routes, conflict was because of an added :show action for statuses on our side. Kept it. | |||
| 2018-12-22 | Add moderation warnings (#9519) | Eugen Rochko | |
| * Add moderation warnings Replace individual routes for disabling, silencing, and suspending a user, as well as the report update route, with a unified account action controller that allows you to select an action (none, disable, silence, suspend) as well as whether it should generate an e-mail notification with optional custom text. That notification, with the optional custom text, is saved as a warning. Additionally, there are warning presets you can configure to save time when performing the above. * Use Account#local_username_and_domain | |||
| 2018-12-09 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js. | |||
| 2018-12-06 | Add profile directory (#9427) | Eugen Rochko | |
| Fix #5578 | |||
| 2018-12-06 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2018-12-03 | Improve account suspension speed and completeness (#9290) | Eugen Rochko | |
| - Some associations were missing from the clean-up - Some attributes were not reset on suspension - Skip federation and streaming deletes when purging a dead domain - Move account association definitions to concern | |||
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |