Commit Graph

455 Commits (5a6ad970d8546e3313dd95bc9a1ce081077230ef)

Author SHA1 Message Date
林檎 b51afe3ead Code Fix
Fix pagination logic.

_ is gettext , use __ as dummy variable instead of _

Need more test.

Test on following
http://localhost:8083/opds/new
http://localhost:8083/opds/new?offset=60
http://localhost:8083/opds/new?offset=120
7 years ago
OzzieIsaacs 7a07edaff4 Update polish translation 7 years ago
Radosław Kierznowski 3c3720aa0f Update polish translation (POT: 2017-04-11 22:51) 7 years ago
Radosław Kierznowski ccf563023b Merge remote-tracking branch 'refs/remotes/janeczku/master' 7 years ago
林檎 622b1435f1 Fix #172 7 years ago
OzzieIsaacs fb43110f1c Merge remote-tracking branch 'spanish_translation/master' 7 years ago
OzzieIsaacs 699bd036e8 Code cosmetics 7 years ago
Gonzalo Cao Cabeza de Vaca 286196fa1d Updated spanish translations 7 years ago
OzzieIsaacs dc45b53b24 code cosmetics 7 years ago
OzzieIsaacs 8c7a8a954a Code cosmetics 7 years ago
OzzieIsaacs d59be5faf4 Code cosmetics
Bugfix upload
7 years ago
OzzieIsaacs ab534b21c1 Code cosmetics 7 years ago
OzzieIsaacs 7dd70db837 Code cosmetics 7 years ago
OzzieIsaacs 7c6d527a55 Code cosmetics 7 years ago
OzzieIsaacs 66181daf6d Merge remote-tracking branch 'custom-dbpath' 7 years ago
OzzieIsaacs 79d5bab4ba Code cosmetics 7 years ago
OzzieIsaacs 5044b78b08 Code cosmetics 7 years ago
OzzieIsaacs 00462237fe Merge remote-tracking branch 'chinese_translation/master' 7 years ago
OzzieIsaacs 986f40b80a Code cosmetics 7 years ago
OzzieIsaacs 78067b87bc Code cosmetics 7 years ago
OzzieIsaacs 395c6679b7 Fix #163 7 years ago
林檎 ebb3acecca Fix Download Bug. 7 years ago
Ivan Smirnov 2c173f9848 Read dbpath from $CALIBRE_DBPATH if present
This is an exploration in potentially enabling multiple libraries to run using the same engine. 

Since app config is all in the db, we should get no port conflicts and be able to run multiple instances of this app with no issues.

Using os.getenv instead of os.environ.get allows us to provide CALIBRE_DBPATH inline with the invocation of the file (`CALIBRE_DBPATH=/foo/bar/` python cps.py)
7 years ago
idalin 4d8b43bd54 update Simplified Chinese translation 7 years ago
Radosław Kierznowski 55ee323ca1 Merge remote-tracking branch 'refs/remotes/janeczku/master'
# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
7 years ago
OzzieIsaacs cbc807f3ff Fix #138 7 years ago
OzzieIsaacs 60f3fefaec Added Read/Unread to feed
Prevent books from getting multiple times added to shelf
Updated German Translation
7 years ago
OzzieIsaacs 33427d7610 Bugfix opds feed for lists 7 years ago
OzzieIsaacs 0e0e72fb71 Fixes for gevent/gdrive 7 years ago
Radosław Kierznowski 9c5fe444e6 POT: 2017-03-12 19:10 7 years ago
Jack Darlington 3916205a95 Gdrive optional 7 years ago
Jack Darlington b352bbfd14 Fix for gevent as optional 7 years ago
Jack Darlington 06a4af44cc Merge branch 'master' into develop
# Conflicts:
#	cps/web.py
7 years ago
OzzieIsaacs a87fab8774 - Smaller cover picturees on small devices
- filename for download with underscore
7 years ago
Jack Darlington ff89d9c20d Merge branch 'master' into develop 7 years ago
Kennyl 59bf568f7e Merge branch 'master' into fix/python3-patch-20170308 7 years ago
Jack Darlington 29462e2278 Fix for updater 7 years ago
Jack Darlington 7d31abf920 added jquery.form.js to project locally 7 years ago
Jack Darlington 537977e497 Changed “have read” to checkbox 7 years ago
Jack Darlington 8f2088a3ea Updated use google drive checkbox 7 years ago
Jack Darlington 5a2e77baaf fix for form input ID 7 years ago
OzzieIsaacs 74a3e6842a Merge remote-tracking branch 'kennyl/travis'
# Conflicts:
#	cps/web.py
7 years ago
OzzieIsaacs b081bc8672 Fix #157 7 years ago
OzzieIsaacs 16cac6ac4f Merge remote-tracking branch 'polish_update/master'
# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po

