Commit Graph
343 Commits
Author SHA1 Message Date
Jack Darlington 537977e497 Changed “have read” to checkbox 2017-03-12 21:13:14 +00:00
Jack Darlington 8f2088a3ea Updated use google drive checkbox 2017-03-12 21:03:01 +00:00
Jack Darlington 5a2e77baaf fix for form input ID 2017-03-12 20:52:56 +00:00
Jack Darlington 2ffa847803 Merge branch 'master' into develop 2017-03-12 12:37:38 +00:00
Jack Darlington dad251d02c Fix for revoking already expired channel (drive) 2017-03-12 00:24:53 +00:00
OzzieIsaacs dbf07cb593 Updated translations 2017-03-11 09:11:19 +01:00
Jack Darlington e3a2bd348c Merge branch 'develop' into personal 2017-03-08 00:30:00 +00:00
Jack Darlington 6ab8d0330a Fix for editing book cover with drive + fixed found bug that has_cover not set 2017-03-08 00:26:15 +00:00
Jack Darlington 21b1a45023 Merge branch 'develop' into personal
# Conflicts:
#	cps/web.py
2017-03-07 22:05:56 +00:00
Jack Darlington cf1ca21bbc Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/ub.py
#	cps/web.py
#	readme.md
#	requirements.txt
2017-03-07 22:03:10 +00:00
OzzieIsaacs a752e62963 Fix Import problem on python2 2017-03-07 21:08:28 +01:00
OzzieIsaacs c725afc3a8 Merge remote-tracking branch 'JackED42/feature/ignorable_columns' 2017-03-07 20:36:43 +01:00
OzzieIsaacs 38c782fcf1 Merge remote-tracking branch 'Douban/prod'
# Conflicts:
#	cps/templates/book_edit.html
2017-03-07 20:30:55 +01:00
OzzieIsaacs 80f1276624 Merge remote-tracking branch 'gitignore/fix/syntax-python3-20170305'
# Conflicts:
#	cps/db.py
#	cps/web.py
#	requirements.txt
2017-03-07 20:22:28 +01:00
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
2017-03-07 19:46:23 +01:00
OzzieIsaacs 72ec9a9f17 Merge remote-tracking branch 'gitignore/fix/patch-issue-20170307' 2017-03-07 19:15:40 +01:00
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)
2017-03-07 19:10:17 +01:00
林檎 53cc84ec18 #fix 148 2017-03-07 16:32:55 +08:00
Kennyl fc10f55bd4 Merge branch 'master' into fix/syntax-python3-20170305 2017-03-07 14:06:29 +08:00
idalin bdf28e1475 fix bug for metadata searching result. 2017-03-07 09:49:59 +08:00
idalin a6b2977286 add i18n message for getmeta feature. 2017-03-07 09:46:09 +08:00
idalin f8e4bed8bf Merge branch 'janeczku-master' 2017-03-07 09:01:56 +08:00
Jack Darlington a1cb349fda Merge branch 'develop' into personal 2017-03-06 23:18:29 +00:00
Jack Darlington e4a27be1a9 Made stream download for normal download as well as odds 2017-03-06 23:17:57 +00:00
Jack Darlington e3e26d418d Finished code to chunk successfully. 2017-03-06 22:50:24 +00:00
Jack Darlington 10b129cb07 add timestamps 2017-03-06 21:05:21 +00:00
Jack Darlington 76e8117b0c initial version 2017-03-06 20:58:15 +00:00
Jack Darlington 3ba76526ee Merge branch 'master' into feature/ignorable_columns 2017-03-06 19:24:24 +00:00
Jack Darlington 475daaec75 Merge branch 'develop' into personal 2017-03-06 19:23:36 +00:00
Jack Darlington fabfcb2036 Merge branch 'master' into develop
# Conflicts:
#	.gitignore
#	cps/web.py
2017-03-06 19:17:00 +00:00
OzzieIsaacs 789a1af68f Merge remote-tracking branch 'gitignore/refactor/patch-bookmeta-20170304' 2017-03-06 19:25:49 +01:00
OzzieIsaacs e0c35b7420 Merge remote-tracking branch 'polish_translation/master'
# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
2017-03-06 19:21:17 +01:00
OzzieIsaacs 26438f97ab Bugfix Filename without unidecode dependency 2017-03-06 19:19:14 +01:00
林檎 297a08cd5f xrange fix
range to xrange
2017-03-06 19:47:58 +08:00
林檎 0c9eacb024 fix opds 2017-03-06 16:35:00 +08:00
林檎 4dfa157161 use condition rather than try/catch 2017-03-06 13:42:00 +08:00
林檎 6e3d4877ed Change exception from legacy code.
Change all except: clause to except Exception as e:  for further revise.
2017-03-06 11:53:17 +08:00
林檎 0bc4f52783 Fix except clause
except: will catch specific error.
2017-03-06 11:44:54 +08:00
林檎 80bcf131ee add requirement.txt 2017-03-05 22:53:59 +08:00
林檎 1da3b57f5a no need future module for python2
fix missing StringIO
2017-03-05 19:23:49 +08:00
林檎 bf8688fee1 missing urllib migration 2017-03-05 18:48:59 +08:00
林檎 c3fd205b7d fix /stat 2017-03-05 18:18:22 +08:00
林檎 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
2017-03-05 17:40:39 +08:00
Radosław Kierznowski cbc47c754e Update polish translation
I fixed some of the phrases more understandable.
2017-03-04 21:41:54 +01:00
林檎 e845bdbd56 Fix attachment filename
File attachment should be url encode rather than utf-8 format
2017-03-05 00:28:37 +08:00
林檎 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%>
2017-03-04 15:48:59 +08:00
林檎 29f21480ab Reuse original code logic.
iteration loop dc:*  add dc:language

removal of bookmeta[‘comments’] , reusing bootmeta[‘description’]
2017-03-04 15:37:30 +08:00
Jack Darlington c702b14340 Fixes for READ/UNREAD 2017-03-03 21:38:54 +00:00
Jack Darlington 27cbab6cb7 Fixes for READ/UNREAD 2017-03-03 21:09:53 +00:00
OzzieIsaacs 8c7ba2ccdf Merge remote-tracking branch 'gitignore/bookmeta-patch-20170302'
# Conflicts:
#	cps/epub.py
2017-03-03 19:48:02 +01:00