Commit Graph

6 Commits (1b0ff4cd69b00f0d2613be45cc233e25dc1a0d05)

Author SHA1 Message Date
Thibaut Girka 050efbc126 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
6 years ago
Eugen Rochko 08ec7435ce
Add order options to relationship manager UI (#10404) 6 years ago
Thibaut Girka 291012ec0c Merge branch 'master' into glitch-soc/merge-upstream
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.
6 years ago
Eugen Rochko b8e4c85e69
Add dormant filter to relationship manager, rename other filters (#10308)
Rename "abandoned" to "moved", and "active" to "primary"
6 years ago
Thibaut Girka 8e5d72dba8 Fix relationships controller/view wrt. glitch-soc theming engine 6 years ago
Eugen Rochko 1c113fd72d
Add relationship manager UI (#10268) 6 years ago