Ozzieisaacs
d04a78afe6
Merge remote-tracking branch 'public_shelf/Develop' into Develop
5 years ago
Ozzieisaacs
f566237be0
Merge remote-tracking branch 'bootstrap/Develop' into Develop
5 years ago
Dmitriy Istomin
a65ad9483c
update Bootstrap v3.4.0 -> 3.4.1
5 years ago
W1ndst0rm
4cbdccd39e
Fix for https://github.com/janeczku/calibre-web/issues/1002
5 years ago
Ozzieisaacs
9356148e2d
Added more information about dependencies
5 years ago
Ozzieisaacs
4be55285d8
Fix #1001
5 years ago
Ozzieisaacs
3eae2e9c2c
Changed text for not found imports
5 years ago
Ozzieisaacs
e9fb5d9f25
Bugfix for comicapi
5 years ago
Ozzieisaacs
6261981656
Fix for #991
...
Removed additional psace before Advanced search (Pull request #996 )
Set startup message for not relevant imports to debug, to reduce confusion
5 years ago
Ozzieisaacs
82ca3f31f9
Merge remote-tracking branch 'pwr/master'
5 years ago
Ozzieisaacs
97f3aa8325
Update dutch language
5 years ago
Daniel Pavel
7c503b4a31
provide a default logging configuration ( fixes #987 )
5 years ago
Daniel Pavel
9f8cab99e3
Moved language names from iso639.pickle to a python file
5 years ago
Ozzieisaacs
5f25b81004
Final fix for #983
5 years ago
Ozzieisaacs
73bbffccaa
Fix for login issue on MacOS
5 years ago
Ozzieisaacs
f59d9d5aa8
Merge remote-tracking branch 'polish/master'
5 years ago
Radosław Kierznowski
746b7b1262
Update polish translation
5 years ago
Ozzieisaacs
5f228fbb40
Update german translation
5 years ago
Ozzieisaacs
12576393cf
Merge remote-tracking branch 'spanish/patch-1'
...
Merge remote-tracking branch 'german/master'
5 years ago
Mainak
7f43a2e104
Update messages.po
...
update and revision of the Spanish translation file.
5 years ago
Ozzieisaacs
00f17bb697
Mature contents no longer displayed in/allowed to ( #975 ):
...
- typeahead tags
- advanced search tags buttons
- read
- download
5 years ago
Ozzieisaacs
cf00b4eebf
Cover upload gives Error 500 fix #972 (leftover from refactoring)
...
OPDS cannot be downloaded Fix #973 (wrong blueprint selected with wrong authentication type)
Read books with link to calibre wern't detected correct Fix #971 (Refactoring error "is" is not equal to "==" for sqlalchemy)
6 years ago
Ozzieisaacs
fc4dc36c65
Fix #969 (duplicate code "init" in epub reader)
...
Fix for #890
6 years ago
Ozzieisaacs
97a0dccdec
Fix for display of format, series, category, ratings,
...
Fix for display of language (sorting not working yet)
6 years ago
Ozzieisaacs
9f64a96502
Fix for #890
6 years ago
Ozzieisaacs
b9c3a3fcea
Fix #652
6 years ago
Ozzieisaacs
6d43e0422a
Fix for non found flask_login version ( #968 )
6 years ago
Ozzieisaacs
0d7e58ce79
Fix for #968 (database conversion fails for default strings under python2.7)
6 years ago
Ozzieisaacs
3e008ef29b
Fix update dates shown in local time format again
...
Fix "to update" history is shown again
6 years ago
Ozzieisaacs
5c6be5d6d0
Fix for python 3 and existing unrar entry in db
...
deleted unnecessary lines in config html template
6 years ago
Ozzieisaacs
38f3c2d5b9
Reenabled multiple oauth provider
...
deleted duplicate download counting function
6 years ago
Ozzieisaacs
c6542fdec6
New Oauth code
6 years ago
Ozzieisaacs
26a7d9ef30
Merge branch 'Develop'
...
# Conflicts:
# cps/__init__.py
# cps/about.py
# cps/admin.py
# cps/cli.py
# cps/config_sql.py
# cps/constants.py
# cps/converter.py
# cps/db.py
# cps/editbooks.py
# cps/gdriveutils.py
# cps/helper.py
# cps/logger.py
# cps/oauth.py
# cps/server.py
# cps/services/simpleldap.py
# cps/ub.py
# cps/web.py
# cps/worker.py
# optional-requirements.txt
# setup.cfg
# setup.py
6 years ago
Ozzieisaacs
d168e3bfdb
Add licence to oauth
...
fix comicapi dependency
6 years ago
Daniel Pavel
99c6247baf
use the standard socket library to validate the ip address argument
6 years ago
Daniel Pavel
a334ef28e7
about page: build the versions dictionary only once
6 years ago
Daniel Pavel
63634961d4
cleaner worker api
...
the worker thread now stops on its own
6 years ago
Ozzieisaacs
d82289e303
Deactivate ldap
...
Fix setup for pypi
6 years ago
Daniel Pavel
a836df9a5a
more robust disposing of database session
...
avoid spamming the log with debug messages from libraries
6 years ago
Ozzieisaacs
8bfcdffeb6
Fix feature support
6 years ago
Ozzieisaacs
e411c0fded
Fix logging in debug mode
6 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
6 years ago
Ozzieisaacs
792367e35e
Version update
6 years ago
Ozzieisaacs
be64961de5
Code cosmetics comic reader
6 years ago
Ozzieisaacs
405a3909b0
Fix for opds with LDAP authentication
6 years ago
Ozzieisaacs
b1cb7123a3
Fix for #959
6 years ago
Ozzieisaacs
e734bb120a
Merge remote-tracking branch 'github/config_sql' into Develop
6 years ago
Daniel Pavel
006e596c72
Moved config class into separate file.
...
Moved Goodreads and LDAP services into separate package.
6 years ago
Ozzieisaacs
499a66dfb0
Additional glyphicons for music on search and author page
...
Fix duplicate user and email (now case insensitive)
Output of calibre on stderr is now logged (full traceback in debug-log, otherwise, only errormessage)
Natural sorting for comic reader
Fix for long running tasks
6 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 )
6 years ago
Ozzieisaacs
ad44e58c7a
Sorting for comics
...
Audiobook support
6 years ago
Ozzieisaacs
572b5427c7
Fix Encoding issues for python2
6 years ago
Ozzieisaacs
32af660f86
Improvements for logfile viewer
...
Fix for tornado-server with deactivated accesslog doesn't log to normal log anymore
Merge from master for unique user ids, get_metadata,
fix Goodreads integration
Update Translation (merge NL, update DE)
6 years ago
Ozzieisaacs
cc8a431532
Merge remote-tracking branch 'socket/unix-socket' into Develop
6 years ago
Ozzieisaacs
5c7aeb2f2c
Change GDrive
6 years ago
Daniel Pavel
e254565901
support binding the http server to a unix socket file instead of TCP socket
6 years ago
Heimen Stoffels
d9f69ca264
Updated Dutch translation
6 years ago
Ozzieisaacs
cd546eb6d4
Update comic reader js
6 years ago
Ozzieisaacs
f40fc5aa75
Update LDAP
6 years ago
Ozzieisaacs
9b74d51f21
Merge remote-tracking branch 'ldap/master' into Develop
...
# Conflicts:
# cps/server.py
# cps/templates/config_edit.html
# cps/ub.py
# cps/updater.py
# cps/web.py
# optional-requirements-ldap.txt
# setup.cfg
6 years ago
Ozzieisaacs
d45b1b8ea5
Fix #937
...
logviewerintegrated
Code cosmetics
6 years ago
Ozzieisaacs
e67d707867
Fix for #588
...
Merge remote-tracking branch 'linuxserver/master'
6 years ago
Krakinou
4437d7376d
Merge pull request #2 from Krakinou/flaskldap
...
Solve typo
6 years ago
Krakinou
304db0d20e
Solve typo
6 years ago
Ozzieisaacs
3f5c6c1fa5
Fix #937
6 years ago
Ozzieisaacs
26949970d8
Revert logging functions
...
Fix access logger for tornado
6 years ago
Ozzieisaacs
f5e3ed26b9
Fix for #935
6 years ago
Ozzieisaacs
8e4539cf8e
Prevent delete of last admin user
6 years ago
Ozzieisaacs
c81d4edb7d
Fix for #923
6 years ago
Ozzieisaacs
546ed65e1d
Update logging
...
Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress
6 years ago
Ozzieisaacs
14b6202eec
Code cosmetics
...
Fixes func in helper,web
Fixes for pdf reader
fixes for calling from another folder
renamed to calibreweb for importing in python caller script
6 years ago
Ozzieisaacs
50973ffb72
Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop
6 years ago
Krakinou
9a5ab97d78
Merge branch 'master' into master
6 years ago
Krakinou
79286c9384
encode password
6 years ago
yjouanique
c4e3f3670f
Added public /reconnect endpoint
6 years ago
Daniel Pavel
b89ab9ff10
logging clean-up
...
- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file
6 years ago
Krakinou
97d12b94f6
Correct settings update
6 years ago
Krakinou
e4d801bbaf
initial flask_simpleldap implementation
6 years ago
Ozzieisaacs
f736a15c12
Fix for restart of newer versions of tornado during update
...
Fix for updater with Beta Versions
6 years ago
Ozzieisaacs
a02f949d23
Fix for updater with beta releases
6 years ago
Ozzieisaacs
bb0d5c5538
Working for pip and "normal" start for python3 and python2
6 years ago
Ozzieisaacs
87ca05f129
Merge remote-tracking branch 'setup/feature/setuptools-integration'
6 years ago
Ozzieisaacs
6662a58cb0
Update translationfiles
6 years ago
Ozzieisaacs
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
Ozzieisaacs
26e45f1f57
Merge remote-tracking branch 'comic-reader/master'
6 years ago
Ozzieisaacs
df5d15d1a2
Merge remote-tracking branch 'comicapi/master'
6 years ago
Ozzieisaacs
ecedf92783
Update version
...
Make custom columns visible (#904 )
6 years ago
Ozzieisaacs
d106ada9ed
Changed version
...
Update translation
6 years ago
Ozzieisaacs
ed91048a63
Fix for magic link with python 3
6 years ago
Ozzieisaacs
f70c839014
Added additional permission viewer
6 years ago
Ozzieisaacs
e6ff2f1d90
Fix file not found loading-icon.gif
6 years ago
subdiox
867aa2f0bd
Beautify bitjs
6 years ago
subdiox
7982ed877c
Downgrade bitjs to es5 branch
6 years ago
Ozzieisaacs
0c80f5c63a
Update Teststatus
6 years ago
Ozzieisaacs
1030e195a5
Fix #916
6 years ago
subdiox
c0d136ccd8
Fix slow loading
6 years ago
Ozzieisaacs
479b4b7d82
Update translations, integrated update of Italian translation
6 years ago
Ozzieisaacs
a42ebdc096
Fix for #897
6 years ago
Ozzieisaacs
49ba221e85
Merge remote-tracking branch 'direction'
6 years ago
Ozzieisaacs
3b03aa30a6
Fix for advanced search
6 years ago
Ozzieisaacs
cb0403a924
Merge remote-tracking branch 'adv_search/master'
6 years ago
Marvin Marx
a2c7741e21
Fix "Internal Server Error" on advanced search
...
Custom boolean columns return that error if calibre does not have a
custom_column_1 in the DB, as this is queried in the removed line.
However the value is completely unused anyway -> removing.
6 years ago
Ozzieisaacs
55bb8d4590
Fix #900
6 years ago
Ozzieisaacs
b80bfa5260
Improvement for #897
6 years ago
Ozzieisaacs
f941908f73
Workaround for #889
6 years ago
Ozzieisaacs
9b3b2acb49
Sort button is correctly visible on list pages
...
Publisher list is working
6 years ago
Ozzieisaacs
406d1c76c9
Sorting and filtering of lists working (except file formats)
...
Refactored and bugfixing show_cover
Refactored import of helper in web.py
Fix for displaying /me (gettext) throwing error 500
Fix get search results throwing error 500
Fix routing books_list for python2.7
Fix for "me" and "settings" pages
Update sidebarview and list view
6 years ago
subdiox
c2bfb29726
Add reading direction settings to readcbr page
6 years ago
subdiox
204de4aef6
Fix an issue that fullscreen doens't work on some browsers
6 years ago
subdiox
8b6d165d64
Fix Japanese translation
6 years ago
Ozzieisaacs
bfd0e87a17
Merge branch 'master' into Develop
...
# Conflicts:
# cps/helper.py
# cps/reverseproxy.py
6 years ago
Ozzieisaacs
6a7b8c7870
Update Version info
...
Fix #816
Clarified licences for isolanguages.py and reverseproxy.py
6 years ago
Ozzieisaacs
2de4bfdcf2
Merge branch 'master' into Develop
...
# Conflicts:
# cps/book_formats.py
# cps/helper.py
# cps/web.py
6 years ago
Ozzieisaacs
f1a65a2aeb
Clarified licences for isolanguages.py and reverseproxy.py
6 years ago
Ozzieisaacs
cc5c2c0f65
Update Version info
6 years ago
Ozzieisaacs
c748716ad2
Fix for opds feed of unread/read books
6 years ago
Ozzieisaacs
544405f5aa
Update search for cyrillic letters #877
6 years ago
Ozzieisaacs
67736fe187
Catch errors on loading pickle file
...
Fix for cover images without Pillow
6 years ago
Ozzieisaacs
89516fc2d6
Make PIL optional #885
6 years ago
Ozzieisaacs
e1e79a73e8
Fix #884
6 years ago
Ozzieisaacs
0b8624b542
Deleted load metadata from douban, as API seems to be shut down ( #858 )
6 years ago
Ozzieisaacs
91ebe33879
Merge remote-tracking branch 'image_formats/dev'
6 years ago
Ozzieisaacs
05da2ae3c7
Update search for cyrillic letters
6 years ago
Ozzieisaacs
4ae9d4a749
Merge branch 'master' into Develop
...
# Conflicts:
# cps/web.py
# cps/worker.py
6 years ago
Ozzieisaacs
55bdd13fb1
Fix #877
6 years ago
Ozzieisaacs
4552208c02
Fix #848
6 years ago
Ozzieisaacs
436c2671d1
Fix delete domain entries
...
Fix error handling smtp.authentication error
6 years ago
Ozzieisaacs
a669eacde9
Merge remote-tracking branch 'proxy/patch-1'
6 years ago
Ozzieisaacs
2253708da7
Merge remote-tracking branch 'proxy/patch-1' into Develop
6 years ago
Ozzieisaacs
51e591bd25
Added updated translation
6 years ago
Ozzieisaacs
5188c62bea
Merge remote-tracking branch 'translation/loc-hu'
6 years ago
Ozzieisaacs
2a5f2ff7b3
Merge branch 'master' into Develop
...
# Conflicts:
# cps/templates/readpdf.html
# cps/translations/uk/LC_MESSAGES/messages.po
# cps/web.py
6 years ago
Ozzieisaacs
e754ce313c
Merge remote-tracking branch 'pycountry/pycountry'
6 years ago
Ozzieisaacs
dc933f3d66
Merge remote-tracking branch 'pdf.js/epubjs'
...
Updated pdf.js
6 years ago
Barnabás Nagy
afc79416b2
HU Translation updates
...
Translation of the new untranslated strings
6 years ago
Josh Max
cdfb6bf3e3
Use HTTP_X_FORWARDED_HOST instead of HTTP_X_FORWARDED_SERVER
...
Use HTTP_X_FORWARDED_HOST since HTTP_X_FORWARDED_SERVER holds the hostname of the proxy server on HAProxy/Traefik.
6 years ago
Iris Wildthyme
cbdc9876b2
comicapi dependency now pippable
6 years ago
Iris Wildthyme
05d0f12608
redid comic importing support to handle metadata properly using comicapi from comictagger. needs work to automate installation
6 years ago
Daniel Pavel
858c80bb20
'except' style fix
6 years ago
Daniel Pavel
f7e640fd98
support pycountry if iso-639 is not available
6 years ago
Daniel Pavel
439ce19b5d
Updated epub.js to v0.3.66
6 years ago
Ozzieisaacs
1c9ff6421d
Fix uploader
6 years ago
Ozzieisaacs
4b301a7961
Additional fix for #845 (in case of error)
6 years ago
Ozzieisaacs
dc93222579
Update 2 column author list view
6 years ago
Yijun Zhao
6c493df2f5
support issue: #843
6 years ago
Ozzieisaacs
772f978b45
Improved code quality
6 years ago
Ozzieisaacs
0f1db18eae
Simplified typeahead
6 years ago
Ozzieisaacs
6940bb9b88
Code improvement
6 years ago
Ozzieisaacs
07649d04a3
Fix updater
...
Update translations
Code cleaning updater
6 years ago
Ozzieisaacs
39a3f70084
Fix for slow updater
6 years ago
Ozzieisaacs
8923e71220
Remove debug logging
6 years ago
Ozzieisaacs
843a93fe28
Updater fix for slow servers
6 years ago
OzzieIsaacs
fa36072699
Fix uk translation-file
6 years ago
OzzieIsaacs
8ab9365688
Prevent error 500 for cover of not exisiting book
6 years ago
Chad Bergeron
169ace777a
Fixed infinite scroll for read and unread displays ( #855 )
6 years ago
Elifcan Cakmak
ec2103a3d0
fixed a bug that affects allowing password change for users ( #854 )
6 years ago
Ozzieisaacs
e5593d9a7f
Integrated author in sorting functions
6 years ago
Ozzieisaacs
3f2a9c8bae
Code improvement
6 years ago
Ozzieisaacs
7c69589c5b
Code cosmetics unrar.js
6 years ago
Ozzieisaacs
149e9b4bd4
Code cosmetis unrar
6 years ago
Ozzieisaacs
a360b1759a
Code cosmetics
...
bugfix import HttpError from pydrive
6 years ago
Ozzieisaacs
765b817384
Refactored shelf.py and editbooks.py
6 years ago
Ozzieisaacs
baf83b2f5a
Refactored generating download links
6 years ago
Ozzieisaacs
9c1b3f136f
Improved sorting for rated,random, hot books, read/unread book
6 years ago
Ozzieisaacs
a66873a9e2
Added file formats view
6 years ago
Ozzieisaacs
a0a15b4598
Fix max authors shown
6 years ago
Ozzieisaacs
4a33278596
Update ratings
6 years ago
Ozzieisaacs
6d2270d931
Fixes for Oauth
6 years ago
Ozzieisaacs
1db1c2e7df
Enabling LDAP working again
...
LDAP/Github oauth and Google oauth no credentials/parameters are rejected now
6 years ago
Ozzieisaacs
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
Ozzieisaacs
76d40411dd
Translation updated
6 years ago
Ozzieisaacs
8612dce97c
Merge remote-tracking branch 'author/shorten-authors'
6 years ago
Ozzieisaacs
0b0e62fdf2
Merge remote-tracking branch 'dialog/master'
...
Fix for #833
6 years ago
Ozzieisaacs
6f80a63ca6
Fix for #827
6 years ago
Andrew Sullivan
3dfc2f2580
fixing issue #833
6 years ago
Ozzieisaacs
5b0a0e2139
Fix #835
6 years ago
Ozzieisaacs
9144a7ceb9
Fix for sqlalchemy 1.3
6 years ago
Ozzieisaacs
6f0b3bbda0
Fix for #812
6 years ago
Ozzieisaacs
feb6a71f95
Fix uncompressed cbz files
...
merge from master -> file extension limitation
6 years ago
Ozzieisaacs
1561a4abdf
Comic improvments
6 years ago
Ozzieisaacs
f483ca3214
Code cosmetics
...
Bugfix uploadprogress
Bugfix mature content
Reenable read and unread feature
6 years ago
Ozzieisaacs
466af21548
Code Cosmetics
6 years ago
Ozzieisaacs
0224d45961
Code cosmetics
6 years ago
Ozzieisaacs
0be17ed157
Refactored sidebar (some parts are missing)
6 years ago
Ozzieisaacs
6269a83c3d
Fix mismerge user logon with python3 in opds feed
6 years ago
Ozzieisaacs
f0de822ce7
Start refactor sidebar and view settings sidebar
6 years ago
Ozzieisaacs
fb23db57b4
Added filtering of authors, series, categories, publishers
6 years ago
Ozzieisaacs
11b770b3fb
Fix for #830
...
Fix user with umlauts
6 years ago
Ozzieisaacs
fda977b155
Fix for users with umlauts
6 years ago
Ozzieisaacs
68a36597ab
Fix opds login on python3
6 years ago
Ozzieisaacs
fa276fd0d3
Add scrollbar to metadata load screen
...
Small UI improvements in metadata load screen
6 years ago
Ozzieisaacs
de58d0a4d8
Merge remote-tracking branch 'metadata/Develop' into Develop
...
Update logger for updater
6 years ago
jianyun.zhao
54a006a420
[fix] Add a scroll bar to a long list of meta information
6 years ago
Ozzieisaacs
361a1243d7
Improvements #828
6 years ago
Ozzieisaacs
246d7673a9
Corrected file header with copyright information
6 years ago
Virgil Grigoras
bd7b0175a1
Fix remaining shown by codacy
6 years ago
Virgil Grigoras
f5cf62f209
Fix issues shown by codacy
6 years ago
Virgil Grigoras
15aa49e163
shorten authors in author / discover / index / search and shelf
6 years ago
Virgil Grigoras
3272b4ca1e
configuration field for max_authors
6 years ago
Virgil Grigoras
d3ed0317bb
styling and javascript for hiding authors
6 years ago