Commit Graph

114 Commits (08543037109f4335d1661a073aecc43d2b577d9c)

Author SHA1 Message Date
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
Matt 7341819606 Revert "Update caliBlur.min.css"
This reverts commit df8806e182.
Matt 68f143dc30 Revert "Create dark-reader.css"
This reverts commit a69e43922a.
Matt 9ee4b7f77c Revert "Not ready for commit"
This reverts commit 6a2ebba85b.
hexeth 6a2ebba85b
Not ready for commit
leram84 a69e43922a
Create dark-reader.css
leram84 df8806e182
Update caliBlur.min.css
Matt e01872fc79 Revert "Update caliBlur.min.css"
This reverts commit 2b7b55846b.
leram84 2b7b55846b
Update caliBlur.min.css
leram84 df2b1ba09d
fix for send button dropdown
leram84 d5ff3b6a0b smtp setup page ()
fix for https://github.com/janeczku/calibre-web/issues/773
Ozzieisaacs 32568c9009 Update testing
Update custom columns unicode enums
leram84 db83fb3bd7
minified
leram84 f897491070
Update caliBlur.min.css
hexeth 40e45c7272
Add files via upload
Ozzieisaacs d5a913e195 Merge remote-tracking branch 'origin/master'
leram84 dba5680121 1.0 for the merge ()
Includes many bugfixes, and multi language support updates. I'm making all changes as an unminified addendum to the file for readability, but we can go back and minify it with the rest when everything is smooth.
Ozzieisaacs b03f4bb5e5 Merge remote-tracking branch 'origin/master'
hexeth 418e98d1f8 update .published-date to .publishing-date ()
Ozzieisaacs 3b40c83314 Code cleaning
code cosmetics
deleted unused file caliBlur
fixed custom error page
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
Virgil Grigoras 60e9d01d27 Beautify http errors
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
OzzieIsaacs a7a91ae54c Added posibility to upload cover from local drive ()
Updated language files
OzzieIsaacs cedc183987 Fix , .
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