about summary refs log tree commit diff
path: root/lib
AgeCommit message (Collapse)Author
2020-03-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.
2020-03-10Fix videos with unsupported colorspace not being transcoded (#13242)ThibG
2020-03-09Fix MP4 (H264 + AAC) video files being needlessly re-encoded (#13239)ThibG
2020-03-08Change local media attachments to perform heavy processing asynchronously ↵Eugen Rochko
(#13210) Fix #9106
2020-03-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.
2020-03-08Add `--skip-media-remove` option to `tootctl statuses remove` (#13080)tateisu
* Add skip_media_remove option to tootctl statuses remove * Add skip_media_remove option to tootctl statuses remove Co-authored-by: tateisu <tateisu@juggler.jp>
2020-02-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-02-29Fix installation failing when Redis password contains special characters ↵ThibG
(#13156) * Add support for special characters in Redis passwords Fixes #13154 * Refactor
2020-02-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-02-27Bump version to 3.1.2 (#13162)Eugen Rochko
2020-02-25Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-02-22Add `--reset-password` option to `tootctl accounts modify` (#13126)ThibG
2020-02-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-02-15Do not suggest to login into the GitLab database (#13084)Marcin Cieślak
As pointed out on Discourse: https://discourse.joinmastodon.org/t/obscure-wtf-error-message-running-migrations-for-3-1/2524 The message the administrators were getting was telling them to log in to the "GitLab database" and also mentions MySQL
2020-02-10Bump version to 3.1.1 (#13069)Eugen Rochko
2020-02-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `Gemfile`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `Gemfile.lock`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `app/lib/sanitize_config.rb`: Upstream added better unsupported link stripping, while we had different sanitizing configs. Took only upstream's link stripping code. - `config/locales/simple_form.pl.yml`: Strings unused in glitch-soc had been removed from glitch-soc, reintroduced them even if they are not useful, to reduce the risk of later merge conflicts.
2020-02-09Bump version to 3.1.0 (#13053)Eugen Rochko
2020-02-03Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-01-28Bump version to 3.1.0rc2 (#12999)Eugen Rochko
2020-01-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system
2020-01-24Bump version to 3.1.0rc1 (#12932)Eugen Rochko
2020-01-23Add announcements (#12662)Eugen Rochko
* Add announcements Fix #11006 * Add reactions to announcements * Add admin UI for announcements * Add unit tests * Fix issues - Add `with_dismissed` param to announcements API - Fix end date not being formatted when time range is given - Fix announcement delete causing reactions to send streaming updates - Fix announcements container growing too wide and mascot too small - Fix `all_day` being settable when no time range is given - Change text "Update" to "Announcement" * Fix scheduler unpublishing announcements before they are due * Fix filter params not being passed to announcements filter
2020-01-21Close registration before self-destruct (#12877)Jeong Arm
2020-01-12Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one
2020-01-11Fix ruby 2.7 warnings about keyword parameters (#12824)ThibG
2020-01-11Keep statuses bookmarked by local users in tootctl statuses remove (#12818)Gomasy
2020-01-10Add --remote-only option to emoji purge (#12810)ThibG
Fixes #12804
2019-12-19Merge branch 'master' into glitch-soc/masterThibaut Girka
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-17Changes to tootctl statuses remove (#11267)ThibG
* Fix comments in statuses_cli The comment for the part of query keeping statuses which have replies was incorrect, explaining the part of the query kept favourited statuses instead * Keep statuses favourited by local users in tootctl statuses remove * Do delete old replies that are not direct interactions with local users * Skip reblogs of local statuses instead of all reblogs * Optimize some queries * Keep old statuses with recent reblogs * Add option to clear toots from followed accounts too
2019-12-12Fix typo in tootctl statuses remove (#12603)trwnh
2019-12-12Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system
2019-12-09Fix error handling in `tootctl media remove-orphans` (#12571)Eugen Rochko
2019-12-08Add `tootctl media remove-orphans` (#12568)Eugen Rochko
2019-12-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.
2019-12-02Update ESLint and RuboCop in Code Climate (#12534)Yamagishi Kazutoshi
2019-11-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `package.json`
2019-11-04Add `tootctl media lookup` command (#12283)Nathaniel Suchy
* 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-10-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-10Fix preloaded JSON-LD context for identity not being used (#12138)Eugen Rochko
Regression from #11316
2019-10-09Bump version to 3.0.1 (#12116)Eugen Rochko
2019-10-08Change `tootctl media refresh` to skip already downloaded attachments (#12118)Eugen Rochko
2019-10-07Add `tootctl media usage` command (#12115)Eugen Rochko
2019-10-07Fix tootctl not allocating enough database connections for main thread (#12097)Eugen Rochko
2019-10-07Fix issues with tootctl's parallelization and progress reporting (#12093)Eugen Rochko
2019-10-06Remove unused option from tootctl accounts cull (#12074)Jeong Arm
2019-10-04Merge tag 'v3.0.0' into glitch-soc/merge-upstreamThibaut Girka
2019-10-03Bump version to 3.0.0 (#12000)Eugen Rochko
2019-10-03Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-03Bump version to 3.0.0rc3 (#12063)Eugen Rochko
2019-10-03Fix performance of GIF re-encoding (#12057)Eugen Rochko
* Change animated GIF detection to not shell out to ImageMagick Signed-off-by: Eugen Rochko <eugen@zeonfederated.com> * Change video encoding parameters to limit to 10800 video frames Signed-off-by: Eugen Rochko <eugen@zeonfederated.com> * Limit GIF image size further Signed-off-by: Eugen Rochko <eugen@zeonfederated.com> * Always strip metadata from video files * Fix code style issues
generated by cgit-pink (git 2.37.1) at 2024-11-18 13:24:29 +0000