Thibaut Girka 055450bc02 Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 23:37:41 +02:00

..

exports

…

preferences

Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988)

2019-06-07 16:51:08 +02:00

two_factor_authentication

Merge branch 'master' into glitch-soc/merge-upstream

2019-07-19 23:37:41 +02:00

applications_controller.rb

…

base_controller.rb

…

deletes_controller.rb

…

exports_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-11 11:23:50 +01: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

…

identity_proofs_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-06-24 15:02:59 +02:00

imports_controller.rb

…

migrations_controller.rb

…

preferences_controller.rb

Add option to disable real-time updates in web UI (#9984)

2019-07-16 16:11:50 +02:00

profiles_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-02-10 21:10:09 +01:00

sessions_controller.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-02-10 21:10:09 +01:00

two_factor_authentications_controller.rb

…