resolve merge conflicts #18
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LANraragi Release 0.7.1
LANraragi Hotfix 0.7.2
Workflow fixes
LANraragi Release 0.7.3
LANraragi 0.7.5
Merge pull request Difegue#387 from Difegue/dev
* [ImgBot] Optimize images *Total -- 955.60kb -> 756.84kb (20.8%) /tools/Documentation/.gitbook/assets/ratings.png -- 131.97kb -> 86.23kb (34.66%) /tools/Documentation/.gitbook/assets/index.png -- 193.08kb -> 129.82kb (32.76%) /tools/Documentation/.gitbook/assets/archive_thumb.jpg -- 630.55kb -> 540.78kb (14.24%) Signed-off-by: ImgBotApp <[email protected]> * Do not show page select when there are no results * Also hide table header * Update buildx action to the official Docker one * Update s6 * Update less, the alpine package doesn't seem to have s6-overlay-preinit yet? * pin s6 alpine package * Rollback alpine base for now * Fix ARM builds (Difegue#394) * Update push-continous-delivery.yml * Update release-delivery.yml * Update push-continous-delivery.yml * Update push-continous-delivery.yml * Improve visibility when sorting table columns + fix being able to put whitespace as a custom column * Fix context menu applying to overlays * (Difegue#374) Remove cooldown on auto-plugin as it's basically useless * Fix memory leak caused by the Parallel::Loops/Storable combo in the Search API * Add some basic retrying logic on our first Redis connection This avoids dying unnecessarily if Redis takes a while to load into memory. * Accept "false" properly for pinned on category creation * Also fix the update_cat endpoint * Remove favtagmigration script * Add a simple GET to /api/categories/:id * (Difegue#335) Reading progression is now server-side! * Fix method for progress in docs * Fix docs thanks for nothing gitbook * (Difegue#385) (Difegue#397) Remove the built-in Auto-Tag feature in favor of a Filename parsing plugin * Fix tests * Avoid uninitialized warnings if there's no progress/pagecount in DB * Add a pageread stat and actually use the package.json description 'cause why not * Remove unnecessary datatables cdn include * (Difegue#282) Rewrite Shinobu filemap so it relies on Redis and keeps state between restarts * (Difegue#405) Add job + api req to regen all thumbnails Also remove redis loading timeout for REALLY BIG dataset * (Difegue#410) NFC all the things * Add fa-solid-900.woff2 to the vendor deps so that browsers finally shut up about it, also added fa-regular * Fix submenu arrow colors in the various themes * autism * Add an API endpoint to return which categories an ID belongs to * (Difegue#375) Rework context menu so it uses the new endpoint to remove archives from categories * More doc details on the reading progression API * Some more documentation fixes * MORE Documentation updates gee * (Difegue#412) Add autofocus to the password input in login * (Difegue#397) Add a check to RegexParse to avoid putting numbers as languages * (Difegue#414) Fix regexparse not decoding the filesystem path + decode log in minion upload for extra clarity * (Difegue#389) Update magick to v7 in homebrew * backport changes from homebrew-core those guys write ruby way better than I do * Fix brew test runs * (Difegue#389) Add libheif to Dockerfile and unlock avif/heif support * Don't recommend homebrew for linux since it doesn't work out of the box atm * Add Mojolicious::Plugin::Status when running in debug mode * Update docs to fix wrong json examples * Stop using a static secret for mojo's cookie signatures * Remove the auto-plugin toggle and matching pref It's a bit unnecessary considering plugins have to be toggled manually anyways. * Rework Plugin Configuration page a bit further * (Difegue#267) Make the thumbnail folder location an option * [ImgBot] Optimize images (Difegue#416) /tools/Documentation/.gitbook/assets/thumbchange.png -- 55.64kb -> 36.35kb (34.67%) Signed-off-by: ImgBotApp <[email protected]> Co-authored-by: ImgBotApp <[email protected]> * Add some JS to migrate local reading progression Co-authored-by: ImgBotApp <[email protected]> Co-authored-by: Cirno the Strongest <[email protected]> Co-authored-by: imgbot[bot] <31301654+imgbot[bot]@users.noreply.github.com>
v.0.7.8
LANraragi Release 0.7.9
Merge pull request Difegue#505 from Difegue/dev
Update Karen ref
Merge pull request Difegue#524 from Difegue/dev
Merge pull request Difegue#535 from Difegue/dev
Merge pull request Difegue#548 from Difegue/dev
Merge pull request Difegue#579 from Difegue/dev
Merge pull request Difegue#663 from Difegue/dev
Merge pull request Difegue#703 from Difegue/dev
Merge pull request Difegue#723 from Difegue/dev
Merge pull request Difegue#727 from Difegue/dev
Fix OPDS (for good this time)
LRR 0.8.9
LRR 0.9.0
Merge pull request Difegue#988 from Difegue/dev
0.9.1 this time for real i swear
Merge pull request Difegue#1031 from Difegue/dev
0.9.2 hotfix
# Conflicts: # lib/LANraragi/Plugin/Download/EHentai.pm # package.json
* add pixiv summary * add dependency * refactor summary sanitizer and add test * fix variable declaration * fix illust_body issue * add missing my * fix syntax and formatting * fix import * try utf-8 decode * Revert "try utf-8 decode" This reverts commit c24c801. * fix test ordering * use utf-8 for file reads * fix how test summaries are unescaped * fix how test summaries are unescaped * fix file paths in test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.