mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-08 02:49:59 +00:00
Code Issues Releases Wiki Activity
2,671 Commits 3 Branches 23 Tags 101 MiB
0b7c679dba
Commit Graph

325 Commits

Author SHA1 Message Date
Wanoo
a0535aa3db Add ComicVine Api 
Fetching Metadata for comicBook with ComicVine API
 2020-02-28 16:04:07 +01:00
Ozzieisaacs
146068c936 Merge branch 'Develop' 
# Conflicts:
#	cps/db.py
#	cps/templates/user_edit.html
 2020-02-23 13:15:30 +01:00
Ozzieisaacs
3b8c5ef21a Merge remote-tracking branch 'get_metadata/patch-1' 
Fix #1210 Load multiple authors correct via get metadata
 2020-02-23 13:14:12 +01:00
Ozzieisaacs
7c89f0b5b9 Merge with branch develop 
Release version
 2020-02-23 09:08:01 +01:00
OzzieIsaacs
371097eb4d Update Updater 2020-02-23 07:54:58 +01:00
Johnny A. dos Santos
29cb8bfec4
Fix #1210 2020-02-21 18:25:02 -03:00
Michael Shavit
7d99e21d0d Merge remote-tracking branch 'original/Develop' into kobo_book_delete 2020-02-17 14:49:42 -05:00
Ozzieisaacs
814ad87a42 Updated pdf viewer to 2.2.228 (#1184) 2020-02-09 17:02:47 +01:00
Ozzieisaacs
3e4b5e23fa Updated pdf viewer to 2.2.228 (#1184) 2020-02-09 17:02:28 +01:00
Ozzieisaacs
50ba2e329a Merge branch 'master' into Develop 
# Conflicts:
#	cps/shelf.py
 2020-02-09 07:00:04 +01:00
Ozzieisaacs
b33a2ac90d Fix #1170 Auth-digest Header no longer crashs calibre-web 
Fix #1161 Shelfs are reordering again
Update Sortable.js to 2.10.1
Code cosmetics
 2020-02-02 07:47:27 +01:00
Michael Shavit
c0239a659c Add UI support for archived books. 
Archived books will no longer appear in any book lists or searches, and
may only be restored from the Archive view.
 2020-01-26 00:27:54 -05:00
Ozzieisaacs
3a4d351a57 Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop 2020-01-15 17:57:00 +01:00
Ozzieisaacs
973f555544 Merge branch 'master' into Develop 
(updated tinymce and bootstrap datepicker)
 2020-01-13 18:39:25 +01:00
Ozzieisaacs
1d7e52c198 Merge with develop: 
- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup
 2020-01-13 18:37:29 +01:00
Simon Latapie
56964a890b caliBlur theme: fix custom column display that contain colons 2020-01-12 14:26:07 +01:00
Ozzieisaacs
68ca0b86da Updated tiniymce + locale 
updated datepicker + locale
Included cs, fi language, updated ru language
 2020-01-12 14:11:53 +01:00
Ozzieisaacs
79a9ef4859 Make Kobo optional 
move jsonschema dependency to optional-requirements.txt
Added version of jsonschema to about section
Added additional column to RemoteAuthToken table
Update configuration of Kobo sync protocol
 2020-01-12 13:42:39 +01:00
Ozzieisaacs
661ed17d23 Handle stream output in logviewer 
Add migration of global matrue content settings to user based settings
Fix Caliblur Theme (Publisherslist)
Allow/deny list/edit/add/delete of tags and custom columns
Colored table background for tags restriction
 2020-01-07 20:26:59 +01:00
Ozzieisaacs
d9adb4fc94 Improvements for limit tags 2020-01-01 17:30:08 +01:00
Ozzieisaacs
513ac6cfb4 Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration) 
Fixes from tests
Fix response opds with read/unread
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages
 2020-01-01 17:29:01 +01:00
Ozzieisaacs
1da4efec86 Merge branch 'master' into Develop 2019-12-31 10:52:45 +01:00
Ozzieisaacs
5887f0fe6b Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration) 2019-12-29 13:54:52 +01:00
Ozzieisaacs
bbe91f439a Merge from master 2019-12-22 15:28:43 +01:00
Ozzieisaacs
b586a32843 Fix #1115 (comic reader not working under iOS, maybe invalid issue) 
Improvement for #925 (Next/Prev buttons are bigger)
 2019-12-22 15:24:22 +01:00
