NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26a7d9ef30
calibre-web/cps
History
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
2019-07-17 19:07:05 +02:00
..
services Merge branch 'Develop' 2019-07-17 19:07:05 +02:00
static Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
templates Fix feature support 2019-07-14 13:20:40 +02:00
translations Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
__init__.py Merge branch 'Develop' 2019-07-17 19:07:05 +02:00
about.py about page: build the versions dictionary only once 2019-07-14 21:15:46 +03:00
admin.py Merge branch 'Develop' 2019-07-17 19:07:05 +02:00
cache_buster.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
cli.py use the standard socket library to validate the ip address argument 2019-07-14 22:06:40 +03:00
comic.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
config_sql.py Merge branch 'Develop' 2019-07-17 19:07:05 +02:00
constants.py Merge branch 'Develop' 2019-07-17 19:07:05 +02:00
converter.py about page: build the versions dictionary only once 2019-07-14 21:15:46 +03:00
db.py Merge branch 'Develop' 2019-07-17 19:07:05 +02:00
editbooks.py Merge branch 'Develop' 2019-07-17 19:07:05 +02:00
epub.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
fb2.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
gdrive.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
gdriveutils.py Deactivate ldap 2019-07-14 18:37:44 +02:00
helper.py Merge branch 'Develop' 2019-07-17 19:07:05 +02:00
isoLanguages.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
jinjia.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
logger.py Merge branch 'Develop' 2019-07-17 19:07:05 +02:00
oauth_bb.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
oauth.py Add licence to oauth 2019-07-16 21:08:37 +02:00
opds.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
pagination.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
redirect.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
reverseproxy.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
server.py use the standard socket library to validate the ip address argument 2019-07-14 22:06:40 +03:00
shelf.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
subproc_wrapper.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
ub.py more robust disposing of database session 2019-07-14 14:44:48 +03:00
updater.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
uploader.py Merge branch 'Develop' 2019-07-13 20:54:21 +02:00
web.py Merge branch 'Develop' 2019-07-17 19:07:05 +02:00
worker.py Merge branch 'Develop' 2019-07-17 19:07:05 +02:00