Commit Graph
2123 Commits
Author SHA1 Message Date
Ozzieisaacs 87d60308f2 Merge remote-tracking branch 'caliblur/issue/caliblur-981' into master 2020-11-08 19:29:10 +01:00
Ozzieisaacs 58d485cbb5 Fix #1702 (invalid timestamps during kobo sync caused by malformed database) 2020-11-07 12:49:39 +01:00
Ozzieisaacs e99dd3310c Exchanged douban apikey 2020-11-07 12:18:33 +01:00
Ozzieisaacs 400f6e02a5 Fix #1668 (upload of books with language set to different than UI language and not showing all books)
Fix for only showing external port if kobo is really activated in admin menu
2020-11-07 11:44:02 +01:00
jvoisin 700b0609df Don't recompute metadata for epubs 2020-11-06 21:36:49 +01:00
cbartondock bc52f90ed4 Merge remote-tracking branch 'upstream/master' 2020-11-02 11:36:45 -05:00
Ozzieisaacs 0771546dad Log exception on user import 2020-11-01 18:25:38 +01:00
jvoisin 95a1a71a66 Minor refactor of comic.py 2020-10-31 22:28:24 +01:00
Ozzieisaacs 25da6aeeca Merge remote-tracking branch 'sec_fixes/space' into master 2020-10-31 20:04:42 +01:00
Ozzieisaacs 00b422807b Merge remote-tracking branch 'sec_fixes/edit_auth' into master 2020-10-31 20:04:12 +01:00
Ozzieisaacs 130701a7bb Merge remote-tracking branch 'sec_fixes/admin_update' into master 2020-10-31 20:02:42 +01:00
Ozzieisaacs ff88e68904 Add missing locale files 2020-10-31 19:58:22 +01:00
Ozzieisaacs 55fcf23d2b Merge remote-tracking branch 'sec_fixes/negate' into master 2020-10-31 19:37:47 +01:00
Ozzieisaacs 1b0b4c4cc5 Merge remote-tracking branch 'sec_fixes/ldap' into master 2020-10-31 19:29:17 +01:00
Ozzieisaacs cd57731593 Merge remote-tracking branch 'sec_fixes/unused_imports' into master 2020-10-31 19:24:46 +01:00
Ozzieisaacs 37a80b935d Added greek translation 2020-10-31 19:20:00 +01:00
Ozzieisaacs 4d61aec153 Merge remote-tracking branch 'zh/trans' into master 2020-10-31 19:07:10 +01:00
Ozzieisaacs 1adf25d50b Update Italian translation 2020-10-31 19:06:09 +01:00
Julian Naydichev ae33aee3f6 When serving a download URL via KoboSync, use a URL that is specific to Kobo 2020-10-31 14:50:08 +01:00
jvoisin 2c99e71626 Remove a superfluous space 2020-10-29 18:17:32 +01:00
jvoisin e7f7775efa Require edit permissions to edit books, even via ajax 2020-10-29 14:52:20 +01:00
jvoisin 8b60a19577 Don't leak to non-admin users the current installed version 2020-10-29 14:03:18 +01:00
Ozzieisaacs 5701e08db9 Fix for #1668 2020-10-28 20:37:52 +01:00
jvoisin d2617322c6 Negate a condition
- removes two levels of indentation
- makes it clear that if the wrong tokens are provided nothing will happen
- remove a useless nested function
2020-10-27 19:41:05 +01:00
jvoisin fa82745f64 Put import_ldap_users behind a login 2020-10-27 19:26:04 +01:00
jvoisin 19b2a334e4 Remove unused imports 2020-10-27 11:06:43 +01:00
vagra 627c2adf08 SImple Chinese translation updated. 2020-10-26 22:56:58 +08:00
ElQuimm e3e137ca50 updated italian message.po 2020-10-22 16:31:25 +02:00
cbartondock 0978be580f Merge remote-tracking branch 'upstream/master' 2020-10-21 13:01:25 -04:00
Ozzieisaacs 5792838333 Add OSError to catched Gevent Error 2020-10-20 17:38:37 +02:00
Ozzieisaacs f9995583a5 Merge remote-tracking branch 'translate/patch-1' into master 2020-10-20 17:12:25 +02:00
KN4CK3R 4cc68bd139 Fixed typo. 2020-10-20 13:45:01 +02:00
cbartondock d2510ad1bc Merge remote-tracking branch 'upstream/master' 2020-10-17 21:46:26 -04:00
Ozzieisaacs bc0416cbb4 Fix for #1660 (advanced search for custom columns working, headline for advanced search working) 2020-10-16 20:24:15 +02:00
Ozzieisaacs 2814617e4b Fix for #1660 (Pagination in advanced search not working, error 500 for no filter in advanced search)
Fix #1666 (Pagination in search not working)
2020-10-16 19:56:24 +02:00
cbartondock da9dfd166d fixed incorrect cover widths 2020-10-16 13:51:48 -04:00
cbartondock 1be07a42df Flex display to fix columns issue 2020-10-16 13:41:48 -04:00
cbartondock 1d83a6a898 distinguish convert from and convert to extensions 2020-10-16 11:51:59 -04:00
Ghighi 2ff286b672 natural solution, pagination is changing on new page 2020-10-16 00:43:57 +03:00
Ozzie Isaacs e8620a0986 Fix logging error on windows with invalid goodreads key/secret 2020-10-14 20:48:01 +02:00
Ozzieisaacs 5b67b687d3 Removed remaining code from view downloaded books in user section
Fixes for #1661
2020-10-13 19:45:27 +02:00
Ghighi Eftimie 9adcfa99f4 trigger infinite scroll script only on templates where .load-more class is present 2020-10-11 22:35:56 +03:00
Ghighi Eftimie e723aaa5f6 fix for history state (+1 not needed) 2020-10-11 21:56:49 +03:00
Ozzie Isaacs d128b037a5 Fix for editing files on windows 2020-10-11 18:01:26 +02:00
Ghighi Eftimie f574f8faf0 better js check 2020-10-10 18:34:55 +03:00
Ghighi Eftimie cedfa90d76 fix for #981 2020-10-10 17:51:46 +03:00
Ghighi Eftimie f1e6f6e505 fixes for #1560 2020-10-10 14:58:06 +03:00
Ozzieisaacs e16c0caebb Fix opds search 2020-10-10 12:53:10 +02:00
Ozzieisaacs 52489a484a Merge remote-tracking branch 'Knepherbird/master' into master
# Conflicts:
#	cps/jinjia.py
#	cps/templates/detail.html
#	cps/templates/discover.html
#	cps/templates/index.html
#	cps/web.py
2020-10-10 12:47:49 +02:00
Ozzieisaacs e1d5c2c578 Merge remote-tracking branch 'caliblur/issue/caliblur-1594' into master 2020-10-10 12:29:30 +02:00