mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-12-18 22:20:30 +00:00
Code Issues Releases Wiki Activity
3,671 Commits 4 Branches 24 Tags 103 MiB
791bc9621a
Commit Graph

916 Commits

Author SHA1 Message Date
Bharat KNV
9efd644360 Change dark theme from black to dark gray and add a black theme 2022-03-06 15:56:54 +05:30
Ozzie Isaacs
4a0dde0371 Merge remote-tracking branch 'cover_images/thumbnails' into cover_thumbnail 
# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/helper.py
#	cps/tasks/upload.py
#	cps/updater.py
#	cps/web.py
 2022-02-08 19:55:20 +01:00
mmonkey
032fced9c7 Merge branch 'develop' into thumbnails 2022-01-28 23:15:50 -06:00
Ozzie Isaacs
4f3c396450 Merge remote-tracking branch 'lubimyczytac/add_lubimyczytac.pl_meta_provider' into Develop 
# Conflicts:
#	optional-requirements.txt
 2022-01-27 18:37:02 +01:00
mmonkey
50bb74d748 Add CSRF support for schedule task settings, fixed details page not loading 2022-01-27 00:35:45 -06:00
mmonkey
3416323767 Removed title tags from cover images 2022-01-26 23:56:10 -06:00
mmonkey
18ce310b30 Merge branch Develop into thumbnails 2022-01-26 23:51:50 -06:00
Ozzie Isaacs
6339d25af0 Bugfixes from testrun 2022-01-26 18:38:39 +01:00
Ozzie Isaacs
d9d6fb33ba Merge branch 'master' into Develop 
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
 2022-01-25 19:33:21 +01:00
