| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2019-03-28 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml | |||
| 2019-03-28 | Add order options to relationship manager UI (#10404) | Eugen Rochko | |
| 2019-03-18 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system. | |||
| 2019-03-18 | Add dormant filter to relationship manager, rename other filters (#10308) | Eugen Rochko | |
| Rename "abandoned" to "moved", and "active" to "primary" | |||
| 2019-03-16 | Fix relationships controller/view wrt. glitch-soc theming engine | Thibaut Girka | |
| 2019-03-16 | Add relationship manager UI (#10268) | Eugen Rochko | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |