Commit Graph

390 Commits (master)

Author SHA1 Message Date
h1f0x e325c3dbf6 fixed div selection in caliBlur.js 4 years ago
h1f0x b3fef625a8 Fixed Calibur views: series, authors, publishers, ratings, file formats, detail view 4 years ago
Ozzieisaacs e787f9dd9f Automatic username (#1172) 4 years ago
Ozzieisaacs f5e12328dc Fix for #1382 (Restrictions with "&" in it can't be deleted) 4 years ago
Ozzieisaacs 486c0f2937 Fix for #1382 (Restrictions with "&" in it can't be deleted) 4 years ago
Ozzieisaacs 16a3deec2c Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
4 years ago
OzzieIsaacs fe88010a72 Merge remote-tracking branch 'sec_fixes/minor_fix_caliblur' 4 years ago
OzzieIsaacs 99ae4be2c2 Merge remote-tracking branch 'sec_fixes/bump_jquery' 4 years ago
jvoisin 30c9aa3df9 Minor fixes to caliBlur.js
- Add alt attributes to images
- Fix a broken tag
4 years ago
jvoisin 688184e255 Bump jquery 4 years ago
jvoisin 264b4b669e Bump underscorejs version from 1.9.1 to 1.12.2 4 years ago
Ozzieisaacs e1439b529b Config Options for limiting email size, change username to e-mail adress, use kepubify
Added work on Unrar5 decompression (breaks comic reader totally)
4 years ago
Ozzieisaacs fcefd8031a Fix #985 (png and webp are extracted as cover files from comic files) 4 years ago
Ozzieisaacs 0a92d79ec0 Merge remote-tracking branch 'cover-series/feature/add-cover-serie-view' into Develop
# Conflicts:
#	cps/static/css/style.css
#	cps/ub.py
#	cps/web.py
4 years ago
Ozzieisaacs b160a8de0b Merge branch 'master' into Develop
# Conflicts:
#	cps/__init__.py
#	cps/comic.py
#	cps/editbooks.py
#	cps/helper.py
#	cps/kobo.py
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/uploader.py
#	cps/web.py
4 years ago
jvoisin 806a5f209f Fix two minor xss 4 years ago
Ozzieisaacs ce6b689147 Code cosmetics 4 years ago
Ozzieisaacs 2d92818613 Code cosmetics 4 years ago
Ozzieisaacs b4d7733e0a Merge branch 'master' into Develop
# Conflicts:
#	cps/templates/list.html
#	cps/translations/cs/LC_MESSAGES/messages.po
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fi/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/hu/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot
4 years ago
Ozzieisaacs 063ee5e855 Merge remote-tracking branch 'remove_usage_local_var_undeclared'
Code cosmetics
4 years ago
jvoisin d8bf540db2 Remove an undeclared and useless local variable 4 years ago
pthiben b90048d72e fix badge color on grid view to match list view 4 years ago
pthiben 38bb10d36b apply suggestion from @OzzieIsaacs that fixes sorting with caliblur theme.
@OzzieIsaacs : I have no idea what the consequences are about this CSS style change. I played around in caliblur and did not notice anything weird, but I'm no calibre-web hardcore user
4 years ago
pthiben 58943bb156 update filtering so that it also uses isotope everywhere.
Fix asc/desc that did not match list view
4 years ago
pthiben 5222e157cb fix standard theme badges so that they stand on top left corner instead of top right: each element's width in the list seems to be double the size of the image, so right alignment gets tricky. https://github.com/janeczku/calibre-web/pull/986#issuecomment-517999218 suggests top-left alignment which does make a lot of sense. Using this for now. Maintainer might have a better idea to fix it 4 years ago
pthiben 1e3a948977 fix linter errors
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
4 years ago
Ozzieisaacs 9e159ed5ab Merge branch 'master' into Develop
# Conflicts:
#	cps/config_sql.py
#	cps/ub.py
#	cps/web.py
4 years ago
Ozzieisaacs a194216568 Merge remote-tracking branch 'origin/master' 4 years ago
Ozzieisaacs 8bee424cc0 Merge remote-tracking branch 'ldap/master'
# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py
4 years ago
Ozzieisaacs 587174b771 Fix #1272 4 years ago
Ozzieisaacs 5864637f1c Merge branch 'master' into Develop 4 years ago
hexeth da42c51af2 Updated to exclude new modules 4 years ago
Ozzieisaacs f6c04b9b84 Merge branch 'master' into Develop 4 years ago
Ozzieisaacs 4eacb21259 Update updater
Update change logfile
code cosmetics js files
4 years ago
Ozzieisaacs f243515261 Fix #950 (sorting order in comics) 4 years ago
Ozzieisaacs 09e7d76c6f Merge remote-tracking branch 'kobo_book_delete' into Develop
# Conflicts:
#	cps/kobo.py
#	cps/services/SyncToken.py
#	cps/templates/book_edit.html
#	cps/ub.py
4 years ago
Wanoo a0535aa3db Add ComicVine Api
Fetching Metadata for comicBook with ComicVine API
4 years ago
Ozzieisaacs 146068c936 Merge branch 'Develop'
# Conflicts:
#	cps/db.py
#	cps/templates/user_edit.html
4 years ago
Ozzieisaacs 3b8c5ef21a Merge remote-tracking branch 'get_metadata/patch-1'
Fix #1210 Load multiple authors correct via get metadata
4 years ago
Ozzieisaacs 7c89f0b5b9 Merge with branch develop
Release version
4 years ago
OzzieIsaacs 371097eb4d Update Updater 4 years ago
Johnny A. dos Santos 29cb8bfec4
Fix #1210 4 years ago
Michael Shavit 7d99e21d0d Merge remote-tracking branch 'original/Develop' into kobo_book_delete 4 years ago
Ozzieisaacs ba6b5f8fd1 Merge branch 'master' into Develop 4 years ago
Ozzieisaacs 16cd57fe55 Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout' 4 years ago
Kyos 509071949a Moved style to css file 4 years ago
Ozzieisaacs 814ad87a42 Updated pdf viewer to 2.2.228 (#1184) 4 years ago
Ozzieisaacs 3e4b5e23fa Updated pdf viewer to 2.2.228 (#1184) 4 years ago
Ozzieisaacs 50ba2e329a Merge branch 'master' into Develop
# Conflicts:
#	cps/shelf.py
4 years ago
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
4 years ago
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.
4 years ago
Ozzieisaacs 3a4d351a57 Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop 4 years ago
Ozzieisaacs 973f555544 Merge branch 'master' into Develop
(updated tinymce and bootstrap datepicker)
4 years ago
Ozzieisaacs 1d7e52c198 Merge with develop:
- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup
4 years ago
Simon Latapie 56964a890b caliBlur theme: fix custom column display that contain colons 4 years ago
Ozzieisaacs 68ca0b86da Updated tiniymce + locale
updated datepicker + locale
Included cs, fi language, updated ru language
4 years ago
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
4 years ago
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
4 years ago
Ozzieisaacs c659f28334 Fix #1128 4 years ago
Ozzieisaacs d9adb4fc94 Improvements for limit tags 4 years ago
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
4 years ago
Ozzieisaacs 1da4efec86 Merge branch 'master' into Develop 4 years ago
Ozzieisaacs 5887f0fe6b Fix for #768 (If email server is configured, admins can send user passwords, also domains can be denied from registration) 4 years ago
Ozzieisaacs bbe91f439a Merge from master 5 years ago
Ozzieisaacs b586a32843 Fix #1115 (comic reader not working under iOS, maybe invalid issue)
Improvement for #925 (Next/Prev buttons are bigger)
5 years ago
zhiyue 222797e631
support douban book search using apikey 5 years ago
Kyos c93dd32179 Fixed typo and column size for LG screens 5 years ago
Kyos ada727a570 Adds Authors, Series and Book Cover to the shelf order view 5 years ago
Ozzieisaacs 0c40e40dc3 Fix logfile loading behind reverse proxy (#1047) 5 years ago
Dmitriy Istomin a65ad9483c update Bootstrap v3.4.0 -> 3.4.1 5 years ago
Ozzieisaacs b9c3a3fcea Fix #652 5 years ago
Ozzieisaacs c6542fdec6 New Oauth code 5 years ago
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
5 years ago
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)
5 years ago
Ozzieisaacs cd546eb6d4 Update comic reader js 5 years ago
Ozzieisaacs 3f5c6c1fa5 Fix #937 5 years ago
Ozzieisaacs c81d4edb7d Fix for #923 5 years ago
Ozzieisaacs 26e45f1f57 Merge remote-tracking branch 'comic-reader/master' 5 years ago
Ozzieisaacs ecedf92783 Update version
Make custom columns visible (#904)
5 years ago
subdiox 867aa2f0bd Beautify bitjs 5 years ago
subdiox 7982ed877c Downgrade bitjs to es5 branch 5 years ago
subdiox c0d136ccd8 Fix slow loading 5 years ago
subdiox c2bfb29726 Add reading direction settings to readcbr page 5 years ago
subdiox 204de4aef6 Fix an issue that fullscreen doens't work on some browsers 5 years ago
Ozzieisaacs 0b8624b542 Deleted load metadata from douban, as API seems to be shut down (#858) 5 years ago
Ozzieisaacs 436c2671d1 Fix delete domain entries
Fix error handling smtp.authentication error
5 years ago
Ozzieisaacs dc933f3d66 Merge remote-tracking branch 'pdf.js/epubjs'
Updated pdf.js
5 years ago
Daniel Pavel 439ce19b5d Updated epub.js to v0.3.66 5 years ago
Ozzieisaacs 4b301a7961 Additional fix for #845 (in case of error) 5 years ago
Ozzieisaacs 8612dce97c Merge remote-tracking branch 'author/shorten-authors' 5 years ago
Ozzieisaacs 0b0e62fdf2 Merge remote-tracking branch 'dialog/master'
Fix for #833
5 years ago
Ozzieisaacs 6f80a63ca6 Fix for #827 5 years ago
Andrew Sullivan 3dfc2f2580 fixing issue #833 5 years ago
Ozzieisaacs 6f0b3bbda0 Fix for #812 5 years ago
Ozzieisaacs 466af21548 Code Cosmetics 5 years ago
Ozzieisaacs fa276fd0d3 Add scrollbar to metadata load screen
Small UI improvements in metadata load screen
5 years ago
Ozzieisaacs 361a1243d7 Improvements #828 5 years ago
Virgil Grigoras bd7b0175a1 Fix remaining shown by codacy 5 years ago
Virgil Grigoras f5cf62f209 Fix issues shown by codacy 5 years ago
Virgil Grigoras d3ed0317bb styling and javascript for hiding authors 5 years ago