Commit Graph

342 Commits (d0e15da352f4735b58e5ab5cc50ce3bce17e0deb)

Author SHA1 Message Date
Knepherbird 5cceeb6ef2
Fix: correct property typo
Correcting 'box-sizeing' to 'box-sizing'
Ozzieisaacs 38c28f4358 Merge branch 'master' into Develop
# Conflicts:
#	cps/admin.py
#	cps/constants.py
#	cps/static/css/caliBlur.min.css
#	cps/uploader.py
h1f0x e325c3dbf6 fixed div selection in caliBlur.js
h1f0x b3fef625a8 Fixed Calibur views: series, authors, publishers, ratings, file formats, detail view
Ozzieisaacs e787f9dd9f Automatic username ()
Ozzieisaacs f5e12328dc Fix for (Restrictions with "&" in it can't be deleted)
Ozzieisaacs 486c0f2937 Fix for (Restrictions with "&" in it can't be deleted)
Ozzieisaacs 16a3deec2c Merge branch 'master' into Develop
# Conflicts:
#	cps/helper.py
OzzieIsaacs fe88010a72 Merge remote-tracking branch 'sec_fixes/minor_fix_caliblur'
OzzieIsaacs 99ae4be2c2 Merge remote-tracking branch 'sec_fixes/bump_jquery'
jvoisin 30c9aa3df9 Minor fixes to caliBlur.js
- Add alt attributes to images
- Fix a broken tag
jvoisin 688184e255 Bump jquery
jvoisin 264b4b669e Bump underscorejs version from 1.9.1 to 1.12.2
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)
Ozzieisaacs fcefd8031a Fix (png and webp are extracted as cover files from comic files)
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
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
jvoisin 806a5f209f Fix two minor xss
Ozzieisaacs ce6b689147 Code cosmetics
Ozzieisaacs 2d92818613 Code cosmetics
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
Ozzieisaacs 063ee5e855 Merge remote-tracking branch 'remove_usage_local_var_undeclared'
Code cosmetics
jvoisin d8bf540db2 Remove an undeclared and useless local variable
pthiben b90048d72e fix badge color on grid view to match list view
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
pthiben 58943bb156 update filtering so that it also uses isotope everywhere.
Fix asc/desc that did not match list view
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
pthiben 1e3a948977 fix linter errors
Fix the sorting
Save the sorting state
Remove unnecessary filter
Add support for grid view
Ozzieisaacs 9e159ed5ab Merge branch 'master' into Develop
# Conflicts:
#	cps/config_sql.py
#	cps/ub.py
#	cps/web.py
Ozzieisaacs a194216568 Merge remote-tracking branch 'origin/master'
Ozzieisaacs 8bee424cc0 Merge remote-tracking branch 'ldap/master'
# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py
Ozzieisaacs 587174b771 Fix
Ozzieisaacs 5864637f1c Merge branch 'master' into Develop
hexeth da42c51af2 Updated to exclude new modules
Ozzieisaacs f6c04b9b84 Merge branch 'master' into Develop
Ozzieisaacs 4eacb21259 Update updater
Update change logfile
code cosmetics js files
Ozzieisaacs f243515261 Fix (sorting order in comics)
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
Wanoo a0535aa3db Add ComicVine Api
Fetching Metadata for comicBook with ComicVine API
Ozzieisaacs 146068c936 Merge branch 'Develop'
# Conflicts:
#	cps/db.py
#	cps/templates/user_edit.html
Ozzieisaacs 3b8c5ef21a Merge remote-tracking branch 'get_metadata/patch-1'
Fix  Load multiple authors correct via get metadata
Ozzieisaacs 7c89f0b5b9 Merge with branch develop
Release version
OzzieIsaacs 371097eb4d Update Updater
Johnny A. dos Santos 29cb8bfec4
Fix
Michael Shavit 7d99e21d0d Merge remote-tracking branch 'original/Develop' into kobo_book_delete
Ozzieisaacs ba6b5f8fd1 Merge branch 'master' into Develop
Ozzieisaacs 16cd57fe55 Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout'
Kyos 509071949a Moved style to css file
Ozzieisaacs 814ad87a42 Updated pdf viewer to 2.2.228 ()
Ozzieisaacs 3e4b5e23fa Updated pdf viewer to 2.2.228 ()