674 Commits (b4a3792201ccc01713b536e50428e027bd094d2b)

Author SHA1 Message Date
Jenkins fc884d015a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 161c72d66d Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
Jenkins 933840bebf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 99f962ba73 Allow HTTP caching of json view of public statuses (#6115)
7 years ago
Patrick Figel 04ecf44c2f Add confirmation step for email changes (#6071)
7 years ago
David Yip 54148b9a4a
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Akihiko Odaki 2c1ed5f872 Show mastodon on modal (#6129)
7 years ago
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
beatrix a56c4742d3 keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)
7 years ago
Eugen Rochko 38fc1b498d
Add more instance stats APIs (#6125)
7 years ago
ThibG 868568d1c1 Make host_meta/webfinger replies cacheable (fixes #6100) (#6101)
7 years ago
David Yip bf1eb0912c
Set packs on 2FA-related pages. Fixes #271.
7 years ago
David Yip 82b2e224a2
Merge branch 'gs-master' into prevent-local-only-federation
7 years ago
Jenkins 37254c4f5d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko a3b2ea599d
Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)
7 years ago
Jenkins 82236a3703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko ad75ec8b5b
Add filters to admin UI for custom emojis (#6003)
7 years ago
Eugen Rochko 20a6584d2d
Clean up admin UI for accounts (#6004)
7 years ago
David Yip a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 1356ed72cd
Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)
7 years ago
cwm 0a52e37648 change pack to 'auth'
7 years ago
cwm 44992df257 load pack
7 years ago
Erin c5a4eda694 move outbox filtering to Status#permitted_for (as per @ekiru)
7 years ago
beatrix 771b950feb
Merge pull request #254 from glitch-soc/new-theme-ux
7 years ago
Eugen Rochko feed07227b
Apply a 25x rate limit by IP even to authenticated requests (#5948)
7 years ago
David Yip 204688e803
Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.
7 years ago
kibigo! dabf66e676 Moved flavour UI into own prefs tab
7 years ago
Erin f080a9fac7 filter local-only toots from AP outboxes
7 years ago
Erin 6bd18e43ba filter local-only statuses from public pages
7 years ago
cwm 072ab191cc pulled master, moved locale entry to new location
7 years ago
kibigo! b28cd6769c Javascript intl8n flavour support
7 years ago
abcang fcc0795a40 Remove unused function (#5950)
7 years ago
cwm abe95b614b add initial components based off of tootsuite pr #1507
7 years ago
Eugen Rochko a865b62efc
Rate limit by user instead of IP when API user is authenticated (#5923)
7 years ago
abcang 99242b92bc Keep WebPush settings (#5879)
7 years ago
Eugen Rochko 2f4c5f504f
Limit users to 50 lists, remove pagination from lists API (#5933)
7 years ago
kibigo! 717b7d555c Skins shouldn't apply to fallback flavours
7 years ago
kibigo! 061211a1e3 Fix common packs when other pack also there
7 years ago
David Yip 161d286df2
Use settings pack for InvitesController (#229)
7 years ago
beatrix 81b0145759
Merge pull request #229 from glitch-soc/glitch-theme
7 years ago
David Yip 017fc81caf
Prepend check_enabled_deletion to Settings::DeletesController (#229)
7 years ago
Jenkins 8ca91cef45 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi b21db9bbde Using double splat operator (#5859)
7 years ago
Eugen Rochko 42bcbd36b7 Remove rabl dependency (#5894)
7 years ago
Eugen Rochko e20895f251
Add list of lists component to web UI (#5811)
7 years ago
kibigo! 5bed0f10ed Various fixes
7 years ago
David Yip d9800a5647
Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! bc4fa6b198 Rename themes -> flavours ? ?
7 years ago
kibigo! d216547382 Fixed typos
7 years ago
Jenkins 933eafdcd3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago