Commit Graph
152 Commits
Author SHA1 Message Date
OzzieIsaacs 7c6d527a55 Code cosmetics 2017-04-02 10:05:07 +02:00
OzzieIsaacs 986f40b80a Code cosmetics 2017-03-30 21:17:18 +02:00
OzzieIsaacs cbc807f3ff Fix #138 2017-03-19 20:29:35 +01:00
OzzieIsaacs 60f3fefaec Added Read/Unread to feed
Prevent books from getting multiple times added to shelf
Updated German Translation
2017-03-19 19:22:45 +01:00
OzzieIsaacs 33427d7610 Bugfix opds feed for lists 2017-03-19 17:32:49 +01:00
OzzieIsaacs 0e0e72fb71 Fixes for gevent/gdrive 2017-03-19 17:14:16 +01:00
Jack Darlington 06a4af44cc Merge branch 'master' into develop
# Conflicts:
#	cps/web.py
2017-03-16 21:02:11 +00:00
OzzieIsaacs a87fab8774 - Smaller cover picturees on small devices
- filename for download with underscore
2017-03-14 19:48:17 +01:00
Jack Darlington ff89d9c20d Merge branch 'master' into develop 2017-03-13 14:56:51 +00:00
Jack Darlington 7d31abf920 added jquery.form.js to project locally 2017-03-12 21:20:09 +00:00
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
OzzieIsaacs 74a3e6842a Merge remote-tracking branch 'kennyl/travis'
# Conflicts:
#	cps/web.py
2017-03-12 21:13:25 +01:00
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
2017-03-12 19:12:17 +01:00
林檎 2ef4933f7a Merge branch 'feature/download-suffix-20170309' into travis
# Conflicts:
#	cps/templates/detail.html
2017-03-09 12:38:55 +08:00
林檎 045419e880 Fix #146
For WebUI only
OPDS remains previous behaviour
2017-03-09 12:32:10 +08:00
林檎 a766784ef1 Merge branch 'feature/download-suffix-20170308' into travis 2017-03-09 12:19:46 +08:00
林檎 7bae79d826 fix conflict 2017-03-08 23:56:20 +08:00
林檎 8c625dfb93 Fix #146
For WebUI only
OPDS remains previous behaviour
2017-03-08 13:56:13 +08: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 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 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
idalin a6b2977286 add i18n message for getmeta feature. 2017-03-07 09:46:09 +08:00
Jack Darlington 015d82ae2b Revert "Merging ignorable columns"
This reverts commit 8745d65ff6.
2017-03-03 00:03:46 +00:00
Jack Darlington b6da3c3153 Fix for read/unread for anonymous users 2017-03-02 23:56:07 +00:00
Jack Darlington 8745d65ff6 Merging ignorable columns 2017-02-28 23:53:32 +00:00
Jack Darlington 141eb7901c Add ignorable columns 2017-02-28 23:42:46 +00:00
idalin 54bc299e88 get metadata from douban and google while editing. 2017-02-28 14:58:11 +08:00
idalin e100702345 get metadata from douban and google while editing. 2017-02-28 14:52:55 +08:00
Jack Darlington d9c48a6203 Merge branch 'master' into develop
# Conflicts:
#	cps/db.py
#	cps/web.py
2017-02-26 19:49:49 +00:00
OzzieIsaacs 679effbaef Bugfix placement of "recent downloads in "edit user section" 2017-02-25 13:34:33 +01:00
OzzieIsaacs 156a653c49 Make better usage of big screens in lists 2017-02-25 13:28:57 +01:00
OzzieIsaacs 00763d6e4c Read book is now tied to the right downlolad books for guest users (fixes #110) 2017-02-25 11:14:45 +01:00
OzzieIsaacs 1a83ad713c Additional version info for sqlite database 2017-02-25 09:02:59 +01:00
OzzieIsaacs 40c6ef3a18 More generic aproach for postion of epub coverfile (#122) 2017-02-24 20:20:41 +01:00
OzzieIsaacs 41a20fe3e1 Added version info of dependencys in about section 2017-02-23 19:58:56 +01:00
idalin a09a2d9ed0 Merge branch 'master' into prod 2017-02-23 09:31:51 +08:00
Jack Darlington 82d01c9001 Merge branch 'master' into develop
# Conflicts:
#	cps/web.py
2017-02-22 22:45:19 +00:00
OzzieIsaacs 7e19e1dd9d Added Publisher and search/advanced search/opds search for publisher 2017-02-22 20:59:48 +01:00
Jack Darlington 6d30382ae0 Initial gdrive commit
Work on watching metadata

More efficient storing folder keys to database

Nearly completed. Need to do final touches to callback for when metadata.db updated on real server, as cannot test locally

Changed callback for file changes from being hard coded to mine

used url_for in template as apposed to hard coded links

Fix to drive template

First attempt at redownload metadata.db

Fixed incorrect call to downloadFile

Added logging

Fixed call to copy file

Added exception logging to gdriveutils + fixed string long concat

Fix file download

Fix backup metadata

Added slashes to paths

Removed threading temporarily

Fix for reloading database

Fix reinitialising of variables

Fix check to see if custom column already setup

Update to showing authenticate google drive callback + fix for reinitialising database

Fixed logic for showing authenticate with google drive
2017-02-22 11:20:41 +00:00
idalin 80e6311b93 fetch metadata from douban while editing metadata 2017-02-21 17:49:43 +08:00
OzzieIsaacs 709fa88c62 Navbar reduced to icons on smaller screens
Feedback updater improved (#81)
2017-02-20 19:52:00 +01:00
Jack Darlington d29d079d15 Now shows read in website, and can be toggled by clicking, two extra options in sidebar (read/unread books) 2017-02-19 20:08:22 +00:00
OzzieIsaacs e712649612 Improvement for #83, higher contrast of hamburger menu
Improvement for #84, search is excluded from mobile view
2017-02-18 10:38:16 +01:00
OzzieIsaacs 93b19165cf Added polish in readme to supported UI languages
Handling of missing tags in fb import
naming of path is more imitating calibre (replacement of special characters, "pinyining" of author names if unidecode is available )
Sorting of authors (similar to calibre for jr./sr./I..IV endings)
bugfix pathseparator on windows and linux during upload
bugfix os.rename for authordir
publishing date on detailview is formated according to slected locale
filename on downloading from web ui is now correct displayed
added ids to html for testing
2017-02-15 18:09:17 +01:00
OzzieIsaacs 1692044d46 Merge remote-tracking branch 'default_user_settings/master' (#105) 2017-02-10 20:18:37 +01:00
idalin bff86f02ca settings for default role of new register user 2017-02-09 13:46:07 +08:00
OzzieIsaacs ba8e107402 Move vendored css/js to libs folders to fix language stats 2017-02-07 20:33:08 +01:00