Ozzie Isaacs
17b4643b7c fix #2285 (Fix for shelf handling in caliblur theme) 2022-01-25 19:31:52 +01:00
Ozzie Isaacs
3b216bfa07 Kobo sync token is now also created if accessed from localhost(fixes #1990) 
Create kobo sync token button is now "unclicked" after closing dialog
Additional localhost route is catched
If book format is deleted this also deletes the book synced to kobo status
 2022-01-24 18:47:34 +01:00
Ozzieisaacs
e8e2f789e5 Fix #2287 (books can't be added to shelf from search) 2022-01-24 12:37:15 +01:00
Ozzie Isaacs
127bf98aac Merge branch 'master' into Develop 
# Conflicts:
#	cps/templates/detail.html
#	test/Calibre-Web TestSummary_Linux.html
 2022-01-23 17:51:54 +01:00
Ozzie Isaacs
d759df0df6 Kobo sync token is now also created if accessed from localhost(fixes #1990) 
Create kobo sync token button is now "unclicked" after closing dialog
Additional localhost route is catched
If book format is deleted this also deletes the book synced to kobo status
 2022-01-22 18:23:43 +01:00
Ozzie Isaacs
6bf0753978 Prevent wrong use of safe statement 2022-01-18 17:39:54 +01:00
Ozzie Isaacs
a02f621f08 Added id for testability 2022-01-17 18:38:37 +01:00
Ozzie Isaacs
96b1e8960b Bugfix send to kindle with multiple formats 2022-01-09 12:55:38 +01:00
Ozzie Isaacs
e3dbf7a88d Bugfixes load metadata 
Improvements for testing load metadata
 2022-01-07 12:40:03 +01:00
Ozzieisaacs
bbadfa2251 bugfixes load metadata 2022-01-04 21:11:52 +01:00
Ozzieisaacs
ae1f515446 Bugfix uncheck all ekements in books list and user list 
Improved testability for books list
 2021-12-30 14:45:31 +01:00
Ozzieisaacs
0548fbb685 Bugfix post commands without updater 2021-12-30 14:45:31 +01:00
Ozzieisaacs
f39dc100b4 Migrated some routes to POST 
- shelf massadd
- resetpassword
- delete shelf
- send to kindle
 2021-12-30 14:45:31 +01:00
Ozzieisaacs
785726deee Migrated some routes to POST 
- delete shelf, import ldap users
- delete_kobo token, kobo force full sync
- shutdown, reconnect, shutdown
 2021-12-30 14:45:30 +01:00
Ozzie Isaacs
2e815147fb Merge branch 'master' into Develop 
# Conflicts:
#	cps/kobo_sync_status.py
#	test/Calibre-Web TestSummary_Linux.html
 2021-12-19 10:29:56 +01:00
Bharat KNV
0693cb1ddb Added basic theming to the epub reader 2021-12-15 21:35:10 +05:30
Ozzie Isaacs
f0399d04b7 Merge remote-tracking branch 'bookmark_csrf/master' 2021-12-14 17:59:32 +01:00
Ozzie Isaacs
9d9acb058d Add button to force full kobo sync 2021-12-06 21:02:06 +01:00
Ozzie Isaacs
f78d2245aa Fixes from testrun 2021-12-05 18:48:21 +01:00
Ozzie Isaacs
d217676350 Upated testresult 
Bugfix book table
 2021-12-05 13:09:41 +01:00
Ozzie Isaacs
cd5711e651 Merge branch 'master' into Develop 
# Conflicts:
#	cps/web.py
 2021-12-04 20:56:04 +01:00
Ozzie Isaacs
5ed3b1cf53 On master: Order of language count in /language (fixes #2200) 2021-12-01 21:38:43 +01:00
Jonathan Fenske
66874f8163
Update read.html 
include the CSR token input
 2021-11-30 22:25:45 -06:00
Ozzie Isaacs
7f9da94a18 Tie visibility of upload buttons to upload right only 2021-11-27 17:43:51 +01:00
Ozzieisaacs
1e9d88fa98 Merge branch 'master' into Develop 2021-11-21 10:22:44 +01:00
Ozzieisaacs
6cb713d62c Added filtering of languages 
Bugfix show all allowed languages in user settings in case restrictions currently apply
 2021-11-21 10:21:45 +01:00
Ozzieisaacs
6deb527769 Merge branch 'master' into Develop 2021-11-21 09:14:36 +01:00
Ozzie Isaacs
6aad9378b8 Fix visiblility upload right on enabled upload feature 2021-11-20 12:44:34 +01:00
Ozzieisaacs
4fd4cf4355 Merge branch 'master' into Develop 
# Conflicts:
#	cps/static/css/style.css
#	cps/web.py
 2021-11-13 17:41:16 +04:00
Ozzieisaacs
c1f4ca36b6 Current sorting order visible in all sidebar selectors, and search results 
Sorting "hot" books only ascending and descending according to download numbers
Downloaded books sorting according to authors name working
 2021-11-04 20:51:48 +04:00
Ozzieisaacs
58379159fb Fix shown cover in series grid view (#979) 2021-11-04 17:32:31 +04:00
Ozzieisaacs
42cc13d1e2 Mark which functions are selected on list pages 2021-11-03 21:07:16 +04:00
Ozzieisaacs
ecc5cb167e Upload setting in user template only visible if upload enabled 
Delete book setting only visible if edit book setting is ticked
 2021-11-03 20:32:17 +04:00
Ozzieisaacs
d72210c6ae Exclude upload rights visibility if upload is not activated 2021-11-03 19:05:24 +04:00
Ozzieisaacs
2b6f5b1565 Fix csrf check in list pages 2021-11-02 21:32:29 +04:00
Ozzieisaacs
95371d0d7f Fix shelf grid ordering for inverted order at page load 
Ordering buttons now visible on medium size screens
 2021-11-02 20:27:50 +04:00
Ozzieisaacs
c7df8a1a34 Fix missing csrf token in series grid view 2021-11-02 18:57:28 +04:00
Ozzieisaacs
a5415e00d5 Fix grid to list in series view 
Fix sort asc, desc in author and series list
 2021-11-01 13:11:49 +01:00
Ozzie Isaacs
a8317d900b Bugfix for edit custom ratings in list edit mode 
Bugfix for deleting custom enum in list edit mode
 2021-10-30 15:50:17 +02:00
Ozzie Isaacs
bbb65ec804 Merge remote-tracking branch 'trustedhost/master' 2021-10-30 09:40:04 +02:00
Ozzie Isaacs
f6a2b8a9ef Read and archive bit visible in book table 2021-10-24 21:32:19 +02:00
Bernat
9f260128cf
Prevent virtual keyboard login auto capitalization 
Stops virtual keyboards, such as the ones on mobile devices, to default to uppercase for the first letter of the login user input field.
 2021-10-24 20:14:47 +02:00
Ozzie Isaacs
bb20979c71 Merge branch 'master' into Develop 2021-10-24 09:49:42 +02:00
Ozzie Isaacs
917909cfdb Refactored books detail page 2021-10-24 09:48:29 +02:00
cbartondock
c6bf62a6eb The recent changes to content security policy broke custom theming. I fixed it by adding a trusted hosts field to Server Configuration 2021-10-22 15:35:10 -04:00
Ozzie Isaacs
fe4db16a7e html editor in books list 2021-10-21 20:13:04 +02:00
Ozzie Isaacs
708861bcd5 Enabed edit of custom texts (including categories) in books list 2021-10-17 14:29:13 +02:00
Ozzie Isaacs
24a2c0a5cf Enable edit of custom text in book table 2021-10-17 14:11:52 +02:00
Ozzie Isaacs
1e1d3a7c81 Enable edit of enum column in books list 2021-10-17 14:05:18 +02:00
Ozzie Isaacs
666015e867 Fix datepicker localized month names 
Removed redundant parenthesis in kobo.py response
 2021-10-16 20:53:44 +02:00
Ozzie Isaacs
9d5e9b28ae Enabled editing of "number" custom_columns in books list 2021-10-16 20:46:16 +02:00
Ozzie Isaacs
fe21d15194 Merge remote-tracking branch 'cn/fix/bootstrap-table-locale' 
# Conflicts:
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt_BR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh_Hans_CN.min.js
 2021-10-16 11:48:00 +02:00
Ozzie Isaacs
56a9c62421 Merge remote-tracking branch 'cn/chinese/master' 
# Conflicts:
#	cps/templates/search_form.html
 2021-10-16 11:41:09 +02:00
Ozzie Isaacs
50d703e2d8 Chunked reading status on kobo sync 
Bugfix loading text on shelf delete
Bugfix sort books list according to selection without selection
 2021-10-16 11:28:35 +02:00
Ozzie Isaacs
bad4c01474 Fix stored css bug in all typeahead functions (update typeahead -> bugfix typeahead) 2021-10-10 18:02:18 +02:00
Ozzie Isaacs
25f608d109 Bugfixes from testrun (load images from gdrive) 
Fix locale for new users
 2021-10-09 09:37:10 +02:00
Ozzie Isaacs
aca5324914 Bugfix arrange shelf 
Bugfix remote login
Bugfix perform Update
 2021-10-06 22:06:33 +02:00
Ozzie Isaacs
d8f9e2feb2 Bugfixes for user import with default locale and default language 
Bugfixes from testrun
 2021-10-06 18:41:01 +02:00
Ozzie Isaacs
50919d4721 Added handling for missing flask-wtf dependency 
Added CSRF protection (via flask-wtf)
Moved upload function to js file
Fixed error page in case of csrf failure
 2021-10-04 19:23:20 +02:00
Ozzie Isaacs
1c15e10ac0 Improved csrf protection for remote login 2021-10-03 09:58:45 +02:00
Ozzie Isaacs
52be2ad4a2 Improved DJVU Reader 2021-10-03 09:32:29 +02:00
Ozzie Isaacs
43fdef5e53 Improved textreader 2021-10-03 09:31:24 +02:00
Ozzie Isaacs
b82d03c12c Removed js from search_form, tasks 
Added translation of bootstrap-select in user table
 2021-10-03 08:01:58 +02:00
Ozzie Isaacs
e064a3ec2b Removed unnecessary spaces in book convert texts 2021-10-02 07:53:36 +02:00
xlivevil
deb91996a8
fix:bootstrap-table locale 
Add data-locale in table tag
Add bootstrap-table-locale-all-min-js
Remove bootstrap-table locale dir
 2021-09-30 20:09:02 +08:00
mmonkey
cd3791f5f4 Always use full-sized image for book edit and details pages 2021-09-30 01:43:31 -05:00
Ozzie Isaacs
cd1fe6dde0 Fix #2085 (Misaligned shelf names after glyphicon) 2021-09-29 19:26:21 +02:00
mmonkey
9e7f69e38a Updated series cache timeout to one day 2021-09-29 03:01:28 -05:00
mmonkey
46205a1f83 Made long running tasks cancellable. Added cancel button to cancellable tasks in the task list. Added APP_MODE env variable for determining if the app is running in development, test, or production. 2021-09-29 02:40:12 -05:00
mmonkey
26071d4e7a Added Scheduled Tasks Settings 2021-09-26 02:02:48 -05:00
xlivevil
1b8410e786
Update Simplified Chinese translation 2021-09-25 23:15:44 +08:00
xlivevil
fed9eff7b8
Fix the publishstart option in advsearch 2021-09-25 22:10:46 +08:00
Ozzie Isaacs
c1ac68e2ae Fix #2053 (Hovering on cover, now shows tooltip also in Caliblur! Theme) 2021-09-25 14:01:17 +02:00
mmonkey
0bd544704d Added series cover thumbnail generation. Better cache file handling. 2021-09-25 03:04:38 -05:00
mmonkey
be28a91315 Simplified all of the thumbnail generation and loading. 2021-09-24 03:11:14 -05:00
mmonkey
d648785471 Review feedback fixes 2021-09-17 01:42:56 -05:00
mmonkey
9a08bcd2bc Started addressing some PR comments 2021-09-16 23:20:11 -05:00
mmonkey
04a5db5c1d Resolve merge conflicts 2021-09-16 22:58:54 -05:00
Ozzie Isaacs
e3db2796c9 Merge branch 'master' into Develop 
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
 2021-08-30 20:18:21 +02:00
Ozzie Isaacs
86ef1d47e8 Bugfixes from testrun 2021-08-30 08:02:21 +02:00
Ozzie Isaacs
1d79d9ded2 Bugfix from tests (displaying of book languages in user list) 2021-08-29 11:31:10 +02:00
Ozzie Isaacs
1fa267ce1b Final fix for escaping html special chars in tables 2021-08-28 15:47:57 +02:00
Ozzie Isaacs
3946ef8f0d Merge branch 'master' into Develop 
# Conflicts:
#	cps.py
#	cps/web.py
 2021-08-27 16:16:24 +02:00
Ozzie Isaacs
91e6d94c83 Improved displaying of username and task title in tasks 2021-08-27 14:27:35 +02:00
Ozzie Isaacs
32e27712f0 Added lxml to needed requirements 
Improved displaying of series title, book of series, comments and custom comments
 2021-08-27 09:43:32 +02:00
Ozzie Isaacs
aa9fdd2ada Merge branch 'master' into Develop 2021-08-18 20:32:33 +02:00
Ozzie Isaacs
275e073c42 Fix #2085 (Missing spaces between glyphicon and text on sidebar) 2021-08-10 20:17:30 +02:00
xlivevil
bce69b2dfc Add pdf.js font file 2021-08-07 20:51:10 +08:00
xlivevil
fb97e39d9f Merge branch 'master' of https://github.com/xlivevil/calibre-web 2021-08-05 21:39:04 +08:00
xlivevil
913690df78 Fix #1913(set lazyload in pdf reader) 
Add favicon.ico in pdf reader
 2021-08-05 21:37:39 +08:00
Ozzie Isaacs
e68a3f18fa Merge branch 'master' into Develop 2021-08-01 20:23:19 +02:00