about summary refs log tree commit diff
path: root/app/controllers
AgeCommit message (Expand)Author
2017-12-30Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2017-12-30keep the same filters and page when doing custom emojo stuff (fixes #6112) (#...beatrix
2017-12-29Add more instance stats APIs (#6125)Eugen Rochko
2017-12-27Make host_meta/webfinger replies cacheable (fixes #6100) (#6101)ThibG
2017-12-20Set packs on 2FA-related pages. Fixes #271.David Yip
2017-12-15Merge branch 'gs-master' into prevent-local-only-federationDavid Yip
2017-12-15Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-14Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)Eugen Rochko
2017-12-13Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-13Add filters to admin UI for custom emojis (#6003)Eugen Rochko
2017-12-13Clean up admin UI for accounts (#6004)Eugen Rochko
2017-12-12Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip
2017-12-12Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)Eugen Rochko
2017-12-11change pack to 'auth'cwm
2017-12-11load packcwm
2017-12-11move outbox filtering to Status#permitted_for (as per @ekiru)Erin
2017-12-11Merge pull request #254 from glitch-soc/new-theme-uxbeatrix
2017-12-11Apply a 25x rate limit by IP even to authenticated requests (#5948)Eugen Rochko
2017-12-11Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.David Yip
2017-12-10Moved flavour UI into own prefs tabkibigo!
2017-12-10filter local-only toots from AP outboxesErin
2017-12-10filter local-only statuses from public pagesErin
2017-12-10pulled master, moved locale entry to new locationcwm
2017-12-10Javascript intl8n flavour supportkibigo!
2017-12-09Remove unused function (#5950)abcang
2017-12-09add initial components based off of tootsuite pr #1507cwm
2017-12-09Rate limit by user instead of IP when API user is authenticated (#5923)Eugen Rochko
2017-12-09Keep WebPush settings (#5879)abcang
2017-12-09Limit users to 50 lists, remove pagination from lists API (#5933)Eugen Rochko
2017-12-07Skins shouldn't apply to fallback flavourskibigo!
2017-12-06Fix common packs when other pack also therekibigo!
2017-12-06Use settings pack for InvitesController (#229)David Yip
2017-12-06Merge pull request #229 from glitch-soc/glitch-themebeatrix
2017-12-06Prepend check_enabled_deletion to Settings::DeletesController (#229)David Yip
2017-12-06Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-06Using double splat operator (#5859)Yamagishi Kazutoshi
2017-12-06Remove rabl dependency (#5894)Eugen Rochko
2017-12-05Add list of lists component to web UI (#5811)Eugen Rochko
2017-12-04Various fixeskibigo!
2017-12-04Merge branch 'gs-master' into glitch-themeDavid Yip
2017-12-03Rename themes -> flavours ? ?kibigo!
2017-12-03Fixed typoskibigo!
2017-12-02Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-01Add invite filter (#5862)Yamagishi Kazutoshi
2017-12-01Fix invites form path (#5861)Yamagishi Kazutoshi
2017-11-30Skins supportkibigo!
2017-11-28Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-28Allow hiding of reblogs from followed users (#5762)aschmitz
2017-11-28Fix account migration feature (#5837)nullkal
2017-11-27Merge remote-tracking branch 'tootsuite/master'David Yip