treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
11,604 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

10 Commits (ecc53d10e1d3dbc03921a5e5c7ca9d80f0fc9641)

Author SHA1 Message Date
Thibaut Girka a8e43875a5 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
 2020-01-24 14:37:06 +01:00
Eugen Rochko 67172aa4f9 Change followers page to relationships page in admin UI (#12927) 
Allow browsing and filtering all relationships instead of just
followers, unify the codebase with the user-facing relationship
manager, add ability to see who the user invited
 2020-01-23 20:33:20 +01:00
Thibaut Girka 6719b9daa5 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.
 2020-01-20 18:31:11 +01:00
Eugen Rochko 9ebfb23e87 Various fixes and improvements (#12878) 
* Fix unused role routes being generated

* Remove unused JavaScript code

* Refactor filters code to be DRYer

* Fix `.count == 0` comparisons to `.empty?` in views

* Fix filters in views
 2020-01-20 15:55:03 +01:00
Thibaut Girka 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
Eugen Rochko 7aeb50cc89 Add order options to relationship manager UI (#10404) 2019-03-28 02:16:01 +01:00
Thibaut Girka 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
Eugen Rochko 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
Thibaut Girka 847374e78d Fix relationships controller/view wrt. glitch-soc theming engine 2019-03-16 14:26:14 +01:00
Eugen Rochko 4fa2d55d4e Add relationship manager UI (#10268) 2019-03-16 11:23:22 +01:00