Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master ...

Conflicts:
- `config/locales/en.yml`
  No real conflict, upstream added a translatable string “too close” to
  one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
  Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
  No real conflict, additional dependency in glitch-soc

2019-12-19 13:52:54 +01:00

..

account_batch.rb

Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)

2019-09-11 16:32:44 +02:00

admin_settings.rb

Merge branch 'master' into glitch-soc/master

2019-12-19 13:52:54 +01:00

challenge.rb

Add password challenge to 2FA settings, e-mail notifications (#11878)

2019-09-18 16:37:27 +02:00

custom_emoji_batch.rb

Fix custom emoji category creation silently erroring out on duplicate category (#12647)

2019-12-18 16:56:59 +01:00

delete_confirmation.rb

Fix 2FA challenge and password challenge for non-database users (#11831)

2019-09-15 21:08:39 +02:00

redirect.rb

Add (back) option to set redirect notice on account without moving followers (#11994)

2019-09-29 05:03:19 +02:00

status_batch.rb

Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)

2019-09-11 16:32:44 +02:00

tag_batch.rb

Add batch approve/reject for pending hashtags in admin UI (#11791)

2019-09-09 12:50:09 +02:00

two_factor_confirmation.rb

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

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