mirrors/glitch-social
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon synced 2024-03-09 07:35:42 +00:00
Code Releases Activity
glitch-social/app/controllers/settings
History
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
..
exports
Add CSV export for lists and domain blocks (#9677)
2019-01-01 13:44:04 +01:00
migration
Add (back) option to set redirect notice on account without moving followers (#11994)
2019-09-29 05:03:19 +02:00
preferences
Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)
2019-06-07 16:51:08 +02:00
two_factor_authentication
Add password challenge to 2FA settings, e-mail notifications (#11878)
2019-09-18 16:37:27 +02:00
aliases_controller.rb
Addition of update activity distribution by alias, minor correction (#11905)
2019-09-21 09:11:21 +02:00
applications_controller.rb
Revert some refactoring in order to make codebase closer to upstream
2019-07-23 10:51:12 +02:00
base_controller.rb
Revert some refactoring in order to make codebase closer to upstream
2019-07-23 10:51:12 +02:00
deletes_controller.rb
Fix 2FA challenge and password challenge for non-database users (#11831)
2019-09-15 21:08:39 +02:00
exports_controller.rb
Add account migration UI (#11846)
2019-09-19 20:58:19 +02:00
featured_tags_controller.rb
Fix pinned statuses being shown in a featured hashtag (#9971)
2019-02-05 00:27:18 +01:00
flavours_controller.rb
Revert some refactoring in order to make codebase closer to upstream
2019-07-23 10:51:12 +02:00
identity_proofs_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-24 15:02:59 +02:00
imports_controller.rb
Revert some refactoring in order to make codebase closer to upstream
2019-07-23 10:51:12 +02:00
migrations_controller.rb
Fix account migration not affecting followers on origin server (#11980)
2019-09-29 16:23:13 +02:00
preferences_controller.rb
Add option to disable emoji replacements
2019-08-12 23:01:37 +02:00
profiles_controller.rb
Revert some refactoring in order to make codebase closer to upstream
2019-07-23 10:51:12 +02:00
sessions_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-23 10:51:07 +02:00
two_factor_authentications_controller.rb
Add password challenge to 2FA settings, e-mail notifications (#11878)
2019-09-18 16:37:27 +02:00