Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code

2019-09-18 17:25:56 +02:00

..

exports

Add CSV export for lists and domain blocks (#9677)

2019-01-01 13:44:04 +01: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

Fix TOTP codes not being filtered from logs during enabling/disabling (#11877)

2019-09-18 02:48:40 +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

Revert some refactoring in order to make codebase closer to upstream

2019-07-23 10:51:12 +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

Revert some refactoring in order to make codebase closer to upstream

2019-07-23 10:51:12 +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

Fix TOTP codes not being filtered from logs during enabling/disabling (#11877)

2019-09-18 02:48:40 +02:00