Ozzie Isaacs
3c98cd1b9a
Merge branch 'master' into cover_thumbnail
...
# Conflicts:
# test/Calibre-Web TestSummary_Linux.html
2022-04-20 07:25:37 +02:00
Ozzieisaacs
130af069aa
Merge remote-tracking branch 'douban/metadata_provider/douban'
...
# Conflicts:
# cps/metadata_provider/amazon.py
# cps/metadata_provider/lubimyczytac.py
2022-04-17 10:33:52 +02:00
Ozzie Isaacs
fe5d684d2c
Merge branch 'master' into cover_thumbnail
2022-04-13 18:37:44 +02:00
Ozzie Isaacs
028e6855a7
Pagination button disapears in standard theme once infinite scroll is triggered
2022-04-12 18:45:06 +02:00
Ozzie Isaacs
d9a83e0638
Merge branch 'master' into cover_thumbnail
...
# Conflicts:
# cps/editbooks.py
# cps/helper.py
# cps/web.py
# test/Calibre-Web TestSummary_Linux.html
2022-03-14 19:41:47 +01:00
Ozzie Isaacs
3b5e5f9b90
Undo check of read checkbox in case of error
...
Display error message in details modal dialog
Bugfix set archive bit in booktable
Translate error message readstatus change
2022-03-12 22:16:33 +01:00
Ozzie Isaacs
34478079d8
Prevent local variable 'from_book' referenced before assignment during merge of books
...
Merge books source book: Each book in own row
Merge books, sources are deleted before dialog shows up again
2022-03-09 14:45:51 +01:00
Bharat KNV
9efd644360
Change dark theme from black to dark gray and add a black theme
2022-03-06 15:56:54 +05:30
xlivevil
97cf20764b
Add exception handling and logger in metadata provider
2022-02-25 12:18:07 +08:00
xlivevil
695ce83681
Fix Uncaught RangeError
2022-02-25 01:12:22 +08:00
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
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
18ce310b30
Merge branch Develop into thumbnails
2022-01-26 23:51:50 -06: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
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
bbef41290f
Fix delete book format wasn't working
2022-01-22 14:01:32 +01:00
Ozzie Isaacs
de1bc3f9af
Fix #2265 (add book to shelf on popup for book details)
...
Updated testresults
2022-01-17 17:46:57 +01:00
collerek
20b5a9a2c0
Merge branch 'master' into add_lubimyczytac.pl_meta_provider
2022-01-13 10:49:51 +01:00
Ozzie Isaacs
e3dbf7a88d
Bugfixes load metadata
...
Improvements for testing load metadata
2022-01-07 12:40:03 +01:00
Ozzie Isaacs
405f3c181f
Added korean locale
2022-01-06 14:04:49 +01:00
Ozzie Isaacs
6d839d5cc7
Bugfixes from testrun
2022-01-04 21:12:59 +01:00
Ozzieisaacs
7b8b2f93a0
Merge remote-tracking branch 'scholary/master'
2021-12-30 14:55:39 +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
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
cbartondock
4edd1914b4
Fixed google scholar issues
2021-12-23 23:16:41 -05: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
9b57fa25de
Merge remote-tracking branch 'zh/master'
2021-12-14 17:52:12 +01:00
Laurin Neff
4db9691cfc
Remove white border in full-screen cover preview
2021-12-13 19:36:21 +01:00
collerek
920acaca99
everything working to refactor
2021-12-11 01:06:04 +01:00
xlivevil
a184f4e71a
Merge branch 'master' into master
2021-12-08 22:58:30 +08:00
Ozzie Isaacs
9d9acb058d
Add button to force full kobo sync
2021-12-06 21:02:06 +01:00
Ozzie Isaacs
fd5ab0ef53
Bugfix handle archive bit
2021-12-05 18:01:56 +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
bd01e840ca
Delete books in shelfs, downloaded books, kobo sync status, etc on database change ( fixes #620 )
2021-12-04 11:50:25 +01:00
GarcaMan
e2eab808c0
Merge branch 'long_strip_cbrreader' of github.com:GarckaMan/calibre-web into long_strip_cbrreader
2021-12-02 18:20:27 +00:00
GarcaMan
3ac08a8c0d
After toggling fullscreen, focus on main container
2021-12-02 18:20:14 +00:00
Jonathan Fenske
3f91313303
Update epub.js
...
send the CSRF token when adding bookmarks
2021-11-30 22:24:34 -06:00
xlivevil
67e3721530
fix(tinymce Simplified Chinese locale):rename zh_CN to zh_Hans_CN
2021-12-01 11:28:03 +08:00
Denis Rodríguez
3f56f0dca7
Removed parameter that was wrongly added
2021-11-25 01:30:20 -03:00
GarcaMan
7fc04b353b
Selecting Position will not scroll the current image up
2021-11-24 20:22:10 +00:00
GarcaMan
a8689ae26b
first commit
2021-11-24 19:41:07 +00:00
Ozzieisaacs
6deb527769
Merge branch 'master' into Develop
2021-11-21 09:14:36 +01:00
Ozzie Isaacs
7ad419dc8c
Fix upload of cover and book formats containing html characters
2021-11-20 13:40:23 +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
42cc13d1e2
Mark which functions are selected on list pages
2021-11-03 21:07:16 +04:00
Ozzieisaacs
1e0ff0f9c2
Fix #2045 ("fetch metadata" update appends to the existing tags instead or replacing them)
2021-11-03 18:16:15 +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
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
b3b85bf692
Fix position read mark in standard theme
2021-10-31 16:33:35 +01:00
Ozzie Isaacs
a36c6da3ae
Fix position read mark in standard theme
2021-10-31 16:30:51 +01:00
Ozzie Isaacs
9e72c3b40d
Fix position read mark in standard theme
2021-10-31 16:18:27 +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
3cfffa1487
Fix for iOS covers are not displayed during infinite scroll on standard theme
2021-10-25 20:06:22 +02:00
Ozzie Isaacs
382cd9458f
Fix for #2126 (iOS covers are not displayed during infinite scroll on standard theme)
2021-10-25 20:03:48 +02:00
Ozzie Isaacs
be7ac7e163
Update infinite scrolling javascript
2021-10-25 19:17:10 +02:00
Ozzie Isaacs
3a1a32f053
Update infinite scrolling javascript
2021-10-25 19:16:52 +02:00
Ozzie Isaacs
f6a2b8a9ef
Read and archive bit visible in book table
2021-10-24 21:32:19 +02:00
Ozzie Isaacs
cdd38350fe
Updated tinymce editor, enabled raw html edit
2021-10-24 17:14:50 +02:00
Ozzie Isaacs
516e76de4f
Updated tinymce editor, enabled raw html edit
2021-10-24 17:13:57 +02:00
Ozzie Isaacs
fe4db16a7e
html editor in books list
2021-10-21 20:13:04 +02:00
Ozzie Isaacs
7671a1d5c8
Fix errormessage after update
2021-10-17 15:36:19 +02:00
Ozzie Isaacs
00dc60da79
Added translation for traditional chinese
2021-10-17 15:02:16 +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
cea10d3945
Merge remote-tracking branch 'comic_sort/comic_reader_sort'
2021-10-16 11:50:46 +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
6e5d9d7657
Bugfix toggle readstatus in modal dialog
2021-10-15 19:26:20 +02:00
Ozzie Isaacs
e58eb8dac1
Show checkbox from boolean custom columns on details page with caliblur theme
2021-10-15 18:57:00 +02:00
Ozzie Isaacs
f3efef1f60
Fix stored css bug in all typeahead functions (update typeahead -> bugfix typeahead)
2021-10-11 19:56:54 +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
aca5324914
Bugfix arrange shelf
...
Bugfix remote login
Bugfix perform Update
2021-10-06 22:06:33 +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
ba40c6693e
Merge remote-tracking branch 'filepicker/fix-filemodal'
2021-10-02 08:32:44 +02:00
GarcaMan
f6561456f7
New sort for Comic Reader
2021-10-01 05:47:52 +00: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
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
Anatolii Fetisov
781ca7a3f3
Fix filemodal file selection dialog
2021-09-18 09:49:28 +03: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
ceffa3a108
Removed xss on shelf add/remove action
2021-08-30 17:06:11 +02:00
Ozzie Isaacs
c0a06eec46
Removed xss on shelf add/remove action
2021-08-30 17:05:53 +02:00
Ozzie Isaacs
d8bad7394a
Merge remote-tracking branch 'caliblur/master'
2021-08-29 13:31:46 +02:00
Ozzieisaacs
10e212fcde
Merge branch 'master' into Develop
2021-08-29 10:44:13 +02:00
Ozzie Isaacs
1fa267ce1b
Final fix for escaping html special chars in tables
2021-08-28 15:47:57 +02:00
Ozzie Isaacs
d4cfad6363
Fixed several text problems from tasks
...
Fixed task update
2021-08-28 11:32:13 +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
e615073893
Add all html special characters to the escaped characters in bootstrap table
2021-08-27 12:56:08 +02:00
Ozzie Isaacs
d25cfb7499
Fix for #2097 (Quotes are now handled properly in UI-editable tables)
2021-08-26 18:03:59 +02:00
Ozzie Isaacs
a35c635987
Update python metadata search
2021-08-18 21:38:20 +02:00
