1
0
mirror of https://github.com/janeczku/calibre-web synced 2026-06-05 04:02:10 +00:00
Commit Graph

344 Commits

Author SHA1 Message Date
Jack Darlington df9124f78b Fix OPDS download 2017-03-02 09:14:46 +00:00
Jack b8137d2c70 Fixing error with uploading new book / metadata as file was being backed up 2017-03-02 00:28:30 +00:00
Jack Darlington 8e85d1b5bd Merge branch 'develop' into personal 2017-03-01 22:40:28 +00:00
Jack Darlington 78abf81b2f Fix for editing metadata and uploading for GDrive 2017-03-01 22:38:03 +00:00
Jack Darlington 8745d65ff6 Merging ignorable columns 2017-02-28 23:53:32 +00:00
Jack Darlington ee5870c6cf Merge branch 'master' into develop 2017-02-28 22:19:44 +00:00
OzzieIsaacs 90aa269e92 Merge remote-tracking branch 'polish_translation/master'
@radzio1993 : Thanks
2017-02-27 21:15:36 +01:00
Radosław Kierznowski 36264e7400 Update polish translation (POT: 2017-02-20 19:47) 2017-02-27 20:48:46 +01: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
Ozzie Isaacs b876505f22 Delete doubtable.js 2017-02-25 06:15:00 +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
OzzieIsaacs 0277d08706 Merged #123.
Thanks @idalin.
I think this solves permanently sending to kindle issues like (#94)
2017-02-23 19:06:52 +01:00
idalin c98617a1cb Merge branch 'master' into prod 2017-02-23 13:53:36 +08:00
idalin 3dcfebca60 update translations 2017-02-23 13:52:58 +08:00
idalin b488af4c76 Merge branch 'master' into prod 2017-02-23 12:06:56 +08:00
idalin 9020c35819 fixed send to kindle not working problem for some smtp provider. #94 2017-02-23 11:26:39 +08:00
idalin a09a2d9ed0 Merge branch 'master' into prod 2017-02-23 09:31:51 +08:00
idalin 2853ed1477 Merge branch 'janeczku-master' 2017-02-23 09:31:04 +08:00
Jack Darlington 51bd888765 Fix registering watch callback 2017-02-23 00:17:14 +00:00
Jack Darlington 6882dd925f Merge branch 'master' into develop 2017-02-22 23:49:22 +00:00
JackED42 59f3a18998 Update readme.md 2017-02-22 23:48:18 +00:00
JackED42 b9fb621f63 Update readme.md 2017-02-22 23:46:06 +00:00
Jack Darlington 82d01c9001 Merge branch 'master' into develop
# Conflicts:
#	cps/web.py
2017-02-22 22:45:19 +00:00
JackED42 a7cd993caa Merge pull request #1 from janeczku/master
Bringing fork up to date
2017-02-22 22:28:01 +00:00
Jack Darlington ff0e0be2cd Merge branch 'feature/google_drive' into develop 2017-02-22 22:14:48 +00:00
Jack Darlington 7b709c15c2 GitIgnore update + fixes for initial setup 2017-02-22 22:06:59 +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
OzzieIsaacs 6ec4e0a651 Bugfix Updater
Improved logging
2017-02-21 19:40:22 +01:00
idalin 80e6311b93 fetch metadata from douban while editing metadata 2017-02-21 17:49:43 +08:00
idalin 4ec3050082 merge from janeczku/master 2017-02-21 09:40:55 +08:00
OzzieIsaacs 709fa88c62 Navbar reduced to icons on smaller screens
Feedback updater improved (#81)
2017-02-20 19:52:00 +01:00
idalin 829319403c Merge branch 'janeczku-master' 2017-02-20 09:24:22 +08:00
Jack Darlington f71fa5d935 Accidentally committed WIP google drive integration 2017-02-19 22:56:07 +00:00
Jack Darlington 2150aaa485 Merge commit '4f30d88a0a64f632ac25e68723a3824ad850ad64' into develop 2017-02-19 22:44:59 +00:00
JackED42 4f30d88a0a Update readme.md 2017-02-19 22:27:41 +00: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 3cadde6579 Fix for (#117) 2017-02-18 20:12:07 +01:00
OzzieIsaacs 02b0058546 Updated wand (#116) 2017-02-18 18:48:57 +01:00
OzzieIsaacs eaccc3f408 Merge branch 'master' of https://github.com/janeczku/calibre-web 2017-02-18 10:38:35 +01: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
Ozzie Isaacs 075c4c58e7 Revert os.rename to os.renames 2017-02-17 22:54:14 +01:00
OzzieIsaacs ad40a2b5a6 Bugfix parsing publishing date with milliseconds (#114) 2017-02-17 18:22:08 +01:00
Radosław Kierznowski 0307ab6f1f Merge remote-tracking branch 'refs/remotes/janeczku/master' 2017-02-17 16:54:04 +01:00
idalin 42eea35682 Merge branch 'janeczku-master' 2017-02-17 15:07:24 +08:00