be4849c083
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb
Minor conflict due to glitch-soc's theming system
2019-12-12 15:40:06 +01:00
d7bcc0930c
Fix error handling in `tootctl media remove-orphans` ( #12571 )
2019-12-09 04:26:00 +01:00
f3d232381d
Add `tootctl media remove-orphans` ( #12568 )
2019-12-08 15:37:12 +01:00
0ae7d84273
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`
2019-11-06 14:38:28 +01:00
23ed9303b8
Add `tootctl media lookup` command ( #12283 )
...
* Add a lookup tool to the media cli
* Improved lookup logic
* Clarified wording in the output
* Code style changes
* Code style changes
* Code style changes
* Code style changes
* Add error handling code incase an attachment isn't found
* Code style changes
* Code style changes
* Make requested changes
* Fix styling issues
* Handle other media types
* Remove an inadvertently added log
* Make requested changes
* Make the code safe no matter what the path, S3 or not
* Code style changes
* Code style changes
* Replace select method with Ruby Enumerable grep method
2019-11-04 12:55:20 +01:00
61631f4751
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
e6d111f38b
Bump version to 3.0.1 ( #12116 )
2019-10-09 07:36:57 +02:00
4a98e77d0e
Change `tootctl media refresh` to skip already downloaded attachments ( #12118 )
2019-10-08 05:59:10 +02:00
0aaa3afc2d
Add `tootctl media usage` command ( #12115 )
2019-10-07 20:04:56 +02:00
6c9b4f6b77
Fix tootctl not allocating enough database connections for main thread ( #12097 )
2019-10-07 05:05:02 +02:00
38b6c34e32
Fix issues with tootctl's parallelization and progress reporting ( #12093 )
2019-10-07 04:24:05 +02:00
c4fbfaf0b8
Remove unused option from tootctl accounts cull ( #12074 )
2019-10-06 04:30:07 +02:00
1bbba0016a
Merge tag 'v3.0.0' into glitch-soc/merge-upstream
2019-10-04 19:49:43 +02:00
83d3e7733d
Bump version to 3.0.0 ( #12000 )
2019-10-03 22:44:22 +02:00
a84aedb7a7
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream raised max image size from 8MB to 10MB while our limit is
configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +02:00
bae268b2f6
Bump version to 3.0.0rc3 ( #12063 )
2019-10-03 04:13:22 +02:00
0ce0baa9b5
Add parallelization to `tootctl search deploy` ( #12051 )
...
* Add parallel gem
* Modify parallel option in tootctl search deploy
* Add paralell option to tootctl search deploy
* Change 1 to false
* Clean up
* Rename --parallel to --processes
2019-10-02 21:50:43 +02:00
c7adf80827
Change `tootctl domains purge` to accept multiple domains at once ( #12046 )
2019-10-02 04:49:53 +02:00
16ff7c5627
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
13b06d4b3b
Bump version to 3.0.0rc2 ( #11999 )
2019-09-29 18:50:16 +02:00
e87bcaa107
Bump version to 3.0.0rc1 ( #11900 )
2019-09-21 20:02:14 +02:00
3c8372fa81
Bump version to 2.9.3 ( #11899 )
2019-09-20 22:59:29 +02:00
74c5b2bd08
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
Conflict because we changed the number of default results to be
configurable
- app/lib/settings/scoped_settings.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
2019-09-13 18:13:43 +02:00
c5d37f18cb
Change deletes to preserve soft-deleted statuses in unresolved reports ( #11805 )
...
Change all account actions except "none" to resolve all unresolved reports
Refactor `SuspendAccountService` to be more readable
2019-09-11 16:32:44 +02:00
031ca25014
Add retry for failed media downloads and `tootctl media refresh` ( #11775 )
2019-09-10 15:29:12 +02:00
8674814825
Change tootctl to use inline parallelization instead of Sidekiq ( #11776 )
...
- Remove --background option
- Add --concurrency(=5) option
- Add progress bars
2019-09-10 13:48:48 +02:00
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
96702e7f67
Add `tootctl cache recount` command ( #11597 )
2019-08-18 14:55:03 +02:00
3a77090d01
Limit "tootctl accounts follow" to local accounts ( #11592 )
...
To (somewhat) limit mass remote follow. Fix #11360
2019-08-17 22:59:40 +02:00
e50554391a
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-05 13:13:28 +02:00
f96f45ef12
Add option to exclude suspended domains/subdomains from tootctl domains crawl ( #11454 )
...
* Add "--exclude-suspended" to tootctl domains crawl
This new option ignores any instances suspended server-wide as
well as their associated subdomains. This queries all domain
blocks up front, then runs a regexp on each domain. This improves
performance over what may be the obvious implementation, which is
to ask `DomainBlocks.blocked?(domain)` for each domain -- this
hits the DB many times, slowing things down considerably.
* cleaning up code style
* Compiling regex
* Removing ternary operator
2019-08-03 19:11:09 +02:00
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
24552b5160
Add whitelist mode ( #11291 )
2019-07-30 11:10:46 +02:00
bca3825c17
Merge branch 'master' into glitch-soc/merge-upstream
2019-07-28 16:28:05 +02:00
0d80f686d8
Add `tootctl preview_cards remove` ( #11320 )
...
* Add `tootctl preview_cards remove`
* fix code style
* Remove `Scheduler::PreviewCardsCleanupScheduler` file
* fix code style again
Add exclude case where image_file_name is blank
* Added a function to output confirmation if the specified number of days is less than 2 weeks
2019-07-28 13:48:19 +02:00
a6b4440115
Remove pre from version, add extra suffix variable ( #11407 )
2019-07-26 07:57:27 +02:00
e3a551cbd1
Fix tootctl statuses remove
...
A ending parenthesis was missing in the bookmark special line.
2019-07-24 15:55:39 +02:00
20520e6158
When cleaning up remote statuses, keep bookmarked ones
2019-07-18 13:34:54 +02:00
3922b518f7
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-28 21:36:50 +02:00
e64e6a03dd
Add categories for custom emojis ( #11196 )
...
Fix #7940
2019-06-28 15:54:10 +02:00
ddd875ad99
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
Upstream added a few fields
- config/application.rb
Upstream added a different paperclip transcoder
2019-06-24 15:02:59 +02:00
b5c772c3d4
Bump version to 2.9.2 ( #11152 )
2019-06-22 17:28:26 +02:00
84f945d64c
Bump version to 2.9.1 ( #11143 )
2019-06-22 01:51:27 +02:00
60adda7e59
Merge branch 'master' into glitch-soc/merge-upstream
2019-06-13 22:23:20 +02:00
c9eeb2e832
Bump version to 2.9.0 ( #11074 )
2019-06-13 20:19:21 +02:00
275f09ccab
Bump version to 2.9.0rc2 ( #11070 )
2019-06-13 00:43:59 +02:00
1b0ff4cd69
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
2019-06-10 18:59:53 +02:00
0949c43ab3
Bump version to 2.9.0rc1 ( #11004 )
2019-06-09 15:53:08 +02:00
4431ce52a6
Specify gzip required in tootctl emoji help ( #11000 )
2019-06-08 12:43:11 -04:00
20d01a954e
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
Conflicts due to the addition of a new preference upstream,
“advanced layout”.
2019-05-26 15:41:40 +02:00
Thibaut Girka