Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-07-14 16:01:48 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,308 Commits 2 Branches 80 Tags 149 MiB
68bea8a196
Commit Graph

3081 Commits

Author SHA1 Message Date
arkon
15bed1ac4c Offset appbar using margin instead (maybe fixes #4819) 2021-04-12 09:01:11 -04:00
Tooster
27f55f8098
Fix LibraryUpdateServiceTest so ./gradlew ... doesn't crash (#4821) 2021-04-12 08:35:00 -04:00
arkon
00598879e2 Insets fix for migration manga list 2021-04-11 22:57:54 -04:00
arkon
0dc4862d79 Revert case insensitive source folder check 2021-04-11 18:19:41 -04:00
arkon
a3f1b72126 Lint fixes/ignore some errors 2021-04-11 18:16:15 -04:00
arkon
5ff10799e4 Release 0.10.10 2021-04-11 17:59:07 -04:00
arkon
a82e5f5452 Make library update/backup error log action clearer for non-technical users 2021-04-11 16:19:56 -04:00
arkon
e10cb0e632 Add locales: jv, lt, ne 2021-04-11 16:03:03 -04:00
arkon
c7e07a6df0 Update DoH translations 2021-04-11 16:02:02 -04:00
Jozef Hollý
2e0c778090
Weblate translations (#4647) 
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: Arlangue <virgilemp@outlook.fr>
Co-authored-by: August Wale <bleachlithium@gmail.com>
Co-authored-by: Ava <Sasu.ruotsalainen@live.fi>
Co-authored-by: C201 <derasetad@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Edgar Mejía <edgar13155@gmail.com>
Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat>
Co-authored-by: Eric <spice2wolf@gmail.com>
Co-authored-by: FateXBlood <zecrofelix@gmail.com>
Co-authored-by: Flamm <robindevaux25@gmail.com>
Co-authored-by: Hajba Károly <karoly.hajba98@gmail.com>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Huang Zhiyi <hzy980512@126.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Jakub Fabijan <animatorzPolski@gmail.com>
Co-authored-by: Kiroki Benjamin <heptahex999@gmail.com>
Co-authored-by: Kurocon <weblate@kurocon.nl>
Co-authored-by: LOKE__01 <luckylakshman378@gmail.com>
Co-authored-by: Luis Andrés Bajaña F <labfernandez2014@gmail.com>
Co-authored-by: Lusuho <jevpsychox@gmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Matteo Gaeta <matteo.gaeta.1998@gmail.com>
Co-authored-by: Matyáš Caras <contact@hernikplays.cz>
Co-authored-by: Matyáš Caras <hernik27@gmail.com>
Co-authored-by: Michalis <michalisntovas@yahoo.gr>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Nikola Perović <nikolaperovicccc@gmail.com>
Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>
Co-authored-by: P6N7L <nichitapospai@gmail.com>
Co-authored-by: Paulo Pinho <kebrus@gmail.com>
Co-authored-by: Pijus Bend <pijus.bend@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Q farfayoux <aym.belrhiti@gmail.com>
Co-authored-by: Riztard Lanthorn <riyanluqman@gmail.com>
Co-authored-by: Rostyslav <info@ubilling.net.ua>
Co-authored-by: Schrödinger's cat <schrodingers-kate@protonmail.com>
Co-authored-by: Shashank Pujari <shashankppujari@gmail.com>
Co-authored-by: Shjosan <shjosan@kakmix.co>
Co-authored-by: Tantia <ilovechocobi@yahoo.com>
Co-authored-by: TheLastMelody <swordofthefallen@hotmail.com>
Co-authored-by: Tooster <max@polarczyk.pl>
Co-authored-by: Yardi van Nimwegen <yardivn@live.nl>
Co-authored-by: antocs <roxasthethund@yahoo.it>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Co-authored-by: 殺Mustafa <mustafasheref8@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ar/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ca/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cs/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/cv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/de/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/el/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/eo/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/es_419/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fil/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/fr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hi/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/hu/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/id/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/it/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ja/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/jv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/kn/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/lt/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/lv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ms/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/my/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ne/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/nl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pl/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/pt_BR/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ro/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/ru/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sc/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/sv/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/tr/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/uk/
Translate-URL: https://hosted.weblate.org/projects/tachiyomi/strings/zh_Hans/
Translation: Tachiyomi/Tachiyomi 0.x

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Ajeje Brazorf <lmelonimamo@yahoo.it>
Co-authored-by: Alessandro Jean <alessandrojean@gmail.com>
Co-authored-by: Arlangue <virgilemp@outlook.fr>
Co-authored-by: August Wale <bleachlithium@gmail.com>
Co-authored-by: Ava <Sasu.ruotsalainen@live.fi>
Co-authored-by: C201 <derasetad@gmail.com>
Co-authored-by: DarKCroX <darkcrox.2020@outlook.com>
Co-authored-by: Edgar Mejía <edgar13155@gmail.com>
Co-authored-by: Eduard Ereza Martínez <eduard@ereza.cat>
Co-authored-by: Eric <spice2wolf@gmail.com>
Co-authored-by: FateXBlood <zecrofelix@gmail.com>
Co-authored-by: Flamm <robindevaux25@gmail.com>
Co-authored-by: Hajba Károly <karoly.hajba98@gmail.com>
Co-authored-by: Huang Zhiyi <hzy980512@126.com>
Co-authored-by: J. Lavoie <j.lavoie@net-c.ca>
Co-authored-by: Jakub Fabijan <animatorzPolski@gmail.com>
Co-authored-by: Kiroki Benjamin <heptahex999@gmail.com>
Co-authored-by: Kurocon <weblate@kurocon.nl>
Co-authored-by: LOKE__01 <luckylakshman378@gmail.com>
Co-authored-by: Luis Andrés Bajaña F <labfernandez2014@gmail.com>
Co-authored-by: Lusuho <jevpsychox@gmail.com>
Co-authored-by: Lyfja <yassinelaoud@gmail.com>
Co-authored-by: Marco Santos <enum.scima@gmail.com>
Co-authored-by: Matteo Gaeta <matteo.gaeta.1998@gmail.com>
Co-authored-by: Matyáš Caras <contact@hernikplays.cz>
Co-authored-by: Matyáš Caras <hernik27@gmail.com>
Co-authored-by: Michalis <michalisntovas@yahoo.gr>
Co-authored-by: Milo Ivir <mail@milotype.de>
Co-authored-by: Nikola Perović <nikolaperovicccc@gmail.com>
Co-authored-by: Oğuz Ersen <oguzersen@protonmail.com>
Co-authored-by: P6N7L <nichitapospai@gmail.com>
Co-authored-by: Paulo Pinho <kebrus@gmail.com>
Co-authored-by: Pijus Bend <pijus.bend@gmail.com>
Co-authored-by: Pitpe11 <giorgos2550@gmail.com>
Co-authored-by: Q farfayoux <aym.belrhiti@gmail.com>
Co-authored-by: Riztard Lanthorn <riyanluqman@gmail.com>
Co-authored-by: Rostyslav <info@ubilling.net.ua>
Co-authored-by: Schrödinger's cat <schrodingers-kate@protonmail.com>
Co-authored-by: Shashank Pujari <shashankppujari@gmail.com>
Co-authored-by: Shjosan <shjosan@kakmix.co>
Co-authored-by: Tantia <ilovechocobi@yahoo.com>
Co-authored-by: TheLastMelody <swordofthefallen@hotmail.com>
Co-authored-by: Tooster <max@polarczyk.pl>
Co-authored-by: Yardi van Nimwegen <yardivn@live.nl>
Co-authored-by: antocs <roxasthethund@yahoo.it>
Co-authored-by: Роман <Rozhenkov69@gmail.com>
Co-authored-by: 殺Mustafa <mustafasheref8@gmail.com>
 2021-04-11 15:56:32 -04:00
arkon
592050c668 Actually ignore the case... 2021-04-11 14:23:24 -04:00
arkon
02c9191525 Make source download folder name case-insensitive 
Fixes issues from things like "Mangasee" being renamed to "MangaSee"
 2021-04-11 14:03:23 -04:00
arkon
d421401626 Log "Invalid download location" issues to error log 2021-04-11 14:00:45 -04:00
arkon
b2d4e5ab84 Add Google DoH provider 2021-04-11 13:10:03 -04:00
Ivan Iskandar
84e023607c
BrowseSourceController: Fix navigation bar insets not properly applied (#4810) 2021-04-11 10:49:23 -04:00
Ken Swenson
f145fd0dec
Move deletion actions to the IO thread (#4808) 2021-04-11 10:49:13 -04:00
arkon
42a9f911d8 Update some dependencies; downgrade core-ktx 
Fixes ActionMode being underneath statusbar
 2021-04-10 22:29:52 -04:00
arkon
9567d55312 Revert manga title folder for saved pages (closes #4803) 
People also didn't like it making their galleries more complicate to navigate.
 2021-04-10 14:33:14 -04:00
Ivan Iskandar
f3660d88dd
Draw edge-to-edge (#4802) 2021-04-10 09:38:55 -04:00
arkon
63ce7371bb Update some internal dependencies 
They no longer rely on jcenter
 2021-04-09 22:44:59 -04:00
Riztard Lanthorn
01c3498dbf
Search in library include manga description (#4787) 
Co-Authored-By: jobobby04 <jobobby04@gmail.com>

Co-authored-by: jobobby04 <jobobby04@gmail.com>
 2021-04-08 17:56:33 -04:00
Taco
b3471234ad
Update NDK, more KTX usage (#4792) 
* Update NDK

* Utilize more KTX extensions
 2021-04-08 17:56:01 -04:00
arkon
b2d697131c Add clarification for category exclusion (closes #4777) 2021-04-06 23:29:46 -04:00
arkon
ef49fc91d8 Minor cleanup 2021-04-06 23:21:21 -04:00
arkon
6222b47a4f Flip crop borders and orientation toggles 2021-04-06 22:31:36 -04:00
arkon
7504621a24 Make reader spinner colors a bit more consistent 2021-04-06 22:29:39 -04:00
arkon
88e49a9b8b Align filter spinners (closes #2995) 2021-04-06 11:21:39 -04:00
arkon
5b23f29d06 Revert using fetch date for updates list 
Spamming the list post-migration is currently a more common usecase than sources without chapter dates. We'll need to figure out a better way of handling both scenarios.
 2021-04-04 18:11:11 -04:00
arkon
c1bdebee78 Fix global update category exclusion 2021-04-04 18:09:07 -04:00
Riztard Lanthorn
ddd4cc10ff
add sort by date fetched in library (#4773) 
* add sort by date fetched in library

* chapter fetch date to 8
 2021-04-04 17:18:28 -04:00
arkon
0ca62a4acc Allow excluding categories from auto-download 
Closes #1412

Supersedes #4121
 2021-04-04 17:15:06 -04:00
arkon
4f1275ac01 Allow excluding categories from library update 
Closes #3467, #4661, #1839

Supersedes #4474
 2021-04-04 16:48:39 -04:00
arkon
b2fee7035f Use Material Dialogs for auto-download categories preference 
To allow for negative selections in the future.
 2021-04-03 16:13:12 -04:00
arkon
e15d7cb548 Use Material Dialogs for global update categories preference 
To allow for negative selections in the future.
 2021-04-03 16:07:42 -04:00
arkon
3257cbe21f Fix label overflow for reader spinner preferences 2021-04-03 15:46:07 -04:00
arkon
1237af1ff3 Move BiometricUtil to correct package 2021-04-03 11:38:01 -04:00
arkon
68600b337e Allow weaker unlock methods (closes #4265) 2021-04-03 11:35:33 -04:00
arkon
dac2072eaa Use app name for page download folder and use manga title subfolders (closes #4684) 2021-04-03 10:40:35 -04:00
arkon
1b921f9845 Make extension load error logs less verbose 2021-04-03 10:27:40 -04:00
arkon
a3992d9fbe Minor cleanup 2021-04-03 10:12:31 -04:00
Tooster
efd2a0cb7b
Replace reading mode snackbar with toast (#4752) 2021-04-03 10:07:49 -04:00
Andreas
fba428257b
Remove weird cropping from icon when showing missing chapter warning (#4769) 2021-04-03 10:00:23 -04:00
arkon
ff36901007 Don't repeatedly vibrate/make sounds on download progress 2021-04-01 12:18:54 -04:00
arkon
940d8389b5 Add QuadStateCheckBox view 2021-03-31 23:03:42 -04:00
arkon
f7a6cbe5e2 Revert "Drop support for Android 5.x" 
This reverts commit 443024cebb. Guess I'll do this a bit later so scb can get another major update first.

April Fools or whatever.
 2021-03-31 22:20:59 -04:00
arkon
7aa379a857 Better handle webtoon SSIV crop border change 2021-03-31 22:20:17 -04:00
arkon
443024cebb Drop support for Android 5.x 
It's 5-6 years old, and only accounts for 2% of users in the Firebase analytics.
 2021-03-30 23:15:17 -04:00
arkon
1657f04d55 Add tooltips for previous/next chapter buttons 
Based on d0738f5b00
 2021-03-30 23:11:36 -04:00
arkon
407e798fdb Recreate webtoon SSIV when crop borders setting changes (fixes #4734) 2021-03-30 18:47:44 -04:00
arkon
4054f2a6a0 Add icon for crop border shortcut off state 2021-03-30 18:27:09 -04:00
arkon
468cdf603c Allow translating DNS over HTTPS (closes #4747) 2021-03-30 17:54:31 -04:00
arkon
988ec6a224 Fix nav overlay always showing on start (fixes #4736) 2021-03-29 16:54:32 -04:00
Andreas
bdbdf211e2
Remove insert page when dual page split get turned off (#4739) 2021-03-29 16:54:20 -04:00
arkon
0437703cbf Fix binding of intarray preferences (maybe fixes #4728) 2021-03-28 17:06:56 -04:00
arkon
71aa592111 Use regular crop icon 2021-03-28 17:06:07 -04:00
arkon
d501c02f8b Add crop borders shortcut 2021-03-28 16:25:53 -04:00
arkon
9daf0e78b8 Remove ALPHA from dual page split label 2021-03-28 16:15:11 -04:00
arkon
dfa07a5f35 Clean up SpinnerPreference a bit 2021-03-28 16:13:59 -04:00
arkon
437c995d12 Show nav overlay on invert tap change 
Based on db4eca90e9
 2021-03-28 16:13:34 -04:00
mutsumi
cc6ae9d1a8
Fix Some Bangumi Track Bug (#4726) 2021-03-28 11:36:29 -04:00
arkon
c58e4f4dee Prevent manga title from jumping (fixes #4709) 2021-03-28 11:20:19 -04:00
arkon
c87b0e77de Show number of manga per source in migrate menu (#4703) 2021-03-28 11:11:19 -04:00
arkon
355d5af8ae Dismiss action toolbar after download action in updates (closes #4729) 2021-03-28 10:59:35 -04:00
arkon
3d99a8ebdb Fix fullscreen not applying on opening reader (fixes #4723) 2021-03-28 10:48:41 -04:00
arkon
c4b975b777 Cleanup reader spinner layouts 2021-03-27 17:59:52 -04:00
Antoine Gaudreau Simard
2911fe7a1a
Add onPause\onResume persistence to searchView. Fixes issue #3627 (#4494) 
* Add onPause\onResume persistence to searchView. Fixes issue #3627

* New controller subclass with built-in SearchView support

* Implement new SearchableNucleusController in SourceController

* Add query to BasePresenter (for one field it is not worth create a subclass in my opinion), convert BrowseSourceController to inherit from SearchableNucleusController

* move to flows to fix an issue in GlobalSearch where it would trigger the search multiple times

* Continue conversion to SearchableNucleusController

* Convert LibraryController, convert to flows, Known ISSUE with empty string being posted after setting the query upon creation of UI

* Fix issues with the post being tide to the SearchView queue which is not processed until shown. Add COLLAPSING state capture which should wrap this up.

* refactoring & enforce @StringRes for queryHint
 2021-03-27 16:38:41 -04:00
arkon
14c114756d Clean up reader sheet spinner preferences 
Based on fe2543b9d5

Co-Authored-By: Jays2Kings
 2021-03-27 16:28:49 -04:00
arkon
e7a8107279 Reduce height of sheet when on color filter tab 2021-03-27 15:15:31 -04:00
arkon
bff73b1b40 Add tooltips to bottom reader menu items 2021-03-27 10:53:31 -04:00
arkon
c255f57d95 Reorganize reader sheet contents a bit 2021-03-27 10:53:19 -04:00
arkon
64c47bbaed Split general and reading mode sheet settings 2021-03-26 22:31:21 -04:00
arkon
e0b7698d40 Merge reader settings and color filter sheets 
Heavily influenced by fe2543b9d5 (diff-8f47d7b7b53769ac18c28fe9978140c6bef44709879567acab2c6ef3270cd3a8)
 2021-03-25 23:10:22 -04:00
arkon
a01792ac9a Maybe make opening file picker for choosing backup file more reliable 2021-03-25 13:56:39 -04:00
arkon
3ba078f64c Use more common MIME type for protobuf 2021-03-25 13:46:53 -04:00
arkon
a16240f123 Show unread entries first when sorting by unread (closes #4711) 
Based on b212f8233e
 2021-03-24 09:27:00 -04:00
Jays2Kings
2ba60e9114 Added Start/Finished Date Support to AniList 
Based on 1e3de8a67f

Co-Authored-By: Jays2Kings
 2021-03-22 22:38:14 -04:00
Ken Swenson
472ce5a5e4
Fix migration due to variable shadowing (#4689) 2021-03-21 19:47:17 -04:00
arkon
99ba84c810 Handle null Anilist start dates (fixes #4685) 2021-03-20 16:36:31 -04:00
arkon
78285bdf37 Minor code cleanup 2021-03-20 15:58:54 -04:00
Andreas
5a7f2684b3
Add navigation layout overlay (#4683) 
* Add navigation layout overlay

* Minor clean up 

Destroy animator when done not on start
Move and change pref title 
Add summary
 2021-03-20 15:36:01 -04:00
arkon
d912a42249 Fix chapters list getting updated from wrong thread (fixes #4505) 2021-03-20 15:35:02 -04:00
arkon
6d8c4fb8b1 Fix Bangumi search null image errors 2021-03-20 10:22:11 -04:00
arkon
a63cecbfcb Make tapping available extension row prompt install 2021-03-20 10:10:58 -04:00
arkon
4a5bceb4e4 Fix offline restore ignoring manga from not installed sources (fixes #4679) 2021-03-20 10:03:13 -04:00
Ken Swenson
b6e6f490e9
Implement migration for source search (#4657) 2021-03-19 23:40:09 -04:00
scb261
2145e878a4
Limit query for recent chapters to 500 (#4678) 2021-03-19 23:39:36 -04:00
arkon
609d8c9685 Add icons for reading mode toggle 2021-03-14 17:13:20 -04:00
arkon
2f08515455 Less janky enum iteration 2021-03-14 17:03:43 -04:00
scb261
7f450e185d
Use fetch date instead of upload date when querying recent chapters (#4645) 2021-03-14 16:38:21 -04:00
arkon
747879b4ec Remove __cfduid cookie check 
As per email:

Cloudflare is deprecating the __cfduid cookie and the cf-request-id headers. The __cfduid cookie will be removed on 10 May 2021 and the cf-request-id headers will be removed on 1 July. We expect that most customers will not have to take action as a result of this removal. [...] Starting on 10 May 2021, we will stop adding a “Set-Cookie” header on all HTTP responses. The last __cfduid cookies will expire 30 days after that.
 2021-03-14 16:24:14 -04:00
Riztard Lanthorn
4193870fa6
Library update freq: add 4 & 8 hours (#4557) 2021-03-14 16:22:10 -04:00
arkon
cdc5de3f1b Flip order of previous chapter reader transition text (closes #4608) 2021-03-14 16:18:52 -04:00
arkon
bc34d4fa88 Round snackbar corners 2021-03-14 16:15:25 -04:00
arkon
6fd4af8736 Adjust reader navigation button ripples 2021-03-14 16:13:18 -04:00
arkon
b5c2934270 Refactor LibraryUpdateService a bit for future changes 2021-03-14 16:08:00 -04:00
arkon
94f5117941 Remove online protobuf backup restore option 2021-03-13 18:45:22 -05:00
arkon
112e233498 Use Material dialogs for preferences 
Partially addresses #2907
 2021-03-13 18:00:24 -05:00
arkon
18b1326f3a Tweak dialog corner radius 2021-03-13 17:18:22 -05:00
arkon
1e58b05ead Add reading mode toggle 2021-03-13 16:47:16 -05:00
arkon
938919bd9b Move reader setting related classes 2021-03-13 16:24:44 -05:00