50973ffb72
Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop
6 years ago
4fecce0a0d
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/static/js/archive/unrar.js
# cps/templates/readcbr.html
# cps/templates/readpdf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/translations/es/LC_MESSAGES/messages.mo
# cps/translations/es/LC_MESSAGES/messages.po
# cps/translations/fr/LC_MESSAGES/messages.mo
# cps/translations/fr/LC_MESSAGES/messages.po
# cps/translations/it/LC_MESSAGES/messages.mo
# cps/translations/it/LC_MESSAGES/messages.po
# cps/translations/ja/LC_MESSAGES/messages.mo
# cps/translations/ja/LC_MESSAGES/messages.po
# cps/translations/km/LC_MESSAGES/messages.mo
# cps/translations/km/LC_MESSAGES/messages.po
# cps/translations/nl/LC_MESSAGES/messages.mo
# cps/translations/nl/LC_MESSAGES/messages.po
# cps/translations/pl/LC_MESSAGES/messages.mo
# cps/translations/pl/LC_MESSAGES/messages.po
# cps/translations/ru/LC_MESSAGES/messages.mo
# cps/translations/ru/LC_MESSAGES/messages.po
# cps/translations/sv/LC_MESSAGES/messages.mo
# cps/translations/sv/LC_MESSAGES/messages.po
# cps/translations/uk/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
# cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
# optional-requirements.txt
6 years ago
ecedf92783
Update version
...
Make custom columns visible (#904 )
6 years ago
c2bfb29726
Add reading direction settings to readcbr page
6 years ago
2a5f2ff7b3
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/readpdf.html
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/web.py
6 years ago
dc933f3d66
Merge remote-tracking branch 'pdf.js/epubjs'
...
Updated pdf.js
6 years ago
da3fcb9a72
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/static/css/style.css
# cps/static/js/uploadprogress.js
# cps/templates/author.html
# cps/templates/detail.html
# cps/templates/discover.html
# cps/templates/index.html
# cps/templates/layout.html
# cps/templates/osd.xml
# cps/templates/search.html
# cps/templates/shelf.html
# cps/translations/de/LC_MESSAGES/messages.mo
# cps/translations/de/LC_MESSAGES/messages.po
# cps/web.py
# messages.pot
6 years ago
8612dce97c
Merge remote-tracking branch 'author/shorten-authors'
6 years ago
0b0e62fdf2
Merge remote-tracking branch 'dialog/master'
...
Fix for #833
6 years ago
3dfc2f2580
fixing issue #833
6 years ago
fb23db57b4
Added filtering of authors, series, categories, publishers
6 years ago
fa276fd0d3
Add scrollbar to metadata load screen
...
Small UI improvements in metadata load screen
6 years ago
de58d0a4d8
Merge remote-tracking branch 'metadata/Develop' into Develop
...
Update logger for updater
6 years ago
54a006a420
[fix] Add a scroll bar to a long list of meta information
6 years ago
d3ed0317bb
styling and javascript for hiding authors
6 years ago
cc3088c52f
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/static/js/libs/bootstrap.min.js
# cps/templates/detail.html
# cps/templates/layout.html
# cps/web.py
Improvement updater (up to 100 releases are loaded at once)
Fix oauth pathes
Fix oauth without registering
6 years ago
ae279c5123
fixed description read-more button
6 years ago
37007dafee
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/layout.html
# cps/web.py
# readme.md
6 years ago
56826f67fc
progressbar during upload thanks to jim3ma
6 years ago
d508b909d1
update js and css libs, especially to fix xss in Jquery and Bootstrap
6 years ago
f5235b1d4c
Uploader progress bar
...
Fixes imports and routes
Merge branch 'master' into Develop
Finished routing
6 years ago
5971194678
Merge remote-tracking branch 'audiobook/Branch_c27805b'
...
# Conflicts:
# cps/templates/detail.html
# cps/web.py
# readme.md
6 years ago
ae55dd6c27
Update caliBlur.min.css
6 years ago
7341819606
Revert "Update caliBlur.min.css"
...
This reverts commit df8806e182
6 years ago
68f143dc30
Revert "Create dark-reader.css"
...
This reverts commit a69e43922a
6 years ago
9ee4b7f77c
Revert "Not ready for commit"
...
This reverts commit 6a2ebba85b
6 years ago
6a2ebba85b
Not ready for commit
6 years ago
a69e43922a
Create dark-reader.css
6 years ago
df8806e182
Update caliBlur.min.css
6 years ago
e01872fc79
Revert "Update caliBlur.min.css"
...
This reverts commit 2b7b55846b
6 years ago
2b7b55846b
Update caliBlur.min.css
6 years ago
df2b1ba09d
fix for send button dropdown
6 years ago
d5ff3b6a0b
smtp setup page ( #774 )
...
fix for https://github.com/janeczku/calibre-web/issues/773
6 years ago
32568c9009
Update testing
...
Update custom columns unicode enums
6 years ago
db83fb3bd7
minified
6 years ago
f897491070
Update caliBlur.min.css
6 years ago
40e45c7272
Add files via upload
6 years ago
d5a913e195
Merge remote-tracking branch 'origin/master'
6 years ago
dba5680121
1.0 for the merge ( #758 )
...
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.
6 years ago
b03f4bb5e5
Merge remote-tracking branch 'origin/master'
6 years ago
418e98d1f8
update .published-date to .publishing-date ( #756 )
6 years ago
3b40c83314
Code cleaning
...
code cosmetics
deleted unused file caliBlur
fixed custom error page
6 years ago
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
6 years ago
60e9d01d27
Beautify http errors
6 years ago
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
6 years ago
a7a91ae54c
Added posibility to upload cover from local drive ( #439 )
...
Updated language files
6 years ago
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
6 years ago
d2ea10e90e
Improved OPDS compability ( #579 )
...
Bootstrap-table loads locally and no longer from CDN
Localized commit date on admin page
6 years ago
9ace4d3372
Updated german translation
...
Bugfix additional format upload without extension
Bugfix additional format upload to gdrive
pathes assembled by os.path.join
6 years ago
0e83546d40
- Updated translation (it's now always Google Drive)
...
- Integrated feature #409 (linking read status from calibre)
7 years ago
Ozzieisaacs