Thibaut Girka
636973707f
Fix confirmations_controller
6 years ago
Thibaut Girka
8bd7b9b586
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/models/user.rb
Resolved by adding :default_language to user settings fields
6 years ago
Shuhei Kitagawa
d61e647e8a
Replace bypass option with bypass_sign_in ( #7867 )
6 years ago
David Yip
4f8122a98c
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
.env.production.sample
app/controllers/auth/confirmations_controller.rb
db/schema.rb
7 years ago
Eugen Rochko
5322013f25
CAS + SAML authentication feature ( #6425 )
...
* Cas authentication feature
* Config
* Remove class_eval + Omniauth initializer
* Codeclimate review
* Codeclimate review 2
* Codeclimate review 3
* Remove uid/email reconciliation
* SAML authentication
* Clean up code
* Improve login form
* Fix code style issues
* Add locales
7 years ago
David Yip
01f91695f5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/auth/confirmations_controller.rb
7 years ago
Eugen Rochko
9427823d5c
Add more instance stats APIs ( #6125 )
...
* Add GET /api/v1/instance/peers API to reveal known domains
* Add GET /api/v1/instance/activity API
* Make new APIs disableable, exclude private statuses from activity stats
* Fix code style issue
* Fix week timestamps
7 years ago
kibigo!
8aeda4f064
Finalized theme loading and stuff
7 years ago
Eugen Rochko
6628ea4a82
Default follows for new users ( #4871 )
...
When a new user confirms their e-mail, bootstrap their home timeline
by automatically following a set of accounts. By default, all local
admin accounts (that are unlocked). Can be customized by new admin
setting (comma-separated usernames, local and unlocked only)
7 years ago
Eugen Rochko
e71b152d89
Fix rubocop issues, introduce usage of frozen literal to improve performance
8 years ago
Eugen Rochko
fc198a8b4c
Adding e-mail confirmations
8 years ago