zhiyue
222797e631
support douban book search using apikey 2019-12-04 11:59:06 +08:00
Ozzieisaacs
0c40e40dc3 Fix logfile loading behind reverse proxy (#1047) 2019-09-27 08:15:10 +02:00
Dmitriy Istomin
a65ad9483c update Bootstrap v3.4.0 -> 3.4.1 2019-08-16 11:18:39 -04:00
Ozzieisaacs
c6542fdec6 New Oauth code 2019-07-20 20:01:05 +02:00
Ozzieisaacs
4708347c16 Merge branch 'Develop' 
# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
 2019-07-13 20:54:21 +02:00
Ozzieisaacs
f79d549910 Fix duplicate user and email (now case insensitive #948) 
Fix sorting in comics (#950)
Fix log error on Calibre converter error (#953)
Fix long running tasks (#954)
 2019-07-06 14:35:12 +02:00
Ozzieisaacs
cd546eb6d4 Update comic reader js 2019-06-17 19:48:17 +02:00
Ozzieisaacs
c81d4edb7d Fix for #923 2019-06-10 16:38:29 +02:00
Ozzieisaacs
26e45f1f57 Merge remote-tracking branch 'comic-reader/master' 2019-05-31 08:43:51 +02:00
Ozzieisaacs
ecedf92783 Update version 
Make custom columns visible (#904)
 2019-05-30 10:21:11 +02:00
subdiox
867aa2f0bd Beautify bitjs 2019-05-14 04:28:06 +09:00
subdiox
7982ed877c Downgrade bitjs to es5 branch 2019-05-13 14:53:25 +09:00
subdiox
c0d136ccd8 Fix slow loading 2019-05-10 08:16:03 +09:00
subdiox
c2bfb29726 Add reading direction settings to readcbr page 2019-04-21 18:20:15 +09:00
subdiox
204de4aef6 Fix an issue that fullscreen doens't work on some browsers 2019-04-21 18:02:02 +09:00
Ozzieisaacs
0b8624b542 Deleted load metadata from douban, as API seems to be shut down (#858) 2019-04-17 19:55:32 +02:00
Ozzieisaacs
436c2671d1 Fix delete domain entries 
Fix error handling smtp.authentication error
 2019-04-14 14:08:49 +02:00
Ozzieisaacs
dc933f3d66 Merge remote-tracking branch 'pdf.js/epubjs' 
Updated pdf.js
 2019-04-13 15:02:01 +02:00
Daniel Pavel
439ce19b5d Updated epub.js to v0.3.66 2019-03-28 07:23:45 +02:00
Ozzieisaacs
4b301a7961 Additional fix for #845 (in case of error) 2019-03-26 18:19:39 +01:00
Ozzieisaacs
8612dce97c Merge remote-tracking branch 'author/shorten-authors' 2019-03-09 20:14:16 +01:00
Ozzieisaacs
0b0e62fdf2 Merge remote-tracking branch 'dialog/master' 
Fix for #833
 2019-03-09 20:02:17 +01:00
Ozzieisaacs
6f80a63ca6 Fix for #827 2019-03-09 07:05:43 +01:00
Andrew Sullivan
3dfc2f2580 fixing issue #833 2019-03-08 20:44:45 -05:00
Ozzieisaacs
6f0b3bbda0 Fix for #812 2019-03-05 21:28:55 +01:00
Ozzieisaacs
466af21548 Code Cosmetics 2019-03-05 16:31:09 +01:00
Ozzieisaacs
361a1243d7 Improvements #828 2019-02-27 19:30:13 +01:00
Virgil Grigoras
bd7b0175a1 Fix remaining shown by codacy 2019-02-26 17:24:13 +01:00
Virgil Grigoras
f5cf62f209 Fix issues shown by codacy 2019-02-26 11:17:06 +01:00
Virgil Grigoras
d3ed0317bb styling and javascript for hiding authors 2019-02-25 19:25:08 +01:00
Ozzieisaacs
f6fbe2e135 Fix #766 
Update pdf upload
Translation of uploadprogress dialog
 2019-02-24 19:23:51 +01:00
Ozzieisaacs
17b7333992 Merge remote-tracking branch 'caliblur/master' 2019-02-20 20:00:08 +01:00
hexeth
9a0e8fefb7
re-add loader code 2019-02-19 13:56:49 -08:00
Matt
c07cb23ef2 Merge branch 'master' of git://github.com/janeczku/calibre-web 2019-02-19 13:47:53 -08:00
hexeth
5a863541de
Fix object object 2019-02-19 13:44:40 -08:00
Ozzie Isaacs
4c80db4324
Revert bootstrap update 3.4.0 -> 3.3.7 2019-02-19 19:32:00 +01:00
Ozzieisaacs
56826f67fc progressbar during upload thanks to jim3ma 2019-02-16 10:05:51 +01:00
lorek123
d508b909d1 update js and css libs, especially to fix xss in Jquery and Bootstrap 2019-02-10 18:17:33 +01:00
Ozzieisaacs
9128615f48 Fix #424 
Fix #425
 2019-01-26 09:43:17 +01:00
Ozzieisaacs
ec81a3cd92 Fix Authors page pagination 
Update infinite scroll plugin
 2019-01-25 21:58:19 +01:00
Ozzieisaacs
836c6fd245 Updated translations 
Added license texts in flies
 2019-01-20 19:37:45 +01:00
Ozzieisaacs
bacb6fb561 New updater with default setting -> only stable releases #653 2019-01-20 17:46:26 +01:00
hexeth
83a905bfe1
Don't remove the dropdown toggle 2019-01-18 11:35:13 -08:00
hexeth
c0792b7225
Add .sendtokindle-drop to click-off 2019-01-18 11:10:54 -08:00
Matt
8825352af6 Revert "Add sendtokindle-drop to click-off array" 
This reverts commit d83ba315f0.
 2019-01-18 11:09:26 -08:00
hexeth
d83ba315f0
Add sendtokindle-drop to click-off array 2019-01-18 11:07:50 -08:00
hexeth
16e23cb1fe
Fix upload tooltip not appearing 2019-01-18 11:04:28 -08:00
hexeth
9a12e60b1c
Toggle for dropdown 2019-01-18 11:00:55 -08:00
hexeth
c620453ebf
UL positioning 2019-01-18 10:57:42 -08:00
hexeth
4988e3b631
add tooltip and move UL higher in DOM 2019-01-18 10:50:29 -08:00
Ozzie Isaacs
9e5fa45df7
Removed unnecessary wait message 2019-01-16 17:50:51 +01:00
Ozzie Isaacs
cc618ecee7
Fix Limiting domains (related to #773) 2019-01-15 20:08:47 +01:00
Ozzieisaacs
32568c9009 Update testing 
Update custom columns unicode enums
 2019-01-14 20:27:53 +01:00
Ozzieisaacs
c527d1f49a Merge remote-tracking branch 'theme/master' 
Added translations for some tooltips
Updated translations
 2019-01-12 09:01:08 +01:00
hexeth
4ace3a5e27
test 2019-01-11 14:13:09 -08:00
hexeth
2ab10bb070
Update caliBlur.js 2019-01-11 13:23:12 -08:00
hexeth
9c75eb7016
Update caliBlur.js 2019-01-11 13:07:18 -08:00
hexeth
6c37aafae9
Update caliBlur.js 2019-01-11 13:05:22 -08:00
hexeth
550262e651
Further fix 2019-01-11 12:44:29 -08:00
hexeth
edb4cedc65
Update about page to target new body class 2019-01-11 12:43:00 -08:00
hexeth
7032f311d5
Update caliBlur.js 2019-01-11 10:54:21 -08:00
Ozzieisaacs
66fcd71685 Merge remote-tracking branch 'origin/master' 2019-01-11 08:36:51 +01:00
hexeth
e1205b75cd Fix targeting for language support (#761) 
Some other languages use 'description :' instead of 'description:' .
 2019-01-10 18:26:34 +01:00
Ozzieisaacs
3b40c83314 Code cleaning 
code cosmetics
deleted unused file caliBlur
fixed custom error page
 2019-01-08 07:58:22 +01:00
hexeth
eb1c87fbae Patch 4 (#752) 
* Target new class 

Target new class for caliblur language support

* Move publishing date into div

Places publishing date in new div to assist caliBlur in targeting this element. This PR does not create any visual difference on the default theme.

* Target newly created div
 2019-01-08 07:10:10 +01:00
hexeth
29c9d55498 Remove leading space in span (#749) 
Previous code was not targeting right element, additionally was only removing a single leading space. New regex will remove any leading spaces from span
 2019-01-04 21:49:01 +01:00
hexeth
ece11de942 Fix publisher not formatting correct (#747) 2019-01-04 20:39:11 +01:00
Ozzieisaacs
f821580b50 #Fix 745 2019-01-03 22:01:52 +01:00
Ozzieisaacs
cb0f3cd074 Fix #696 2018-12-29 11:16:36 +01:00
Ozzieisaacs
d0fd1a4601 Merged new caliblur theme 
Fix for new users created
Fix for options to the calibre-converter
Only the first 300 chars are logged for the emailbody (spamming of logfile is prevented)
Added class to "Random" header
 2018-12-27 10:53:19 +01:00
Ozzieisaacs
c05687b896 Fix #668 2018-11-03 13:59:11 +01:00
Virgil Grigoras
016c7b4b1c Add ability to store and edit publishers 2018-09-30 14:08:55 +02:00
Virgil Grigoras
cb5adb3a31 Display "what's new" information for newer versions than the current one 2018-09-09 21:54:51 +02:00
Virgil Grigoras
f477d48c7c More robust handling while checking for new updates 2018-09-09 11:46:00 +02:00
OzzieIsaacs
4a95404e17 Merge remote-tracking branch 'Convert_all/ebookconvert-any' 
# Conflicts:
#	cps/web.py
 2018-08-31 15:00:22 +02:00
OzzieIsaacs
3f35200a0b Merge remote-tracking branch 'Comic/comic_server' 
# Conflicts:
#	cps/helper.py
#	cps/static/js/archive.js
#	cps/static/js/io.js
#	cps/static/js/kthoom.js
#	cps/static/js/unrar.js
#	cps/static/js/untar.js
#	cps/static/js/unzip.js
#	cps/templates/config_edit.html
#	cps/templates/detail.html
#	cps/templates/readcbr.html
#	cps/templates/stats.html
#	cps/ub.py
#	cps/web.py
#	optional-requirements.txt
 2018-08-31 10:47:58 +02:00
bodybybuddha
22ecdfd2bc Refactor edit_books.js for unused code; re-add glyphicon to convert button; Add form validation for convert button 2018-08-29 00:49:50 -04:00
bodybybuddha
4f386c8a00 Updated GUI buttons for ebook-convert feature 2018-08-28 19:13:04 -04:00
OzzieIsaacs
a7a91ae54c Added posibility to upload cover from local drive (#439) 
Updated language files
 2018-08-28 14:07:48 +02:00
OzzieIsaacs
2453786174 Limit registering domains 2018-08-28 09:42:19 +02:00
OzzieIsaacs
cedc183987 Fix #590, #589. 
Unified wording Calibre-Web
Replaced one table on admin page, deleted password column
Removed spaces on layout page
Removed uesless commit calls during db migration
Implementation of registering by email
 2018-08-27 22:08:55 +02:00
OzzieIsaacs
d414bf3263 Massadd of books to shelfs (#203, #404) from advanced search 
Code cosmetics
bugfix error message on failed emails
refactored language name generation
 2018-08-19 10:14:20 +02:00
OzzieIsaacs
7dac87fa5d Code cosmetics unrar 2018-08-18 18:38:28 +02:00
OzzieIsaacs
d2ea10e90e Improved OPDS compability (#579) 
Bootstrap-table loads locally and no longer from CDN
Localized commit date on admin page
 2018-08-18 17:35:23 +02:00
OzzieIsaacs
5ef70890d9 Search for custom columns implemented #494 
Search for ratings related to #559
Search description #572
code cosmetics
 2018-08-12 18:21:57 +02:00
Ozzie Isaacs
7be328c535 Converting ebooks in background 
additional sorting of tasklist according to date and runtime
codecosmetics
 2018-08-12 09:29:57 +02:00
OzzieIsaacs
76d8cbdf57 Logging of details for gdrive integration only on debug level 
fix generic cover path
browser reading for cbx and epub files no longer creates temp files on server
browser reading for cbx and epub files working (#502, #520)
 2018-07-07 15:48:50 +02:00
OzzieIsaacs
62f7674761 fixed #410 advanced search for publishing date 
fixed misstyping in italian language
removed next to "me" after login
 2018-04-01 19:31:41 +02:00
OzzieIsaacs
691a4a88e6 Added support for svg in comics (not working in IE11) 2018-03-31 17:05:15 +02:00
OzzieIsaacs
03e2a1e73b Restored click on progressbar 2017-12-10 14:02:49 +01:00
Yury Tilis
2fe03961bb -Added a more subtle progress bar which only shows the page number on hover 
-Added Current page indicator to the thumbnail list, as well as a hover state
-Thumbnail list now scrolls to the current page on open or page change
-Added @andy29485's request for controlling page with space/shift+space
-Added the book title to the top of the page -Fixed IE11 failing on imagecallback
 2017-12-10 02:43:51 -05:00
OzzieIsaacs
4e11272023 Working on IE11 2017-12-01 10:10:42 +01:00
OzzieIsaacs
cbb236ba7b Added visiblilty of shelfs to opds catalog (#267) 2017-12-01 07:53:52 +01:00
OzzieIsaacs
f890fc1553 New progress bar 2017-11-29 15:54:17 +01:00
OzzieIsaacs
03ab03f06e Code cosmetics 2017-11-22 22:08:29 +01:00
OzzieIsaacs
0943d50876 Code cosmetics 
Bugfix click on progressbar
 2017-11-21 12:46:03 +01:00
OzzieIsaacs
aae9e285a8 Code cosmetics 2017-11-20 21:54:55 +01:00
OzzieIsaacs
5756785073 Error handling rarfiles 2017-11-19 18:08:55 +01:00
OzzieIsaacs
9f8cbe8c1f Merge enhanced UI from ytilis repro 2017-11-19 13:20:59 +01:00
OzzieIsaacs
8c573ff6d8 Unrar/tar and unzip on server side 2017-11-18 10:34:21 +01:00
OzzieIsaacs
b8d45b664a Typeahead working again 
Fix for replacing characters in filenames
 2017-11-12 18:48:44 +01:00
OzzieIsaacs
1eb10be253 Code cosmetics comic reader 2017-10-08 10:41:43 +02:00
Jonathan Rehm
56c71dd4bf Disable bookmarking when anonymous users are reading 2017-09-30 10:51:20 -07:00
OzzieIsaacs
031a175474 Fix Comic reader 2017-09-24 19:38:15 +02:00
OzzieIsaacs
2302db4e06 Merge remote-tracking branch 'adv/fix-douban-rating' 2017-09-22 20:57:24 +02:00
OzzieIsaacs
a6dfcedfdb Code cosmetics 2017-09-20 21:13:32 +02:00
OzzieIsaacs
0405cec4ac Code cosmetics 
Bugfix "Error load settings"
 2017-09-18 18:59:08 +02:00
OzzieIsaacs
378a0ca662 Merge remote-tracking branch 'adv/bookmarks' 2017-09-17 20:26:58 +02:00
OzzieIsaacs
2a78a02e0b Code cosmetics 2017-09-17 19:16:29 +02:00
OzzieIsaacs
34e9ef35f5 Code cosmetics 2017-09-17 15:33:22 +02:00
OzzieIsaacs
a159bb0b97 Code Csmetics kthoom integration 2017-09-17 15:06:01 +02:00
OzzieIsaacs
5b9b36f997 Code cosmetics 2017-09-17 14:51:17 +02:00
OzzieIsaacs
85068d75bf Update comic reader 2017-09-17 13:37:21 +02:00
OzzieIsaacs
fe4d11fea8 Basi comic reader implementation for cbr, cbz, cbt files based on kthoom (#63, #126) 2017-09-17 12:36:32 +02:00
OzzieIsaacs
b6b73d39c2 Fix #329 
Code cosmetics
 2017-09-17 07:15:08 +02:00
OzzieIsaacs
bde92113d4 Bugfix Datepicker 2017-09-16 19:30:49 +02:00
OzzieIsaacs
f87800d11c Merge remote-tracking branch 'meta/upload_new_format_of_existing_book' 2017-09-16 18:55:34 +02:00
OzzieIsaacs
2ef6dc30bd Added italian translation 2017-09-16 16:58:42 +02:00
Jonathan Rehm
29f21b148b Translate 10-based rating to 5-based 2017-09-11 09:58:39 -07:00
kyos
8937599ba7 Fixed codacy code control 2017-09-11 17:18:11 +02:00
kyos
e5b4bed01c Fixed codacy requirements 2017-09-11 10:48:30 +02:00
kyos
9086f4e0e7 Added option to upload a new format to a given book 2017-09-11 10:48:30 +02:00
Jonathan Rehm
a4f81dd812 Do not include empty strings in list of bookmarks 2017-09-10 15:38:24 -07:00
OzzieIsaacs
c9f36a4d1a Merge remote-tracking branch 'adv/bookmarks' 2017-09-10 15:00:27 +02:00
Louis Jencka
b3217496d1 Add progress bar to upload form 2017-09-02 11:51:11 -06:00