luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-09 16:35:48 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/helpers
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
..
admin Add admin ability to remove an user's header image (#9495) 2018-12-11 19:28:03 +01:00
settings
application_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
flashes_helper.rb
home_helper.rb Make avatar and headers respect auto_play_gif (#9515) 2018-12-14 20:34:18 +01:00
instance_helper.rb
jsonld_helper.rb Improve federated ID validation (#8372) 2018-08-22 20:55:14 +02:00
mailer_helper.rb HTML e-mails for UserMailer (#6256) 2018-01-16 03:29:11 +01:00
routing_helper.rb
settings_helper.rb Add Czech language option and locale data (#8594) 2018-09-05 08:50:06 +09:00
stream_entries_helper.rb Redesign admin accounts index (#9340) 2018-11-26 15:53:27 +01:00