metu.life

History

Thibaut Girka c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.		5 years ago
..
aliases	Add account migration UI (#11846 )	5 years ago
applications	Various fixes and improvements (#12878 )	5 years ago
deletes	Fix 2FA challenge and password challenge for non-database users (#11831 )	5 years ago
exports	Use different strings on exports page (#12569 )	5 years ago
featured_tags	Add explanation to featured hashtags page and profile (#11586 )	5 years ago
flavours	Fix settings/flavours	6 years ago
identity_proofs	squashed identity proof updates (#10375 )	6 years ago
imports	Add option to overwrite imported data (#9962 )	6 years ago
migration/redirects	Add (back) option to set redirect notice on account without moving followers (#11994 )	5 years ago
migrations	Add (back) option to set redirect notice on account without moving followers (#11994 )	5 years ago
preferences	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
profiles	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
shared	…
two_factor_authentication	Fix TOTP codes not being filtered from logs during enabling/disabling (#11877 )	5 years ago
two_factor_authentications	Add password challenge to 2FA settings, e-mail notifications (#11878 )	5 years ago