99 Commits (6b0ee170462e7d63ed1901b2c661f7bf058caad7)

Author SHA1 Message Date
Thibaut Girka 478abe3a58 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 7a939f7cfc Remove intermediary arrays when creating hash maps from results (#9291)
6 years ago
Thibaut Girka c954f89bdd Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko cf2ab9c394 Include preview cards in status entity in REST API (#9120)
6 years ago
Thibaut Girka 4dd208f482 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 72a8ca84e0 Add force_login option to OAuth authorize page (#8655)
6 years ago
Thibaut Girka 69212ed0ad Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 413a28499d Allow mods to disable login, improve message when login disabled (#8329)
6 years ago
Jakub Mendyk 289b4f2838 Add ability to change an instance default theme from the administration panel (#7092) (#8381)
6 years ago
Thibaut Girka 98dccee657 Merge branch 'master' into glitch-soc/master
6 years ago
abcang af2122bcf9 Unuse ActiveRecord::Base#cache_key (#8185)
6 years ago
Thibaut Girka 3dc4f8e2ca Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 83b124d54b Catch ActionController::UnknownFormat and return HTTP 406 (#7621)
7 years ago
Thibaut Girka d0b753db6b Merge branch 'master' into glitch-soc/merge
7 years ago
ThibG 6222c7def7 Update session activation time (fixes #5605) (#7408)
7 years ago
Jenkins 62ce70f28c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 078aa8b5ae Improve require_admin! and require_staff! filters (#7018)
7 years ago
David Yip c08c971dd3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9721b7746a Fix #942: Seamless LDAP login (#6556)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko eb5b1b45d9 Fix #6526: Only store redirect location if not in JSON format (#6528)
7 years ago
David Yip 6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Alexander 23ce0c86da pam authentication (#5303)
7 years ago
David Yip 22286ee6cd Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
David Yip 9e5b431655 Use error pack when rendering error pages. Fixes #305.
7 years ago
Jenkins 8704a190c0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi c89bb8ae40 Fix force_ssl conditional (#6201)
7 years ago
Yamagishi Kazutoshi 63c17a66b8 Fix unintended cache (#6214)
7 years ago
David Yip a37e295901 Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master
7 years ago
Yamagishi Kazutoshi 4f24f54739 Fix unintended cache
7 years ago
Jenkins 796a39a283 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 662fa866ee Make sure private toots remain private and do not end up in HTTP caches (#6175)
7 years ago
Eugen Rochko f2d71eae4b Cache JSON of immutable ActivityPub representations (#6171)
7 years ago
David Yip 01f91695f5 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9427823d5c Add more instance stats APIs (#6125)
7 years ago
kibigo! 99e8710095 Javascript intl8n flavour support
7 years ago
kibigo! 5758a12491 Skins shouldn't apply to fallback flavours
7 years ago
kibigo! 41f9a4d4e4 Fix common packs when other pack also there
7 years ago
kibigo! 882055afd0 Rename themes -> flavours ? ?
7 years ago
kibigo! 36b9f4df56 Skins support
7 years ago
kibigo! 8aeda4f064 Finalized theme loading and stuff
7 years ago
kibigo! 5845057adb Themed prefetching
7 years ago
Eugen Rochko 3df46ce5a8 Fix some rubocop style issues (#5730)
7 years ago
Eugen Rochko 97178b6d86 Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
Andrew b4842ef0b9 Add support for multiple themes (#4959)
7 years ago
Eugen Rochko fd69694749 Add "signed in as" header to some pages (#4523)
7 years ago
Eugen Rochko 0217e15dd3 Fix #4058 - Use a long-lived cookie to keep track of user-level sessions (#4091)
7 years ago
Eugen Rochko ad531f90b1 Bind web UI access tokens to sessions (#3940)
7 years ago
Yamagishi Kazutoshi 09f5091102 Show error message to suspended user (#3281)
8 years ago
Yamagishi Kazutoshi 410a684c3b Change "Account.any?" to "Account.exists?" (#3217)
8 years ago