Commit Graph

340 Commits (2ffa847803172032c98131473d22001edf740ff2)

Author SHA1 Message Date
Jack Darlington 2ffa847803 Merge branch 'master' into develop 8 years ago
Jack Darlington dad251d02c Fix for revoking already expired channel (drive) 8 years ago
OzzieIsaacs dbf07cb593 Updated translations 8 years ago
Jack Darlington e3a2bd348c Merge branch 'develop' into personal 8 years ago
Jack Darlington 6ab8d0330a Fix for editing book cover with drive + fixed found bug that has_cover not set 8 years ago
Jack Darlington 21b1a45023 Merge branch 'develop' into personal
# Conflicts:
#	cps/web.py
8 years ago
Jack Darlington cf1ca21bbc Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/ub.py
#	cps/web.py
#	readme.md
#	requirements.txt
8 years ago
OzzieIsaacs a752e62963 Fix Import problem on python2 8 years ago
OzzieIsaacs c725afc3a8 Merge remote-tracking branch 'JackED42/feature/ignorable_columns' 8 years ago
OzzieIsaacs 38c782fcf1 Merge remote-tracking branch 'Douban/prod'
# Conflicts:
#	cps/templates/book_edit.html
8 years ago
OzzieIsaacs 80f1276624 Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
# Conflicts:
#	cps/db.py
#	cps/web.py
#	requirements.txt
8 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
8 years ago
OzzieIsaacs 72ec9a9f17 Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307' 8 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)
8 years ago
林檎 53cc84ec18 #fix 148 8 years ago
Kennyl fc10f55bd4 Merge branch 'master' into fix/syntax-python3-20170305 8 years ago
idalin bdf28e1475 fix bug for metadata searching result. 8 years ago
idalin a6b2977286 add i18n message for getmeta feature. 8 years ago
idalin f8e4bed8bf Merge branch 'janeczku-master' 8 years ago
Jack Darlington a1cb349fda Merge branch 'develop' into personal 8 years ago
Jack Darlington e4a27be1a9 Made stream download for normal download as well as odds 8 years ago
Jack Darlington e3e26d418d Finished code to chunk successfully. 8 years ago
Jack Darlington 10b129cb07 add timestamps 8 years ago
Jack Darlington 76e8117b0c initial version 8 years ago
Jack Darlington 3ba76526ee Merge branch 'master' into feature/ignorable_columns 8 years ago
Jack Darlington 475daaec75 Merge branch 'develop' into personal 8 years ago
Jack Darlington fabfcb2036 Merge branch 'master' into develop
# Conflicts:
#	.gitignore
#	cps/web.py
8 years ago
OzzieIsaacs 789a1af68f Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304' 8 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
8 years ago
OzzieIsaacs 26438f97ab Bugfix Filename without unidecode dependency 8 years ago
林檎 297a08cd5f xrange fix
range to xrange
8 years ago
林檎 0c9eacb024 fix opds 8 years ago
林檎 4dfa157161 use condition rather than try/catch 8 years ago
林檎 6e3d4877ed Change exception from legacy code.
Change all except: clause to except Exception as e:  for further revise.
8 years ago
林檎 0bc4f52783 Fix except clause
except: will catch specific error.
8 years ago
林檎 80bcf131ee add requirement.txt 8 years ago
林檎 1da3b57f5a no need future module for python2
fix missing StringIO
8 years ago
林檎 bf8688fee1 missing urllib migration 8 years ago
林檎 c3fd205b7d fix /stat 8 years ago
林檎 b70191ca2a Least change to adapt with python3
change some syntax
- except clause
- unicode -> bulitins.str
- sqllite uri
- fix import local path
- 01 to 1  (0 is meaningless)

add module
- future
- builtins (from future)
- imp (python3 )
- past (from future)
- sqlalchemy (update one)

refer to
http://python-future.org/compatible_idioms.html
8 years ago
Radosław Kierznowski cbc47c754e Update polish translation
I fixed some of the phrases more understandable.
8 years ago
林檎 e845bdbd56 Fix attachment filename
File attachment should be url encode rather than utf-8 format
8 years ago
林檎 a850e64bfb Refactor cover detection
obsolate hardcode %cover_id%= ‘cover’ in <pkg:item name=%cover_id% href=%coverfile%>
now  %cover_id% retrieve from <meta name=“cover” content=%cover_id%>
8 years ago
林檎 29f21480ab Reuse original code logic.
iteration loop dc:*  add dc:language

removal of bookmeta[‘comments’] , reusing bootmeta[‘description’]
8 years ago
Jack Darlington c702b14340 Fixes for READ/UNREAD 8 years ago
Jack Darlington 27cbab6cb7 Fixes for READ/UNREAD 8 years ago
OzzieIsaacs 8c7ba2ccdf Merge remote-tracking branch 'gitignore/bookmeta-patch-20170302'
# Conflicts:
#	cps/epub.py
8 years ago
林檎 1a10859a57 When upload pub, add description to comment accord opf file 8 years ago
Jack Darlington 015d82ae2b Revert "Merging ignorable columns"
This reverts commit 8745d65ff6.
8 years ago
Jack Darlington b6da3c3153 Fix for read/unread for anonymous users 8 years ago