You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.		5 years ago
..
exports	…
migration	Add (back) option to set redirect notice on account without moving followers (#11994)	5 years ago
preferences	…
two_factor_authentication	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago
aliases_controller.rb	Addition of update activity distribution by alias, minor correction (#11905)	5 years ago
applications_controller.rb	Revert some refactoring in order to make codebase closer to upstream	6 years ago
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
deletes_controller.rb	Fix 2FA challenge and password challenge for non-database users (#11831)	5 years ago
exports_controller.rb	Add account migration UI (#11846)	5 years ago
featured_tags_controller.rb	…
flavours_controller.rb	Revert some refactoring in order to make codebase closer to upstream	6 years ago
identity_proofs_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
imports_controller.rb	Fix ImportsController param to permit :mode (#13347)	5 years ago
migrations_controller.rb	Fix account migration not affecting followers on origin server (#11980)	5 years ago
pictures_controller.rb	Allow users to delete their header and avatar (#13234)	5 years ago
preferences_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
profiles_controller.rb	Fix base64-encoded file uploads not being possible (#12748)	5 years ago
sessions_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
two_factor_authentications_controller.rb	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago