tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
9e04b2e8a4
mastodon/app/views/settings
History
Thibaut Girka 65e994b29b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/directories_controller.rb
- app/controllers/settings/applications_controller.rb
- app/controllers/settings/base_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/imports_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/sessions_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/controllers/settings/two_factor_authentications_controller.rb

Conflicts were due to some refactoring already made in glitch-soc
when introducing flavours.
2018-12-15 10:45:53 +01:00
..
applications Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
deletes Fix autocomplete option in haml files (#4438) 2017-07-29 14:20:31 +02:00
exports Group reports by target account (#8674) 2018-09-13 03:44:08 +02:00
flavours Don't show skins selector when there's only one (#256) 2018-01-08 16:45:32 -08:00
follower_domains Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
imports Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
migrations Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
notifications Add preference for report notification e-mails, skip for duplicates (#8559) 2018-09-02 00:11:58 +02:00
preferences Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
profiles Merge branch 'master' into glitch-soc/merge-upstream 2018-12-15 10:45:53 +01:00
shared 2FA controller cleanup (#2296) 2017-04-22 04:23:17 +02:00
two_factor_authentication Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
two_factor_authentications Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00