Merge branch 'release'

# Conflicts: # app/build.gradle.kts # app/src/main/java/eu/kanade/presentation/webview/WebViewScreenContent.kt # app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt # app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt # app/src/main/java/exh/EXHMigrations.kt # app/src/main/java/exh/debug/DebugFunctions.kt
jobobby04 · Oct 29, 2023 · 1202409 · 1202409
2 parents caaa7a5 + 2f9cba8
commit 1202409
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -3,7 +3,7 @@
 I acknowledge that:
 
 - I have updated:
-  - To the latest version of the app (stable is v1.9.3)
+  - To the latest version of the app (stable is v1.9.4)
   - All extensions
 - I have gone through the FAQ (https://tachiyomi.org/docs/faq/general) and troubleshooting guide (https://tachiyomi.org/docs/guides/troubleshooting/)
 - If this is an issue with an extension, that I should be opening an issue in https://github.com/tachiyomiorg/tachiyomi-extensions

diff --git a/.github/ISSUE_TEMPLATE/report_issue.yml b/.github/ISSUE_TEMPLATE/report_issue.yml
@@ -53,7 +53,7 @@ body:
       label: Tachiyomi version
       description: You can find your Tachiyomi version in **More → About**.
       placeholder: |
-        Example: "1.9.3"
+        Example: "1.9.4"
     validations:
       required: true
 
@@ -100,7 +100,7 @@ body:
           required: true
         - label: I have gone through the [FAQ](https://tachiyomi.org/docs/faq/general) and [troubleshooting guide](https://tachiyomi.org/docs/guides/troubleshooting/).
           required: true
-        - label: I have updated the app to version **[1.9.3](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
+        - label: I have updated the app to version **[1.9.4](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
           required: true
         - label: I have updated all installed extensions.
           required: true

diff --git a/.github/ISSUE_TEMPLATE/request_feature.yml b/.github/ISSUE_TEMPLATE/request_feature.yml
@@ -33,7 +33,7 @@ body:
           required: true
         - label: If this is an issue with an extension, I should be opening an issue in the [extensions repository](https://github.com/tachiyomiorg/tachiyomi-extensions/issues/new/choose).
           required: true
-        - label: I have updated the app to version **[1.9.3](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
+        - label: I have updated the app to version **[1.9.4](https://github.com/jobobby04/tachiyomisy/releases/latest)**.
           required: true
         - label: I will fill out all of the requested information in this form.
           required: true
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -27,7 +27,7 @@ android {
         applicationId = "eu.kanade.tachiyomi.sy"
 
         versionCode = 58
-        versionName = "1.9.3"
+        versionName = "1.9.4"
 
         buildConfigField("String", "COMMIT_COUNT", "\"${getCommitCount()}\"")
         buildConfigField("String", "COMMIT_SHA", "\"${getGitSha()}\"")

diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
@@ -1172,7 +1172,7 @@ class EHentai(
                     .map {
                         PagePreviewInfo(
                             it.attr("alt").toInt(),
-                            imageUrl = it.attr("src")
+                            imageUrl = it.attr("src"),
                         )
                     }
             }

diff --git a/app/src/main/res/raw/changelog_release.xml b/app/src/main/res/raw/changelog_release.xml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog bulletedList="true">
+    <changelogversion versionName="1.9.4" changeDate="Oct 29,2023">
+        <changelogtext>[b]Based on Tachiyomi stable 0.14.7(from 0.14.6)[/b]</changelogtext>
+        <changelogtext>Use ReadableAt for MangaDex dates</changelogtext>
+        <changelogtext>Fix E-H/Exh page previews</changelogtext>
+        <changelogtext>Fix page previews cache</changelogtext>
+        <changelogtext>Fix E-H/Exh browse thumbnails</changelogtext>
+        <changelogtext>Fix crash on Chinese</changelogtext>
+        <changelogtext>Fix Mangadex Recommendations when Delegation is off</changelogtext>
+    </changelogversion>
     <changelogversion versionName="1.9.3" changeDate="Apr 18,2023">
         <changelogtext>Hotfix for 1.9.2, fix backup restore</changelogtext>
     </changelogversion>