86 Commits (22bc07998c7559a02b6a6ad0b3a23fc00ce2cf5b)

Author SHA1 Message Date
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge
7 years ago
ThibG 352bae8c3e Update session activation time (fixes #5605) (#7408)
7 years ago
Jenkins 6611100480 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 2e59751823 Improve require_admin! and require_staff! filters (#7018)
7 years ago
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 47bdb9b33b
Fix #942: Seamless LDAP login (#6556)
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko d8bc64bb09
Fix #6526: Only store redirect location if not in JSON format (#6528)
7 years ago
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Alexander 04fef7b888 pam authentication (#5303)
7 years ago
David Yip f7c4d4464b
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
David Yip 70c99a9f34
Use error pack when rendering error pages. Fixes #305.
7 years ago
Jenkins c2e1bfd9ae Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 1d92b90be9 Fix force_ssl conditional (#6201)
7 years ago
Yamagishi Kazutoshi da809f9eec Fix unintended cache (#6214)
7 years ago
David Yip 5083311d64
Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master
7 years ago
Yamagishi Kazutoshi 2af307bce4 Fix unintended cache
7 years ago
Jenkins c69a23ae46 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 3bee0996c5 Make sure private toots remain private and do not end up in HTTP caches (#6175)
7 years ago
Eugen Rochko c10f4bdb03
Cache JSON of immutable ActivityPub representations (#6171)
7 years ago
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 38fc1b498d
Add more instance stats APIs (#6125)
7 years ago
kibigo! b28cd6769c Javascript intl8n flavour support
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
kibigo! bc4fa6b198 Rename themes -> flavours ? ?
7 years ago
kibigo! 541fe9b110 Skins support
7 years ago
kibigo! bdbbd06dad Finalized theme loading and stuff
7 years ago
kibigo! 585758a373 Themed prefetching
7 years ago
Eugen Rochko 3e90987c8b Fix some rubocop style issues (#5730)
7 years ago
Eugen Rochko 7bb8b0b2fc
Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
Andrew 0401a24558 Add support for multiple themes (#4959)
7 years ago
Eugen Rochko df605f0f8b Add "signed in as" header to some pages (#4523)
7 years ago
Eugen Rochko 00df69bc89 Fix #4058 - Use a long-lived cookie to keep track of user-level sessions (#4091)
7 years ago
Eugen Rochko ed7dc1704d Bind web UI access tokens to sessions (#3940)
7 years ago
Yamagishi Kazutoshi 676ba50601 Show error message to suspended user (#3281)
8 years ago
Yamagishi Kazutoshi 73e4468ff3 Change "Account.any?" to "Account.exists?" (#3217)
8 years ago
Akihiko Odaki aa662cecad single_user_mode? always returns boolean (#3215)
8 years ago
Matt Jankowski 7bffd16024 Error responses cleanup (#2692)
8 years ago
Matt Jankowski fdcf884cf7 Extract user tracking into concern (#2600)
8 years ago
alpaca-tc 9317ec8eb1 Localize with i18n for Devise::FailureApp (#2309)
8 years ago
Matt Jankowski a0dd90a397 Return force_ssl to the controller (#2380)
8 years ago
Evan Minto 66fd8e7821 ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities (#2197)
8 years ago
Matt Jankowski ee82d8a876 Move force_ssl check to production config (#2165)
8 years ago
Takayoshi Nishida 5e33ad29d4 Fix #2195 - Set locale to error pages (#2255)
8 years ago
Eugen 5d710b1139 Make file attachment on MediaAttachment optional (#1865)
8 years ago
Marcin Cieślak 1c8477eab2 Give SINGLE_USER a chance to register (#1820)
8 years ago
Eugen Rochko 4b621188ad Fix #1165 - before_action was called before protect_from_forgery
8 years ago
Eugen Rochko e3a3422a65 Allow setting of default language through config
8 years ago
Eugen Rochko b510a56c0c Only call regeneration worker after first login after a 14 day break
8 years ago