Jack Darlington fabfcb2036 Merge branch 'master' into develop ...

# Conflicts:
#	.gitignore
#	cps/web.py

2017-03-06 19:17:00 +00:00

..

static

Additional version info for sqlite database

2017-02-25 09:02:59 +01:00

templates

Revert "Merging ignorable columns"

2017-03-03 00:03:46 +00:00

translations

Merge remote-tracking branch 'polish_translation/master'

2017-03-06 19:21:17 +01:00

__init__.py

custom columns unfinished

2016-04-20 19:25:47 +02:00

book_formats.py

Reuse original code logic.

2017-03-04 15:37:30 +08:00

db.py

Merge branch 'master' into develop

2017-03-06 19:17:00 +00:00

epub.py

Refactor cover detection

2017-03-04 15:48:59 +08:00

fb2.py

Upload support detection of language

2017-03-02 22:57:02 +08:00

gdriveutils.py

Update for covers download via opds + inserts permissions if needed (only available with a link)

2017-03-02 23:55:32 +00:00

helper.py

Merge branch 'master' into develop

2017-03-06 19:17:00 +00:00

ub.py

Fixes for READ/UNREAD

2017-03-03 21:09:53 +00:00

uploader.py

Reuse original code logic.

2017-03-04 15:37:30 +08:00

web.py

Merge branch 'master' into develop

2017-03-06 19:17:00 +00:00