0117de0a01
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
2019-03-28 13:01:33 +01:00
7aeb50cc89
Add order options to relationship manager UI ( #10404 )
2019-03-28 02:16:01 +01:00
365de06816
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.
2019-03-18 18:03:27 +01:00
b1e0164848
Add dormant filter to relationship manager, rename other filters ( #10308 )
...
Rename "abandoned" to "moved", and "active" to "primary"
2019-03-18 03:53:17 +01:00
847374e78d
Fix relationships controller/view wrt. glitch-soc theming engine
2019-03-16 14:26:14 +01:00
4fa2d55d4e
Add relationship manager UI ( #10268 )
2019-03-16 11:23:22 +01:00
Thibaut Girka