acbed64f3d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
5 years ago
8ed78f0b85
Fix unnecessary SQL query performed on unauthenticated requests ( #11179 )
5 years ago
00552d2f79
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
6 years ago
806c2f8102
Cleanup various controllers ( #10972 )
...
* Remove skip_session! as it is not supported in Rails 5
* Minor cleanup in StreamEntriesController
* Remove redundant mark_cacheable! calls
6 years ago
365de06816
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb
All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.
6 years ago
591c26dc97
Reduce server load caused by anonymous viewing. ( #9059 )
...
Do not start a session if the current user is not logged in for public-facing pages.
Mark pages that don't care about sessions as publicly cacheable.
Keep the max age as 0 so proxies and browsers will still try to retrieve an updated version but can still fall back to the stale version if the site is down or too slow.
Fixes #9035 .
6 years ago
478abe3a58
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
Resolved by taking both changes (not a real conflict, just changes too close
to each other).
6 years ago
7a939f7cfc
Remove intermediary arrays when creating hash maps from results ( #9291 )
6 years ago
c954f89bdd
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
cf2ab9c394
Include preview cards in status entity in REST API ( #9120 )
...
* Include preview cards in status entity in REST API
* Display preview card in-stream
* Improve in-stream display of preview cards
6 years ago
4dd208f482
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/oauth/authorizations_controller.rb
Just two changes being too close to one another.
Took both.
6 years ago
72a8ca84e0
Add force_login option to OAuth authorize page ( #8655 )
...
* Add force_login option to OAuth authorize page
For when a user needs to sign into an app from multiple accounts
on the same server
* When logging out from modal header, redirect back after re-login
6 years ago
69212ed0ad
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/application_controller.rb
Changed instance theme selection by instance flavour selection.
6 years ago
413a28499d
Allow mods to disable login, improve message when login disabled ( #8329 )
...
* Allow moderators to disable/enable login
* Instead of rejecting login, show forbidden error when login disabled
Avoid confusion because when login is rejected, the message is that
the account is not activated, which is wrong.
* Fix tests
6 years ago
289b4f2838
Add ability to change an instance default theme from the administration panel ( #7092 ) ( #8381 )
...
* Add default_settings class method to ScopedSettings
ScopedSettings was extended to use value of unscoped setting instead of
only using defaults set in config/settings.yml for selected settings.
This adds possibility for admins to set default values of users' settings,
for example default theme (as requested in #7092 ).
* Add ability to change an instance default theme
Closes #7092
6 years ago
98dccee657
Merge branch 'master' into glitch-soc/master
...
Conflicts:
config/routes.rb
Added the “endorsements” route from upstream.
6 years ago
af2122bcf9
Unuse ActiveRecord::Base#cache_key ( #8185 )
...
* Unuse ActiveRecord::Base#cache_key
* Enable cache_versioning
* Call cache_collection
6 years ago
3dc4f8e2ca
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/ca.yml
config/locales/nl.yml
config/locales/oc.yml
config/locales/pt-BR.yml
Resolved conflicts by removing upstream-specific changes
7 years ago
83b124d54b
Catch ActionController::UnknownFormat and return HTTP 406 ( #7621 )
...
An error like that should not appear in production error log.
7 years ago
d0b753db6b
Merge branch 'master' into glitch-soc/merge
...
Conflicts:
app/controllers/invites_controller.rb
app/serializers/initial_state_serializer.rb
config/locales/ko.yml
7 years ago
6222c7def7
Update session activation time ( fixes #5605 ) ( #7408 )
7 years ago
62ce70f28c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
078aa8b5ae
Improve require_admin! and require_staff! filters ( #7018 )
...
Previously these returns 302 redirects instead of 403s, which meant posting links to admin pages in slack caused them to unfurl, rather than stay as a link. Additionally, require_admin! doesn't appear to be actively used, on require_staff!
7 years ago
c08c971dd3
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
README.md
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/serializers/rest/instance_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.ja.yml
7 years ago
9721b7746a
Fix #942 : Seamless LDAP login ( #6556 )
7 years ago
c0aabbec0f
Merge branch 'master' of https://github.com/tootsuite/mastodon
...
# Conflicts:
# app/controllers/settings/exports_controller.rb
# app/models/media_attachment.rb
# app/models/status.rb
# app/views/about/show.html.haml
# docker_entrypoint.sh
# spec/views/about/show.html.haml_spec.rb
7 years ago
eb5b1b45d9
Fix #6526 : Only store redirect location if not in JSON format ( #6528 )
7 years ago
6d1023b2e9
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
7 years ago
23ce0c86da
pam authentication ( #5303 )
...
* add pam support, without extra column
* bugfixes for pam login
* document options
* fix code style
* fix codestyle
* fix tests
* don't call remember_me without password
* fix codestyle
* improve checks for pam usage (should fix tests)
* fix remember_me part 1
* add remember_token column because :rememberable requires either a password or this column.
* migrate db for remember_token
* move pam_authentication to the right place, fix logic bug in edit.html.haml
* fix tests
* fix pam authentication, improve username lookup, add comment
* valid? is sometimes not honored, return nil instead trying to authenticate with pam
* update devise_pam_authenticatable2 and adjust code. Fixes sideeffects observed in tests
* update devise_pam_authenticatable gem, fixes for codeconventions, fix finding user
* codeconvention fixes
* code convention fixes
* fix idention
* update dependency, explicit conflict check
* fix disabled password updates if in pam mode
* fix check password if password is present, fix templates
* block registration if account is maintained by pam
* Revert "block registration if account is maintained by pam"
This reverts commit 8e7a083d650240b6fac414926744b4b90b435f20.
* fix identation error introduced by rebase
* block usernames maintained by pam
* document pam settings better
* fix code style
7 years ago
22286ee6cd
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
9e5b431655
Use error pack when rendering error pages. Fixes #305 .
7 years ago
8704a190c0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
c89bb8ae40
Fix force_ssl conditional ( #6201 )
7 years ago
63c17a66b8
Fix unintended cache ( #6214 )
7 years ago
a37e295901
Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master
7 years ago
4f24f54739
Fix unintended cache
7 years ago
796a39a283
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
662fa866ee
Make sure private toots remain private and do not end up in HTTP caches ( #6175 )
7 years ago
f2d71eae4b
Cache JSON of immutable ActivityPub representations ( #6171 )
7 years ago
01f91695f5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/auth/confirmations_controller.rb
7 years ago
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
99e8710095
Javascript intl8n flavour support
7 years ago
5758a12491
Skins shouldn't apply to fallback flavours
7 years ago
41f9a4d4e4
Fix common packs when other pack also there
7 years ago
882055afd0
Rename themes -> flavours ? ?
7 years ago
36b9f4df56
Skins support
7 years ago
8aeda4f064
Finalized theme loading and stuff
7 years ago
5845057adb
Themed prefetching
7 years ago
3df46ce5a8
Fix some rubocop style issues ( #5730 )
7 years ago
97178b6d86
Add moderator role and add pundit policies for admin actions ( #5635 )
...
* Add moderator role and add pundit policies for admin actions
* Add rake task for turning user into mod and revoking it again
* Fix handling of unauthorized exception
* Deliver new report e-mails to staff, not just admins
* Add promote/demote to admin UI, hide some actions conditionally
* Fix unused i18n
7 years ago
Thibaut Girka
Eugen Rochko
Ben Lubar
Jakub Mendyk
abcang
Jenkins
Emelia Smith
David Yip
imncls
Alexander
Yamagishi Kazutoshi
kibigo!