me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
10947 commits 2 branches 0 tags 429 MiB
Commit graph

288 commits

Author SHA1 Message Date
Thibaut Girka
e859334b33 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
Eugen Rochko
fa15a5e9f2 Fix error handling in tootctl media remove-orphans (#12571) 2019-12-09 04:26:00 +01:00
Eugen Rochko
0769ef8277 Add tootctl media remove-orphans (#12568) 2019-12-08 15:37:12 +01:00
Thibaut Girka
e7655951d7 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`
 2019-11-06 14:38:28 +01:00
Nathaniel Suchy
8ae8e9268e 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
Thibaut Girka
9506d9cafc 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
Eugen Rochko
a4969d4b98 Bump version to 3.0.1 (#12116) 2019-10-09 07:36:57 +02:00
Eugen Rochko
347c82efed Change tootctl media refresh to skip already downloaded attachments (#12118) 2019-10-08 05:59:10 +02:00
Eugen Rochko
c47d7b8abf Add tootctl media usage command (#12115) 2019-10-07 20:04:56 +02:00
Eugen Rochko
7e13c7c710 Fix tootctl not allocating enough database connections for main thread (#12097) 2019-10-07 05:05:02 +02:00
Eugen Rochko
17c2205247 Fix issues with tootctl's parallelization and progress reporting (#12093) 2019-10-07 04:24:05 +02:00
Jeong Arm
9fbb97a0c8 Remove unused option from tootctl accounts cull (#12074) 2019-10-06 04:30:07 +02:00
Thibaut Girka
07abea7ba8 Merge tag 'v3.0.0' into glitch-soc/merge-upstream 2019-10-04 19:49:43 +02:00
Eugen Rochko
74ddddd3db Bump version to 3.0.0 (#12000) 2019-10-03 22:44:22 +02:00
Thibaut Girka
c2d6ef1b64 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
Eugen Rochko
6edcffbb9f Bump version to 3.0.0rc3 (#12063) 2019-10-03 04:13:22 +02:00
Takeshi Umeda
38d2632b90 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
Eugen Rochko
36199a7bd6 Change tootctl domains purge to accept multiple domains at once (#12046) 2019-10-02 04:49:53 +02:00
Thibaut Girka
cc94c90bf1 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
Eugen Rochko
7918c98190 Bump version to 3.0.0rc2 (#11999) 2019-09-29 18:50:16 +02:00
Eugen Rochko
c64f143bf7 Bump version to 3.0.0rc1 (#11900) 2019-09-21 20:02:14 +02:00
Eugen Rochko
40d33e780e Bump version to 2.9.3 (#11899) 2019-09-20 22:59:29 +02:00
Thibaut Girka
2e38d889a3 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
Eugen Rochko
4291b74031 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
Eugen Rochko
8eab4349b4 Add retry for failed media downloads and tootctl media refresh (#11775) 2019-09-10 15:29:12 +02:00
Eugen Rochko
666c1a8a06 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
Thibaut Girka
c060523dc2 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
Eugen Rochko
3f5571301a Add tootctl cache recount command (#11597) 2019-08-18 14:55:03 +02:00
Stanislas
d67ad75a56 Limit "tootctl accounts follow" to local accounts (#11592) 
To (somewhat) limit mass remote follow. Fix #11360
 2019-08-17 22:59:40 +02:00
Thibaut Girka
77416866a7 Merge branch 'master' into glitch-soc/merge-upstream 2019-08-05 13:13:28 +02:00
Darius Kazemi
ccef31901f 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
Thibaut Girka
4973ba2d1f 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
Eugen Rochko
825dc3ca22 Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
Thibaut Girka
6c7a3268c9 Merge branch 'master' into glitch-soc/merge-upstream 2019-07-28 16:28:05 +02:00
mayaeh
7d13da568e 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
Clar Fon
ea0b3589ff Remove pre from version, add extra suffix variable (#11407) 2019-07-26 07:57:27 +02:00
Thomas Citharel
7e413214eb Fix tootctl statuses remove 
A ending parenthesis was missing in the bookmark special line.
 2019-07-24 15:55:39 +02:00
Thibaut Girka
074742e0e2 When cleaning up remote statuses, keep bookmarked ones 2019-07-18 13:34:54 +02:00
Thibaut Girka
6739c423ff Merge branch 'master' into glitch-soc/merge-upstream 2019-06-28 21:36:50 +02:00
Eugen Rochko
1c612f24e4 Add categories for custom emojis (#11196) 
Fix #7940
 2019-06-28 15:54:10 +02:00
Thibaut Girka
1177694c3e 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
Eugen Rochko
2080807d5f Bump version to 2.9.2 (#11152) 2019-06-22 17:28:26 +02:00
Eugen Rochko
9ab22716a1 Bump version to 2.9.1 (#11143) 2019-06-22 01:51:27 +02:00
Thibaut Girka
4741ea0029 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-13 22:23:20 +02:00
Eugen Rochko
500276ce96 Bump version to 2.9.0 (#11074) 2019-06-13 20:19:21 +02:00
Eugen Rochko
a388bc818b Bump version to 2.9.0rc2 (#11070) 2019-06-13 00:43:59 +02:00
Thibaut Girka
5a158899bc 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
Eugen Rochko
13f112c116 Bump version to 2.9.0rc1 (#11004) 2019-06-09 15:53:08 +02:00
Darius Kazemi
66ec27e0c8 Specify gzip required in tootctl emoji help (#11000) 2019-06-08 12:43:11 -04:00
Thibaut Girka
d46668d34b 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