Fix for #147
7 years ago
Jack Darlington 2ffa847803 Merge branch 'master' into develop 7 years ago
Jack Darlington dad251d02c Fix for revoking already expired channel (drive) 7 years ago
Radosław Kierznowski 89fa9eb02f Update polish translation
Calibre Web - polski (POT: 2017-03-11 09:09)
7 years ago
OzzieIsaacs dbf07cb593 Updated translations 7 years ago
林檎 2ef4933f7a Merge branch 'feature/download-suffix-20170309' into travis
# Conflicts:
#	cps/templates/detail.html
7 years ago
林檎 045419e880 Fix #146
For WebUI only
OPDS remains previous behaviour
7 years ago
林檎 a766784ef1 Merge branch 'feature/download-suffix-20170308' into travis 7 years ago
林檎 d7d29827f4 fix behind 7 years ago
林檎 7bae79d826 fix conflict 7 years ago
林檎 a7d361a0ff merge conflict 7 years ago
林檎 dcc0958c39 Merge branch 'master' into travis
# Conflicts:
#	cps/epub.py
#	cps/web.py
#	readme.md
7 years ago
林檎 8c625dfb93 Fix #146
For WebUI only
OPDS remains previous behaviour
7 years ago
林檎 d7afbdc349 use quote instead of urllib.quote 7 years ago
林檎 108302ff9b remove dependency on future function
no need six or future if there is only one function.
7 years ago
Jack Darlington e3a2bd348c Merge branch 'develop' into personal 7 years ago
Jack Darlington 6ab8d0330a Fix for editing book cover with drive + fixed found bug that has_cover not set 7 years ago
Jack Darlington 21b1a45023 Merge branch 'develop' into personal
# Conflicts:
#	cps/web.py
7 years ago
Jack Darlington cf1ca21bbc Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/ub.py
#	cps/web.py
#	readme.md
#	requirements.txt
7 years ago
OzzieIsaacs a752e62963 Fix Import problem on python2 7 years ago
OzzieIsaacs c725afc3a8 Merge remote-tracking branch 'JackED42/feature/ignorable_columns' 7 years ago
OzzieIsaacs 38c782fcf1 Merge remote-tracking branch 'Douban/prod'
# Conflicts:
#	cps/templates/book_edit.html
7 years ago
OzzieIsaacs 80f1276624 Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
# Conflicts:
#	cps/db.py
#	cps/web.py
#	requirements.txt
7 years ago
OzzieIsaacs acac0570e5 Merge remote-tracking branch 'use_pip/use-pip'
# Conflicts:
#	cps.py
#	readme.md
#	vendor/wand/api.py
#	vendor/wand/drawing.py
#	vendor/wand/exceptions.py
#	vendor/wand/image.py
#	vendor/wand/version.py
7 years ago
OzzieIsaacs 72ec9a9f17 Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307' 7 years ago
OzzieIsaacs edadf84710 Added editing star rating graphically
Added ability to reload database connection (refresh problem)
Bugfix display hot books (no hot books, hot books are deleted books, no longer result in error 500)
7 years ago
林檎 53cc84ec18 #fix 148 7 years ago
Kennyl fc10f55bd4 Merge branch 'master' into fix/syntax-python3-20170305 7 years ago
林檎 7a14101d6f Merge branch 'master' into travis
# Conflicts:
#	cps/helper.py
#	cps/web.py
7 years ago
idalin bdf28e1475 fix bug for metadata searching result. 7 years ago
idalin a6b2977286 add i18n message for getmeta feature. 7 years ago
idalin f8e4bed8bf Merge branch 'janeczku-master' 7 years ago
Jack Darlington a1cb349fda Merge branch 'develop' into personal 7 years ago
Jack Darlington e4a27be1a9 Made stream download for normal download as well as odds 7 years ago
Jack Darlington e3e26d418d Finished code to chunk successfully. 7 years ago
Jack Darlington 10b129cb07 add timestamps 7 years ago
Jack Darlington 76e8117b0c initial version 7 years ago
Jack Darlington 3ba76526ee Merge branch 'master' into feature/ignorable_columns 7 years ago
Jack Darlington 475daaec75 Merge branch 'develop' into personal 7 years ago
Jack Darlington fabfcb2036 Merge branch 'master' into develop
# Conflicts:
#	.gitignore
#	cps/web.py
7 years ago
OzzieIsaacs 789a1af68f Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304' 7 years ago
OzzieIsaacs e0c35b7420 Merge remote-tracking branch 'polish_translation/master'
# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
7 years ago
OzzieIsaacs 26438f97ab Bugfix Filename without unidecode dependency 7 years ago
林檎 07ad73caca Merge branch 'fix/syntax-python3-20170305' into travis 7 years ago
林檎 297a08cd5f xrange fix
range to xrange
7 years ago
林檎 dc985e76df python3 fix 7 years ago
林檎 3421db2096 Merge branch 'fix/attachment-patch-20170305' into travis 7 years ago
林檎 0c9eacb024 fix opds 7 years ago
林檎 376eb8752e wrong conflict merge 7 years ago
林檎 3369972073 Merge branch 'fix/syntax-python3-20170305' into travis
# Conflicts:
#	cps/epub.py
#	cps/web.py
7 years ago
林檎 4dfa157161 use condition rather than try/catch 7 years ago
林檎 6e3d4877ed Change exception from legacy code.
Change all except: clause to except Exception as e:  for further revise.
7 years ago
林檎 0bc4f52783 Fix except clause
except: will catch specific error.
7 years ago
林檎 80bcf131ee add requirement.txt 7 years ago
林檎 1da3b57f5a no need future module for python2
fix missing StringIO
7 years ago
林檎 bf8688fee1 missing urllib migration 7 years ago
林檎 da8d0c2a9f Merge branch 'fix/syntax-python3-20170305' into travis 7 years ago