Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock

2019-07-30 12:22:33 +02:00

..

accounts_cli.rb

Record account suspend/silence time and keep track of domain blocks (#10660)

2019-05-14 19:05:02 +02:00

cache_cli.rb

Add tootctl cache clear (#10689)

2019-05-04 01:02:57 +02:00

cli_helper.rb

…

domains_cli.rb

Add whitelist mode (#11291)

2019-07-30 11:10:46 +02:00

emoji_cli.rb

Add categories for custom emojis (#11196)

2019-06-28 15:54:10 +02:00

feeds_cli.rb

Do not remove "dead" domains in tootctl accounts cull (#9108)

2018-10-27 22:56:16 +02:00

media_cli.rb

Fix "tootctl media remove" can't count the file size (#9288)

2018-11-16 09:47:40 +01:00

migration_helpers.rb

Fix SUPERUSER postgres command (#9877)

2019-01-27 23:56:07 +01:00

premailer_webpack_strategy.rb

…

preview_cards_cli.rb

Add tootctl preview_cards remove (#11320)

2019-07-28 13:48:19 +02:00

redis_config.rb

…

search_cli.rb

Add tootctl search deploy to avoid ugly rake task syntax (#10403)

2019-03-28 02:16:11 +01:00

settings_cli.rb

Admission-based registrations mode (#10250)

2019-03-14 05:28:30 +01:00

snowflake.rb

…

statuses_cli.rb

Fix tootctl statuses remove

2019-07-24 15:55:39 +02:00

version.rb

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

2019-07-28 16:28:05 +02:00