Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json

2019-08-19 21:49:35 +02:00

..

accounts_cli.rb

Limit "tootctl accounts follow" to local accounts (#11592)

2019-08-17 22:59:40 +02:00

cache_cli.rb

Add tootctl cache recount command (#11597)

2019-08-18 14:55:03 +02:00

cli_helper.rb

tootctl accounts [add|del|cull] (#8642)

2018-09-09 13:33:36 +02:00

domains_cli.rb

Add option to exclude suspended domains/subdomains from tootctl domains crawl (#11454)

2019-08-03 19:11:09 +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

ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)

2018-01-29 01:06:39 +01:00

preview_cards_cli.rb

Add tootctl preview_cards remove (#11320)

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

redis_config.rb

Add support for separate Redis for cache (#7272)

2018-04-27 01:37:59 +02:00

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

Fixes/do not override timestamps (#7336)

2018-05-03 23:02:46 +02:00

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