Commit Graph

138 Commits (3dacdcc8bb6ffb839568ac6d5ec3db702fe8cd8b)

Author SHA1 Message Date
Ozzieisaacs 861f1b2ca3 Merge branch 'master' into Develop
# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html
Ryan Long a6002a2c6c 1622_updated_css
Ozzieisaacs 7ba014ba49 Fix "is not a valid language" on upload of comic books
Fix metadata excration of comic books
updated bootstrap table
updated handling of upload formats restrictions
OzzieIsaacs 28733179d2 Merge remote-tracking branch 'caliblur/editMetaFix' into Develop
blitzmann 3e378bd665 Some more clean up
blitzmann c120138f26 Fixes for pagination ugliness for caliBlur! style
blitzmann 31b20362ec caliBlur! style: Fixes issue with edit metadata button not getting styled correctly
Ozzieisaacs 8dde6ba60f UI improvements table buttons
Ozzieisaacs 1c681ee378 Improvements for books table editor
Ozzieisaacs 7b4306b1d6 UI improvements (same colors of buttons, etc.)
Changed Editable default value
Ozzieisaacs 0dd0605a1f Book list for merging
Ozzieisaacs eef2112e1e (changed color of rating stars)
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 b3fef625a8 Fixed Calibur views: series, authors, publishers, ratings, file formats, detail view
Ozzieisaacs e787f9dd9f Automatic username ()
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 ce6b689147 Code cosmetics
Ozzieisaacs 2d92818613 Code cosmetics
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 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 a194216568 Merge remote-tracking branch 'origin/master'
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 ()
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
Ozzieisaacs c659f28334 Fix
Ozzieisaacs b586a32843 Fix (comic reader not working under iOS, maybe invalid issue)
Improvement for  (Next/Prev buttons are bigger)
Kyos c93dd32179 Fixed typo and column size for LG screens
Kyos ada727a570 Adds Authors, Series and Book Cover to the shelf order view
Dmitriy Istomin a65ad9483c update Bootstrap v3.4.0 -> 3.4.1
Ozzieisaacs b9c3a3fcea Fix
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
Ozzieisaacs 3f5c6c1fa5 Fix
Ozzieisaacs ecedf92783 Update version
Make custom columns visible ()
subdiox c2bfb29726 Add reading direction settings to readcbr page
Ozzieisaacs dc933f3d66 Merge remote-tracking branch 'pdf.js/epubjs'
Updated pdf.js
Ozzieisaacs 8612dce97c Merge remote-tracking branch 'author/shorten-authors'
Ozzieisaacs 0b0e62fdf2 Merge remote-tracking branch 'dialog/master'
Fix for 
Andrew Sullivan 3dfc2f2580 fixing issue
Ozzieisaacs fa276fd0d3 Add scrollbar to metadata load screen
Small UI improvements in metadata load screen
Virgil Grigoras d3ed0317bb styling and javascript for hiding authors
leram84 ae279c5123
fixed description read-more button
Ozzieisaacs 56826f67fc progressbar during upload thanks to jim3ma
lorek123 d508b909d1 update js and css libs, especially to fix xss in Jquery and Bootstrap
leram84 ae55dd6c27 Update caliBlur.min.css