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
Showing
cps/about.py
0 → 100644
cps/admin.py
0 → 100644
This diff is collapsed.
cps/book_formats.py
deleted
100644 → 0
cps/config_sql.py
0 → 100644
This diff is collapsed.
cps/constants.py
0 → 100644
cps/editbooks.py
0 → 100644
This diff is collapsed.
cps/gdrive.py
0 → 100644
This diff is collapsed.
cps/jinjia.py
0 → 100644
cps/logger.py
0 → 100644
cps/oauth.py
0 → 100644
cps/oauth_bb.py
0 → 100644
This diff is collapsed.
cps/opds.py
0 → 100644
This diff is collapsed.
cps/pagination.py
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
cps/services/__init__.py
0 → 100644
This diff is collapsed.
cps/services/goodreads.py
0 → 100644
This diff is collapsed.
cps/services/simpleldap.py
0 → 100644
This diff is collapsed.
cps/shelf.py
0 → 100644
This diff is collapsed.
88 Bytes
88 Bytes
88 Bytes
This diff is collapsed.
160 Bytes
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
cps/static/css/listen.css
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
cps/static/js/filter_list.js
0 → 100644
This diff is collapsed.
This diff is collapsed.
cps/static/js/io/bitstream.js
100755 → 100644
File mode changed from 100755 to 100644
This diff is collapsed.
cps/static/js/libs/bar-ui.js
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
cps/static/js/logviewer.js
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
cps/subproc_wrapper.py
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
cps/templates/listenmp3.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
cps/templates/logviewer.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
cps/templates/shelfdown.html
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.