1034 Commits

Author	SHA1	Message	Date
Adrian Petrescu	5341910ea5	Deal gracefully with invalid Accept-Languages header ... At the moment, calibre-web will raise an internal 500 error if an invalid locale identifier is passed in through the `Accept-Language` HTTP header (for a non-logged-in user). This breaks some crappily-built OPDS feed readers, and there's no reason to error out so severely. This commit just gracefully falls back to `en` if it can't parse the locale identifier. Fixes #743 among others.	2019-01-03 11:45:15 -05:00
Ozzieisaacs	9cfe1dce20	Fix #739	2018-12-30 14:25:03 +01:00
Ozzieisaacs	d0fd1a4601	Merged new caliblur theme ... Fix for new users created Fix for options to the calibre-converter Only the first 300 chars are logged for the emailbody (spamming of logfile is prevented) Added class to "Random" header	2018-12-27 10:53:19 +01:00
grunjol	462cf20a34	Process all custom columns on editing	2018-12-24 13:05:47 -03:00
grunjol	00ba231fbf	fix adding an existing language to a book	2018-12-24 12:32:22 -03:00
Ozzieisaacs	81e3afbcc4	Fix #714 (advanced search for ratings)	2018-12-02 12:48:12 +01:00
Ozzieisaacs	7526b0dcb4	Fix #623, #715	2018-11-28 18:28:55 +01:00
Ozzieisaacs	863b77a5d7	Fix #711 ... Fixing for send to kindle after uploading codecleaning	2018-11-25 11:25:20 +01:00
Ozzieisaacs	b78130e3b1	Merge remote-tracking branch '681/681-fix'	2018-11-25 07:19:00 +01:00
haseo	e1b6fa25e9	A better solution to #681	2018-11-19 15:54:28 +08:00
Ozzieisaacs	dfa17956c9	Merge remote-tracking branch 'bbb/295---Send-AZW-to-Kindle' ... Changed function for 295, azw3 is preferred format for sending to kindle	2018-11-18 17:09:13 +01:00
Ozzieisaacs	2422f782de	Fix #701	2018-11-17 16:51:30 +01:00
Ozzieisaacs	07d7be176c	Merge remote-tracking branch 'lang/master'	2018-11-17 16:32:55 +01:00
dalin	947622800c	Update Simplified Chinese translation. Fix #681 in the case of Simplified Chinese.	2018-11-14 18:14:11 +08:00
Ozzieisaacs	399dffba5a	log file name in case of filename not found (#691)	2018-11-03 18:37:38 +01:00
Ozzieisaacs	89bddead35	Merge remote-tracking branch 'http_error/beautify-http-errors'	2018-11-03 17:38:52 +01:00
Ozzieisaacs	c3bec48bc7	Fix #617 ... Additional texts translated	2018-11-03 13:43:38 +01:00
Ozzieisaacs	c582a70498	Merge remote-tracking branch 'bbb/617'	2018-11-03 10:40:00 +01:00
Ozzieisaacs	0df35dcfea	Update Updater	2018-11-01 13:47:05 +01:00
Ozzieisaacs	cc7dcfb35a	Update Updater ... Bugfix author in opds-feed	2018-11-01 13:44:00 +01:00
Ozzieisaacs	ee85492c7d	Fix #662	2018-10-30 21:47:33 +01:00
Ozzieisaacs	3f83be00fd	Fix #687	2018-10-29 20:38:09 +01:00
Ozzieisaacs	6ec9bc9e5c	Bugfix Publisher (upper/lower case, remove publisher, publisher visibility on new users) ... 404 messages on non existing categorys, languages, series Updated Testresult	2018-10-28 21:33:12 +01:00
Jim Ma	4b76b8400d	Add OAuth link&unlink in user profile	2018-10-14 16:51:00 +08:00
Jim Ma	1abbcfa3c6	Add OAuth support: GitHub & Google	2018-10-14 16:51:00 +08:00
otapi	c6d3613e57	Add UI link button to shelves	2018-10-11 18:20:38 +02:00
otapi	e0229c917c	Download only shelf ... Show only titles and download button for specific shelf. Currently only direct link works, e.g: calibre-web/shelfdown/6	2018-10-10 23:01:05 +02:00
bodybybuddha	ee686b5379	Fix for #617 ... Task table: Status column and task messages have been localized Cleaned up the use of the task fields 'typ' and 'type' to be taskType and taskMessage	2018-10-03 15:58:37 -04:00
Ozzie Isaacs	7253f583cf	Fix #650 ... Improved testablility Added feedback for book_edit -> stay on edit page	2018-10-03 21:18:08 +02:00
bodybybuddha	54f8680058	Merge branch 'master' of https://github.com/janeczku/calibre-web into 617	2018-10-03 11:58:25 -04:00
OzzieIsaacs	40cc25de7a	Merge remote-tracking branch 'bbb/621' ... Fixes after testing	2018-10-03 14:03:08 +02:00
bodybybuddha	5d34fd7fec	Send to Kindle button precheck added ... Based on existing book formats and which converter (if any) determine if button can be seen.	2018-10-01 14:19:29 -04:00
Virgil Grigoras	a798dc94a9	Satisfy "Codacy/PR Quality Review"	2018-10-01 10:45:51 +02:00
Virgil Grigoras	60e9d01d27	Beautify http errors	2018-10-01 10:35:13 +02:00
Virgil Grigoras	1ac9b3d837	Update OPDS-part to display publishers	2018-09-30 18:48:36 +02:00
Virgil Grigoras	5129bc3601	Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page	2018-09-30 18:30:24 +02:00
bodybybuddha	1b363ac720	Merged master into 617 - fixed import copy conflict	2018-09-30 11:37:21 -04:00
Virgil Grigoras	016c7b4b1c	Add ability to store and edit publishers	2018-09-30 14:08:55 +02:00
OzzieIsaacs	5a2ed58d06	Improved message for non configured ebook converter ... Gdrive cleared interface (drive variable) refactored web -> reverseproxy outsourced, edit_books split, removed unused md5 function rearanged imports added Wand and pytz Version info to stats Page	2018-09-30 09:43:20 +02:00
OzzieIsaacs	ffe3dd3de3	Show version of Werkzeug and Jinja2 in stats page	2018-09-29 19:21:04 +02:00
bodybybuddha	a7386ecb8b	Merge branch 'master' of https://github.com/janeczku/calibre-web into 621	2018-09-29 13:13:58 -04:00
bodybybuddha	9b1954f2f0	Merge branch 'master' of https://github.com/janeczku/calibre-web into 617	2018-09-29 13:13:17 -04:00
Ozzie Isaacs	cd0fc917d7	Bugfix template rights at creating user ... Added errormessages for shelf actions Additional ids for better testability	2018-09-27 22:04:57 +02:00
bodybybuddha	29efcf8358	Merge branch 'master' of https://github.com/janeczku/calibre-web into 617	2018-09-23 19:53:47 -04:00
bodybybuddha	d2e74a27cd	Merge branch 'master' of https://github.com/janeczku/calibre-web into 621	2018-09-23 19:51:32 -04:00
OzzieIsaacs	ba7c734657	Fixes from testing: ... Certificate files are rejected if not both files are provided Server shuts down controlled after pressing crtl+c Logfile location is better checked improvements for better testing (added ids and name in templates)	2018-09-23 19:15:50 +02:00
OzzieIsaacs	aa5127cd16	Merge remote-tracking branch 'lxml/master'	2018-09-23 18:58:08 +02:00
OzzieIsaacs	b841baf714	Comment for adding publishers	2018-09-23 18:56:19 +02:00
Fatih Ka	76e3be58e6	Delete book fixed ... There was an incorrect parameter.	2018-09-19 21:38:40 +03:00
bodybybuddha	b4122e9858	Partial fix to #617. Local status messages now work.	2018-09-19 11:26:52 -04:00
trasba	3fa41d0e4a	added formats for upload and conversion ... added formats for upload and conversion (html, rtf, odt)	2018-09-17 21:55:41 +02:00
bodybybuddha	be0ddf25e4	Fix for #621 - Login page always in english	2018-09-17 13:03:29 -04:00
OzzieIsaacs	4eeeb02b1d	Merge remote-tracking branch 'update_check/master'	2018-09-14 21:12:45 +02:00
OzzieIsaacs	968cddf2b0	Fix for #620	2018-09-10 19:31:56 +02:00
Virgil Grigoras	e08eccba5a	Satisfy "Codacy/PR Quality Review"	2018-09-10 18:21:44 +02:00
Virgil Grigoras	50ded1afc1	typo fix	2018-09-10 11:28:32 +02:00
Virgil Grigoras	b2b092c190	Bugfix for not displaying information when there is no update available + simplification	2018-09-10 11:20:34 +02:00
Virgil Grigoras	f7872aded0	Own function for getting the current commit hash and datetime	2018-09-10 10:42:28 +02:00
Virgil Grigoras	cb5adb3a31	Display "what's new" information for newer versions than the current one	2018-09-09 21:54:51 +02:00
OzzieIsaacs	01fb8ee681	Fix #609 ... Removed formats which are not possible to convert from list of convertable books Update language files to be po-edit compatible	2018-09-09 18:17:15 +02:00
Virgil Grigoras	6e2dbb7cd6	move current commit hash to its own file	2018-09-09 13:00:46 +02:00
Virgil Grigoras	f477d48c7c	More robust handling while checking for new updates	2018-09-09 11:46:00 +02:00
OzzieIsaacs	bb7d2c6273	Update Language translation table (now including the locale language) ... Fix #602 Fix for #593	2018-09-09 10:13:08 +02:00
OzzieIsaacs	79ee07ea54	Fix for python3 and pickle	2018-09-09 09:41:46 +02:00
OzzieIsaacs	ce6cde545b	Update french language	2018-09-08 21:16:56 +02:00
OzzieIsaacs	919de60e8d	Final fix #615	2018-09-08 14:58:00 +02:00
OzzieIsaacs	a5d15a19de	Update Translation "->'	2018-09-08 14:50:52 +02:00
Ozzie Isaacs	2de41a5c86	improvement for #615	2018-09-08 13:27:28 +02:00
OzzieIsaacs	9d0f583d4f	Updated french and chinese language. Thanks to @idalin and Olivier ... Fixed bug some translations are not shown	2018-09-08 12:28:48 +02:00
OzzieIsaacs	0091006aad	Fix #611 ... Fix for #615	2018-09-07 20:04:35 +02:00
OzzieIsaacs	0bcb20f674	Fix #604 ... Added missing translation for "select option"	2018-09-03 19:12:15 +02:00
OzzieIsaacs	0e1711631c	Fix for #600 ... publisher-info is shown on edit page (#599)	2018-09-02 17:21:01 +02:00
OzzieIsaacs	66824ff4e4	Fix #576	2018-09-02 13:58:17 +02:00
OzzieIsaacs	06ffa5e66d	Fix displaying random books with no author entry ... Code cosmentics for opds feed Narrowed exceptions on language not found Fix password changing	2018-09-02 11:48:58 +02:00
OzzieIsaacs	4a95404e17	Merge remote-tracking branch 'Convert_all/ebookconvert-any' ... # Conflicts: # cps/web.py	2018-08-31 15:00:22 +02:00
OzzieIsaacs	3f35200a0b	Merge remote-tracking branch 'Comic/comic_server' ... # Conflicts: # cps/helper.py # cps/static/js/archive.js # cps/static/js/io.js # cps/static/js/kthoom.js # cps/static/js/unrar.js # cps/static/js/untar.js # cps/static/js/unzip.js # cps/templates/config_edit.html # cps/templates/detail.html # cps/templates/readcbr.html # cps/templates/stats.html # cps/ub.py # cps/web.py # optional-requirements.txt	2018-08-31 10:47:58 +02:00
OzzieIsaacs	9c889d1681	Fix #597 ... Updated language files	2018-08-30 09:32:42 +02:00
bodybybuddha	22ecdfd2bc	Refactor edit_books.js for unused code; re-add glyphicon to convert button; Add form validation for convert button	2018-08-29 00:49:50 -04:00
bodybybuddha	4b006fba99	Re-commit: #584 & #587 Convert any book format to another format	2018-08-28 23:32:30 -04:00
bodybybuddha	fc78d1ee07	Added exception catching for file format check	2018-08-28 19:22:17 -04:00
bodybybuddha	4f386c8a00	Updated GUI buttons for ebook-convert feature	2018-08-28 19:13:04 -04:00
bodybybuddha	3ec000ad85	Merge branch 'master' of https://github.com/janeczku/calibre-web into ebookconvert-any	2018-08-28 09:56:08 -04:00
OzzieIsaacs	a7a91ae54c	Added posibility to upload cover from local drive (#439) ... Updated language files	2018-08-28 14:07:48 +02:00
OzzieIsaacs	3a37183e25	Included khmer language ... Further unified naming	2018-08-28 10:29:11 +02:00
OzzieIsaacs	2453786174	Limit registering domains	2018-08-28 09:42:19 +02:00
bodybybuddha	e160efbdac	Add GUI functions for ebookconvert any format feature	2018-08-27 21:27:16 -04:00
OzzieIsaacs	cedc183987	Fix #590, #589. ... Unified wording Calibre-Web Replaced one table on admin page, deleted password column Removed spaces on layout page Removed uesless commit calls during db migration Implementation of registering by email	2018-08-27 22:08:55 +02:00
OzzieIsaacs	5889535355	Bugfix gdrive download Books ... Bugfix pagination Fix Error messages massadd of books to shelf	2018-08-19 13:36:04 +02:00
OzzieIsaacs	d414bf3263	Massadd of books to shelfs (#203, #404) from advanced search ... Code cosmetics bugfix error message on failed emails refactored language name generation	2018-08-19 10:14:20 +02:00
Ozzie Isaacs	34abf95fb2	Fix for empty filename during edit	2018-08-18 22:00:43 +02:00
OzzieIsaacs	d2ea10e90e	Improved OPDS compability (#579) ... Bootstrap-table loads locally and no longer from CDN Localized commit date on admin page	2018-08-18 17:35:23 +02:00
OzzieIsaacs	9ace4d3372	Updated german translation ... Bugfix additional format upload without extension Bugfix additional format upload to gdrive pathes assembled by os.path.join	2018-08-18 12:15:32 +02:00
OzzieIsaacs	cdb1b52652	Bugfix Get gdrive instances (#554, #525) ... Metadata.db download works again removed DEVELOPMENT constant removed db logging in debug mode (too, noisy, to less information) code refactoring url_for_other_page feed languge set to en-EN update status shos local time instead of UTC Error handling (back to index page) in case of gdrive authenticate aborted Mistyping page register fixed Mistyping bokk fixed Added uploaded books to tasklist (#442) Error handling for failed file update added Code refactoring worker thread Tasks now never show any decimal values Converter function unified removed shell from subprocess call preparation for limiting domain for registering emails Book series can now increased in 0.1 steps (#562) Accordion panels in config are now usable on touch devices like iPad (#545) Gdrive authenticate button only visible after logged in (#525) Fixed misstyping in german translation	2018-08-16 21:17:26 +02:00
OzzieIsaacs	c38f331b6f	Fix for #575 ... Fix no pydrive dependency installed Fix sending email on python3	2018-08-13 19:43:50 +02:00
OzzieIsaacs	5ef70890d9	Search for custom columns implemented #494 ... Search for ratings related to #559 Search description #572 code cosmetics	2018-08-12 18:21:57 +02:00
OzzieIsaacs	791f4a8078	Fix #455	2018-08-12 13:31:18 +02:00
Ozzie Isaacs	7be328c535	Converting ebooks in background ... additional sorting of tasklist according to date and runtime codecosmetics	2018-08-12 09:29:57 +02:00
OzzieIsaacs	5ec9051f2e	Add charset to opds feed for read books	2018-08-07 18:19:08 +02:00
Ozzie Isaacs	3db682cd15	Merge remote-tracking branch 'del_books/delete-book-formats' ... # Conflicts: # cps/helper.py Implemented delete on gdrive	2018-08-04 18:22:43 +02:00
Ozzie Isaacs	f81fbaf542	Fix #568 (encoding problem in fb2 upload)	2018-08-04 17:08:32 +02:00
Ozzie Isaacs	ff1b479188	Added name of book emailed to task list ... Implemented emailing of books from gdrive (converting not implemented yet)	2018-08-04 10:56:42 +02:00
OzzieIsaacs	b0cbd0a37a	Added feature to send emails in a background-task	2018-07-30 20:12:41 +02:00
Ozzie Isaacs	4d6299f0d5	Improved gdrive error messages (#554)	2018-07-29 17:51:23 +02:00
Ozzie Isaacs	6a76dce870	Fix change user (in case of reboot required) ... Fix no existing database Update required version for sqlalchemy	2018-07-28 17:19:08 +02:00
OzzieIsaacs	9d161129d9	Fix for #554	2018-07-25 21:56:25 +02:00
OzzieIsaacs	2449b4049b	Code cleaning Stats page ... Enable calibre's ebook-convert as converter for mobi files (#411, #533)	2018-07-18 20:21:44 +02:00
OzzieIsaacs	3a9a59b751	Fix #497	2018-07-17 18:24:12 +02:00
OzzieIsaacs	a53b7908f3	Fix #417	2018-07-16 20:37:46 +02:00
OzzieIsaacs	aaa706069c	Implemented #417	2018-07-16 19:04:18 +02:00
OzzieIsaacs	8896b3c5d2	Requests from #454	2018-07-15 18:50:35 +02:00
OzzieIsaacs	6f36eef51d	Fix #544 (missed some config options) ... Added lxml to stats sceen	2018-07-15 16:27:16 +02:00
OzzieIsaacs	f0459d577b	Bugfix #409	2018-07-15 15:14:26 +02:00
OzzieIsaacs	0e83546d40	- Updated translation (it's now always Google Drive) ... - Integrated feature #409 (linking read status from calibre)	2018-07-15 15:08:06 +02:00
OzzieIsaacs	694620790c	#543 ... Deleting of non exisiting folders gives no internal error anymore re-inserting title sort function during upload earlier	2018-07-14 23:03:54 +02:00
OzzieIsaacs	31b703db62	Delete on gdrive working ... Moving author on gdrive working bugfix delete on normal folders	2018-07-14 13:48:51 +02:00
OzzieIsaacs	a8040ad3fa	#538: ... -Refactoring gdrive and file handling -Improved error handling for gdrive -bugfix "gdrive stopping after a while" - Renaming book title working - Still Bugs in upload file to gdrive and renaming author	2018-07-14 08:31:52 +02:00
OzzieIsaacs	413b10c58e	Bugfix gdrive ... Still open: gdrive.db entries aren't cleared upon change, gdrive.db is only working after restart if just enabled	2018-07-09 20:30:38 +02:00
OzzieIsaacs	404b29b979	Refactored WSGIServer handling ... Restart of gevent server now working	2018-07-09 18:47:36 +02:00
OzzieIsaacs	a298470479	Fix #526. Books are now initially stored according to their id.	2018-07-08 10:41:00 +02:00
OzzieIsaacs	4f1754c1e4	Improved errorhandling during editing of books	2018-07-08 09:28:35 +02:00
OzzieIsaacs	fbe2f5384b	Prevent error on windows during upload and during rename of metadata.db in combinstion with gdrive	2018-07-07 16:27:21 +02:00
OzzieIsaacs	76d8cbdf57	Logging of details for gdrive integration only on debug level ... fix generic cover path browser reading for cbx and epub files no longer creates temp files on server browser reading for cbx and epub files working (#502, #520)	2018-07-07 15:48:50 +02:00
OzzieIsaacs	420f685fd9	Added logging information for errors	2018-07-07 12:27:07 +02:00
OzzieIsaacs	30d9991daf	Merge remote-tracking branch 'Goodread_fix/patch-test'	2018-07-07 12:21:32 +02:00
OzzieIsaacs	7d3fadb685	Improved compability for gevent (version 1.3.x & Windows) ... Bugfix gdrive naming of client_secrets.json Bugfix handling of gdrive with working folder not cps root folder	2018-07-07 11:41:39 +02:00
OzzieIsaacs	c66bb54478	Fix #534	2018-07-03 19:34:29 +02:00
Ozzie Isaacs	a06748e348	Update settings.yaml file	2018-06-07 16:13:27 +03:00
Ozzie Isaacs	7d5302b47f	Fix accidentially deleted gevent ds	2018-06-02 17:12:54 +02:00
OzzieIsaacs	204cd504a9	- Completly new setup of GDrive (every data is taken from client_secret.json file) ... - If cover on Google Drive is missing, the generic cover will be used - Better error handling during configuration of google drive (missing hook callback verification, missing files) - less errors on console during use of Gdrive, more log file output in case of error - removed standalone flask development mode - removed gdrive template file and vendor setup script	2018-06-02 10:59:34 +02:00
Charles	7142836622	Adding exception handling to GoodreadsClient if site is down	2018-05-31 18:28:16 -04:00
Andriy Zasypkin	b2ba8bceb2	tags in detail view are sorted	2018-04-22 14:43:43 -04:00
OzzieIsaacs	671bf5cf8d	Integrated #454 (css is loaded remote)	2018-04-02 10:09:19 +02:00
OzzieIsaacs	e24f837007	missing file from last commit	2018-04-01 19:32:19 +02:00
OzzieIsaacs	6a2449ffaf	Fix for SSL/NonSSL and gevent	2018-03-31 20:19:37 +02:00
OzzieIsaacs	af5a897d1d	Added SSL Options (#416)	2018-03-30 21:20:47 +02:00
OzzieIsaacs	d01d7b91a8	Added error messages in log and UI if cover url can't downloaded, changed label for cover URL to clarify function #449	2018-03-27 20:42:19 +02:00
OzzieIsaacs	f6ece5fe72	Fix for #448	2018-03-27 20:18:11 +02:00
OzzieIsaacs	ee5677f376	Merge remote-tracking branch 'multiload/master'	2018-03-26 20:39:49 +02:00
OzzieIsaacs	f019d58b4d	Fix for unicode search (#426)	2018-03-10 20:42:18 +01:00
Faisal Alghamdi	0afa7cbafd	duplicate code removed	2018-03-07 10:40:48 +03:00
Faisal Alghamdi	78caf3379d	remove unused code	2018-03-07 09:59:47 +03:00
Faisal Alghamdi	ff9ee82451	adding multiple files upload feature	2018-03-06 15:31:46 +03:00
OzzieIsaacs	199b1c4820	Changed gdrive base uri handling (#431)	2018-01-20 08:27:44 +01:00
Andriy Zasypkin	6b4d7674b5	use isinstance instead of type	2018-01-16 09:30:26 -05:00
Andriy Zasypkin	28dac34119	auto select format if only one	2018-01-11 08:43:39 -05:00
OzzieIsaacs	07d6ba094b	Fix for deleting books in shelfs (#419)	2018-01-06 12:08:55 +01:00
Andriy Zasypkin	e66068d699	should fix testing error	2017-12-20 12:10:47 -05:00
Andriy Zasypkin	6b6a457a9d	comic reader updated extentions	2017-12-15 12:14:20 -05:00
Andriy Zasypkin	9249390043	comic book read file order fixed	2017-12-14 10:39:25 -05:00
Yury Tilis	2fe03961bb	-Added a more subtle progress bar which only shows the page number on hover ... -Added Current page indicator to the thumbnail list, as well as a hover state -Thumbnail list now scrolls to the current page on open or page change -Added @andy29485's request for controlling page with space/shift+space -Added the book title to the top of the page -Fixed IE11 failing on imagecallback	2017-12-10 02:43:51 -05:00
OzzieIsaacs	4c05b3db67	Present dates for updater in local date format	2017-12-02 18:42:21 +01:00
OzzieIsaacs	b74a075aa6	Added posibility to change settings db via command line for multiple instances (#247)	2017-12-02 11:15:51 +01:00
OzzieIsaacs	152f7857c9	Fix #397	2017-12-01 15:33:55 +01:00
OzzieIsaacs	cbb236ba7b	Added visiblilty of shelfs to opds catalog (#267)	2017-12-01 07:53:52 +01:00
OzzieIsaacs	aee5ca0e06	#396 implemented	2017-11-30 20:12:13 +01:00
OzzieIsaacs	f1fac28203	Improved error handling for renaming authors and titles (changes related to filesystem and not only to database)	2017-11-30 16:49:46 +01:00
OzzieIsaacs	f890fc1553	New progress bar	2017-11-29 15:54:17 +01:00
OzzieIsaacs	b4aede78bc	Fix for the piping problem (#395)	2017-11-28 08:54:21 +01:00
OzzieIsaacs	03ab03f06e	Code cosmetics	2017-11-22 22:08:29 +01:00
OzzieIsaacs	d76f812310	Fixed empty return on getcomic ... Python 3 compability (the easy way)	2017-11-20 07:53:52 +01:00
OzzieIsaacs	e7b6963afd	Small improvements for comic reader calls	2017-11-19 20:37:43 +01:00
Andriy Zasypkin	6ab4ff9a3b	Merge branch 'comic_server' into comic_server	2017-11-19 14:09:17 -05:00
OzzieIsaacs	5756785073	Error handling rarfiles	2017-11-19 18:08:55 +01:00
Andriy Zasypkin	ec12181803	added python3 compatibility for comic reader	2017-11-19 08:49:40 -05:00
OzzieIsaacs	8c573ff6d8	Unrar/tar and unzip on server side	2017-11-18 10:34:21 +01:00
OzzieIsaacs	6e714f3f16	Fix #391	2017-11-17 18:29:29 +01:00
OzzieIsaacs	211c3b16dd	Fix fror #388	2017-11-15 07:40:17 +01:00
OzzieIsaacs	f045c16c4e	Fix #386	2017-11-13 21:33:36 +01:00
OzzieIsaacs	01d0083fe6	Fix for #376	2017-11-12 19:08:20 +01:00
OzzieIsaacs	ad16194798	Error on deleting non existing book fixed (#382)	2017-11-12 18:08:13 +01:00
OzzieIsaacs	798cbc7505	Merge remote-tracking branch 'opds/master'	2017-11-12 14:46:19 +01:00
OzzieIsaacs	78744b19d8	Fix #377	2017-11-12 14:10:08 +01:00
OzzieIsaacs	ba54b9a357	Fix #365	2017-11-12 14:06:33 +01:00
OzzieIsaacs	af8d908bba	Fix #371, #372	2017-11-01 16:55:51 +01:00
unknown	b4bd7507b6	Merge branch 'master' of git://github.com/janeczku/calibre-web	2017-10-22 14:41:23 +02:00
unknown	674baad49e	lowercasing the input	2017-10-21 22:07:39 +02:00
unknown	4a04ec898e	case-insensitive search for non-ASCII - improved	2017-10-21 21:50:47 +02:00
unknown	d2ea3a6c19	case-insensitive search for non-ASCII	2017-10-20 23:23:16 +02:00
Cory Sitko	cc758517e7	updated login_required_if_no_ano to correct switch anonymous on/off when changed in admin	2017-10-10 14:13:28 -04:00
Cory Sitko	7ade2ecd35	make is_active, is_authenticated, and is_anonymous properties on the Anonymous class so that the login_required decorator will work correctly and disable anonymous browsing	2017-10-10 10:18:28 -04:00
OzzieIsaacs	366bf9739b	Fix for #360 and guest accounts	2017-10-09 22:36:47 +02:00
OzzieIsaacs	90729de87f	Fix #354 ... Fix #355 Fix #353 Fix #352 Fix #351	2017-10-06 08:51:34 +02:00
unknown	6855deceef	added corresponding content-type for a downloaded book, otherwise default text/html is used	2017-10-01 20:48:01 +02:00
unknown	0f0c6dde09	changed application/xml to application/atom+xml	2017-10-01 20:24:24 +02:00
unknown	3c9f8b151d	added check for anonymous session in read_books, otherwise current_user.id is not defined	2017-10-01 18:41:19 +02:00
unknown	7ddfa1881b	added FB2 mime type	2017-10-01 17:15:44 +02:00
Jonathan Rehm	56c71dd4bf	Disable bookmarking when anonymous users are reading	2017-09-30 10:51:20 -07:00
OzzieIsaacs	c56a02bab6	Fix #339	2017-09-30 15:24:18 +02:00
OzzieIsaacs	34e9ef35f5	Code cosmetics	2017-09-17 15:33:22 +02:00
OzzieIsaacs	fe4d11fea8	Basi comic reader implementation for cbr, cbz, cbt files based on kthoom (#63, #126)	2017-09-17 12:36:32 +02:00
OzzieIsaacs	b6b73d39c2	Fix #329 ... Code cosmetics	2017-09-17 07:15:08 +02:00
OzzieIsaacs	b6f06658a2	Merge remote-tracking branch 'ipv6/ipv4only'	2017-09-16 20:18:34 +02:00
OzzieIsaacs	f87800d11c	Merge remote-tracking branch 'meta/upload_new_format_of_existing_book'	2017-09-16 18:55:34 +02:00
OzzieIsaacs	b30a73c505	Merge remote-tracking branch 'adv/def-variables'	2017-09-16 07:55:44 +02:00
Ainsley Pereira	993c56d021	Fix syntax error	2017-09-12 21:11:52 +01:00
Ainsley Pereira	1ce6893fa8	Exception isn't thrown until we call serve_forever, so that must be in the try block	2017-09-12 21:06:58 +01:00
Ainsley Pereira	b8b88183c3	Use IPv4-only WSGI start up as a fallback only when the IPv6/IPv4 one didn't work	2017-09-12 20:49:38 +01:00
Ainsley Pereira	a75c393922	Merge remote-tracking branch 'upstream/master'	2017-09-12 20:34:11 +01:00
Jonathan Rehm	e806494b54	Ensure variables exist before they're used	2017-09-11 09:24:20 -07:00
kyos	cbf2bb450d	Fixed issue calculating filesize of the uploaded book	2017-09-11 11:47:39 +02:00
kyos	be15f3781f	Fixed issue reported by Jkrehm to prevent filesize to fail	2017-09-11 11:17:29 +02:00
kyos	9086f4e0e7	Added option to upload a new format to a given book	2017-09-11 10:48:30 +02:00
OzzieIsaacs	c9f36a4d1a	Merge remote-tracking branch 'adv/bookmarks'	2017-09-10 15:00:27 +02:00
OzzieIsaacs	b6b5313f2d	Fix for #315	2017-09-09 14:23:25 +02:00
OzzieIsaacs	f860694487	Merge remote-tracking branch 'adv/goodreads-more-by'	2017-09-01 20:29:45 +02:00
OzzieIsaacs	5ee1950828	Merge remote-tracking branch 'adv/sqlalchemy-bool'	2017-09-01 20:11:48 +02:00
Jonathan Rehm	58abc1d024	Fuzzy match book titles to eliminate duplicates ... Titles with a Levenshtein ratio of 70% or greater are considered duplicates.	2017-08-29 07:15:33 -07:00
Jonathan Rehm	53c687251e	Show "More by" on author page ... Uses Goodread's list of author's books, filtering out the books that are already in the user's library. Requires the Goodreads dependency and API information.	2017-08-29 07:15:33 -07:00
Jonathan Rehm	6b8de017ab	Use SQLAlchemy boolean ... Seems to make a difference sometimes. Ref #300	2017-08-29 07:14:57 -07:00
Jonathan Rehm	8e1cfa1cbf	Re-apply db_filter ... Accidentally removed when the language and content filters were moved to `common_filters`.	2017-08-29 07:13:31 -07:00
OzzieIsaacs	a8b53ab38a	Merge remote-tracking branch 'adv/common-filters'	2017-08-27 09:36:02 +02:00
OzzieIsaacs	d5e1dba0fe	Merge remote-tracking branch 'adv/goodreads-more-by'	2017-08-27 09:24:02 +02:00
Jonathan Rehm	3213bf50b3	Move common filters into function ... Instead of duplicating functionality across lots of functions, combine it into one common function. It makes reading and modifying it much easier.	2017-08-26 08:12:16 -07:00
Jonathan Rehm	374b5f4c6e	Save ePub bookmarks to database ... Save ePub bookmark to database. Also use library's built-in restore feature to restore all information from localStorage.	2017-08-23 08:55:40 -07:00
Jonathan Rehm	a682c95ec1	Show "More by" on author page ... Uses Goodread's list of author's books, filtering out the books that are already in the user's library. Requires the Goodreads dependency and API information.	2017-08-21 08:56:08 -07:00
OzzieIsaacs	193605df4a	Fix for #286	2017-08-20 07:47:47 +02:00
OzzieIsaacs	6b1f3aa531	Merge remote-tracking branch 'adv/cache-buster'	2017-08-19 08:36:12 +02:00
marblepebble	97f573c41a	Set ipv4 address explicitly for docker usage	2017-08-18 21:53:52 +01:00
OzzieIsaacs	e3d416db4c	Merge remote-tracking branch 'adv/cover-upload'	2017-08-17 15:27:32 +02:00
Jonathan Rehm	a27848b351	Add static asset cache busting ... Calculates MD5 hash of static assets on server start. These are appended to the file name's when url_for is used, telling browsers to download the latest version of the files, e.g. style.css?q=81cf0ee. Inspired by https://github.com/ChrisTM/Flask-CacheBust but uses query strings instead of rewriting the path because fonts inside CSS files break when the path is rewritten.	2017-08-13 09:32:29 -07:00
OzzieIsaacs	91cdb5f60f	Merge remote-tracking branch 'Upper_case/master'	2017-08-12 19:02:57 +02:00
OzzieIsaacs	fb8ce693f3	Bugfix mature content ... Update german translation	2017-08-12 18:52:56 +02:00
OzzieIsaacs	b596734c36	Merge remote-tracking branch 'adv/mature-content'	2017-08-12 18:16:45 +02:00
Ruben Herold	68e3867af3	fix books with uppercase extension	2017-08-10 12:29:08 +02:00
Jonathan Rehm	6f797ba478	Check if JPEG via response content-type header instead of URL extension ... That way we can use dynamic URLs, such as those returned by the "Get Metadata" request.	2017-08-09 10:03:02 -07:00
Jonathan Rehm	aee8aad976	Add option to hide mature content from some users ... Uses a configurable list of tags to denote what is mature and hides those books from the user	2017-08-08 10:38:28 -07:00
kyos	51bc0e82a4	Added series and series_index metadata handler	2017-07-31 09:00:09 +02:00
kyos	4bba3558b7	Added tags metadata handler for epubs	2017-07-31 08:46:29 +02:00
OzzieIsaacs	626e2e393e	Merge remote-tracking branch 'adv/edit-publish-date'	2017-07-30 06:37:18 +02:00
Jonathan Rehm	04b04e200f	Add ability to edit publish date ... If a date is not set, default to “0101-01-01”	2017-07-23 13:35:35 -07:00
Jonathan Rehm	cf7196ae5e	Refactor to remove nested if-statements	2017-07-23 13:35:35 -07:00
Jonathan Rehm	a95e6aab6b	Do not attempt to create the YAML file when Google Drive is disabled (#246)	2017-07-23 22:26:43 +02:00
OzzieIsaacs	cb5f196f4b	Merge remote-tracking branch 'adv/modal-details' ... # Conflicts: # cps/static/js/main.js # cps/templates/detail.html	2017-07-23 14:03:02 +02:00
OzzieIsaacs	1e2edcf753	Merge remote-tracking branch 'adv/author-info'	2017-07-23 13:36:50 +02:00
OzzieIsaacs	c403fdfa2e	Merge remote-tracking branch 'adv/sorting'	2017-07-23 13:18:24 +02:00
Jonathan Rehm	5c3a5b6c39	Use ajax to add/remove books from shelves ... Gracefully fall back to standard requests if JavaScript is disabled	2017-07-21 21:15:03 -07:00
Jonathan Rehm	c9c6529567	Use SECRET_KEY from environment variable (#232)	2017-07-11 18:35:55 +02:00
OzzieIsaacs	74e93e1cdf	Code cosmetics	2017-07-09 20:15:15 +02:00
Jonathan Rehm	fe68c8a7f8	Add support for displaying author information from Goodreads ... Requires the "goodread" module (added to optional-requirements.txt) and an API key Retrieves Goodreads author information and displays their photo and "about" text	2017-07-08 16:07:45 -07:00
OzzieIsaacs	31e0025099	Update Translation	2017-07-08 19:50:44 +02:00
OzzieIsaacs	5a6ad970d8	Merge remote-tracking branch 'button_padding/magic-link'	2017-07-08 19:26:08 +02:00
Jonathan Rehm	d799b859ea	Make changes suggested by codacy	2017-07-08 09:15:40 -07:00
Jonathan Rehm	675e8dd5cd	Show book details in modal dialog ... With them shown in a modal, you don't lose your place in the pagination. If the request comes via Ajax, the minimal layout is used. If via a normal request, the full layout is used. That lets you open the details in a new tab and have the full experience, but if you're clicking through the results of a search, you can view many without losing your place.	2017-07-08 09:15:40 -07:00
OzzieIsaacs	93dfb96174	Added Translation of title for read/unread books	2017-07-08 16:47:07 +02:00
OzzieIsaacs	2929d95b26	Display all authors names in shelf, like on all other pages (#202)	2017-07-08 13:50:21 +02:00
Jonathan Rehm	623f5c8ef0	Add "magic link" functionality ... When using a device that is bothersome to log in on (e.g. a Kindle) you can use a magic link to log in via another device. Configuration was added and is disabled by default.	2017-07-07 18:29:16 -07:00
Jonathan Rehm	b138c9edd5	Show read/unread counts	2017-07-06 22:33:57 -07:00
Jonathan Rehm	7631eea32e	Add sort options when viewing books ... Default view still shows the most recently added books, but adds ability to sort by newest/oldest books and books sorted alphabetically (ascending & descending). I did not include translations for the next text, but they are split up for easy translating and are otherwise ready for translating.	2017-07-06 21:14:45 -07:00
OzzieIsaacs	4ea9df753e	For failed logins the source ip-adress is logged now ( #201)	2017-06-07 18:08:15 +02:00
OzzieIsaacs	e6c6c26fd1	No error 500 if kindlegen is not excecutable	2017-05-25 09:30:20 +02:00
OzzieIsaacs	0a08a07193	Fixed Deleting user	2017-05-25 09:09:35 +02:00
OzzieIsaacs	7ab8a5877b	read PDF/TXT without temporary files (#197)	2017-05-25 08:46:33 +02:00
OzzieIsaacs	1366b36c32	Added integer-field to supported custom colums	2017-05-25 08:20:19 +02:00
nanu-c	26f314d371	support int custom fields	2017-05-22 22:54:53 +02:00
OzzieIsaacs	38fa9ce206	At deleting a book, the book is also deleted from all Shelfs, Download list and read list (#192)	2017-05-19 20:36:58 +02:00
OzzieIsaacs	c80e517c28	Delete books prepared for deleting on doogle drive	2017-04-15 18:24:48 +02:00
OzzieIsaacs	7667da6e12	Books now really deleted from hard disk (#119)	2017-04-15 18:18:08 +02:00
OzzieIsaacs	2b8c29c535	Further fix delete books (#119)	2017-04-15 18:07:53 +02:00
OzzieIsaacs	9c679c8908	Delete books should now work (#119)	2017-04-15 11:35:05 +02:00
OzzieIsaacs	cd0d450829	Allow deleting books (fixes #119)	2017-04-14 20:29:11 +02:00
OzzieIsaacs	daaee5b67e	remove unused variables	2017-04-14 19:16:39 +02:00
林檎	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	2017-04-14 21:57:27 +08:00
OzzieIsaacs	699bd036e8	Code cosmetics	2017-04-04 19:05:09 +02:00
OzzieIsaacs	dc45b53b24	code cosmetics	2017-04-03 21:05:28 +02:00
OzzieIsaacs	d59be5faf4	Code cosmetics ... Bugfix upload	2017-04-03 19:57:45 +02:00
OzzieIsaacs	7dd70db837	Code cosmetics	2017-04-02 10:27:37 +02:00
OzzieIsaacs	7c6d527a55	Code cosmetics	2017-04-02 10:05:07 +02:00
OzzieIsaacs	5044b78b08	Code cosmetics	2017-03-31 18:31:16 +02:00
OzzieIsaacs	00462237fe	Merge remote-tracking branch 'chinese_translation/master'	2017-03-31 16:52:25 +02:00
OzzieIsaacs	78067b87bc	Code cosmetics	2017-03-29 21:43:55 +02:00
OzzieIsaacs	395c6679b7	Fix #163	2017-03-29 20:59:37 +02:00
林檎	ebb3acecca	Fix Download Bug.	2017-03-29 12:59:20 +08: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	0e0e72fb71	Fixes for gevent/gdrive	2017-03-19 17:14:16 +01:00
Jack Darlington	3916205a95	Gdrive optional	2017-03-16 23:36:37 +00: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
Kennyl	59bf568f7e	Merge branch 'master' into fix/python3-patch-20170308	2017-03-13 15:52:08 +08:00
Jack Darlington	29462e2278	Fix for updater	2017-03-13 00:44:20 +00:00
OzzieIsaacs	74a3e6842a	Merge remote-tracking branch 'kennyl/travis' ... # Conflicts: # cps/web.py	2017-03-12 21:13:25 +01:00
OzzieIsaacs	b081bc8672	Fix #157	2017-03-12 20:01:20 +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
Jack Darlington	dad251d02c	Fix for revoking already expired channel (drive)	2017-03-12 00:24:53 +00:00
林檎	a766784ef1	Merge branch 'feature/download-suffix-20170308' into travis	2017-03-09 12:19:46 +08:00
林檎	d7d29827f4	fix behind	2017-03-08 23:59:56 +08:00
林檎	a7d361a0ff	merge conflict	2017-03-08 23:52:41 +08:00
林檎	dcc0958c39	Merge branch 'master' into travis ... # Conflicts: # cps/epub.py # cps/web.py # readme.md	2017-03-08 23:50:14 +08:00
林檎	8c625dfb93	Fix #146 ... For WebUI only OPDS remains previous behaviour	2017-03-08 13:56:13 +08:00
林檎	d7afbdc349	use quote instead of urllib.quote	2017-03-08 13:26:52 +08:00
林檎	108302ff9b	remove dependency on future function ... no need six or future if there is only one function.	2017-03-08 11:48:12 +08: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	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	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
林檎	7a14101d6f	Merge branch 'master' into travis ... # Conflicts: # cps/helper.py # cps/web.py	2017-03-07 13:33:27 +08: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	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	26438f97ab	Bugfix Filename without unidecode dependency	2017-03-06 19:19:14 +01:00
林檎	07ad73caca	Merge branch 'fix/syntax-python3-20170305' into travis	2017-03-06 20:06:00 +08:00
林檎	297a08cd5f	xrange fix ... range to xrange	2017-03-06 19:47:58 +08:00
林檎	dc985e76df	python3 fix	2017-03-06 18:23:33 +08:00
林檎	3421db2096	Merge branch 'fix/attachment-patch-20170305' into travis	2017-03-06 18:22:02 +08:00
林檎	0c9eacb024	fix opds	2017-03-06 16:35:00 +08:00
林檎	3369972073	Merge branch 'fix/syntax-python3-20170305' into travis ... # Conflicts: # cps/epub.py # cps/web.py	2017-03-06 14:27:18 +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
林檎	da8d0c2a9f	Merge branch 'fix/syntax-python3-20170305' into travis	2017-03-05 18:19:38 +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
林檎	2c32696417	Merge branch 'fix/slugify-filename-20170305' into travis	2017-03-05 15:36:07 +08:00
林檎	35b9e423ec	Merge branch 'fix/attachment-patch-20170305' into travis	2017-03-05 15:35:57 +08:00
林檎	9ca88840eb	“-“ is removed at helper , ... so use “_” instead	2017-03-05 15:30:35 +08:00
林檎	e845bdbd56	Fix attachment filename ... File attachment should be url encode rather than utf-8 format	2017-03-05 00:28:37 +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	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
林檎	1a10859a57	When upload pub, add description to comment accord opf file	2017-03-03 12:50:06 +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	fb6a37eec3	Update for covers download via opds + inserts permissions if needed (only available with a link)	2017-03-02 23:55:32 +00:00
林檎	879510da82	Upload support detection of language	2017-03-02 22:57:02 +08:00
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
林檎	583380e71a	path join bug ... , instead of + because get_main_dir is not endswith os.sep	2017-03-01 17:20:58 +08: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
Jack Darlington	d9c48a6203	Merge branch 'master' into develop ... # Conflicts: # cps/db.py # cps/web.py	2017-02-26 19:49:49 +00: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	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	3dcfebca60	update translations	2017-02-23 13:52:58 +08:00
Jack Darlington	51bd888765	Fix registering watch callback	2017-02-23 00:17:14 +00:00
Jack Darlington	82d01c9001	Merge branch 'master' into develop ... # Conflicts: # cps/web.py	2017-02-22 22:45:19 +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
OzzieIsaacs	709fa88c62	Navbar reduced to icons on smaller screens ... Feedback updater improved (#81)	2017-02-20 19:52:00 +01:00
Jack Darlington	f71fa5d935	Accidentally committed WIP google drive integration	2017-02-19 22:56:07 +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	ad40a2b5a6	Bugfix parsing publishing date with milliseconds (#114)	2017-02-17 18:22:08 +01:00
OzzieIsaacs	ed459ddb9b	Bugfix display of commit date	2017-02-15 18:19:48 +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	63379fe5db	Fix for #101	2017-02-05 14:27:57 +01:00
OzzieIsaacs	241c4cef8f	- added best rated section in normal view ... - added most downloaded section in opds view - imporved fb2 upload, correct handling of missing elements - author sort is set on editing and uploading files - Encoding stuff on uploading files	2017-02-04 14:28:18 +01:00
OzzieIsaacs	e46320b12f	folders now relying on ids not names (removes all encoding issues on link folders) ... Language filter working in opds feed removed redundant code authos now paginating in opds feed	2017-02-03 13:20:35 +01:00
OzzieIsaacs	176c7dce70	- Fix for #100 ... - Fix migration of shelf order - fix show random books in detail view for authors and series	2017-02-02 19:36:31 +01:00
OzzieIsaacs	c45968a1ed	Bugfix Updater	2017-01-31 19:29:47 +01:00
OzzieIsaacs	296d2615fe	Code cosmetics	2017-01-30 19:52:32 +01:00
OzzieIsaacs	1d3be7f4c6	Bugfix Git ident id	2017-01-30 19:03:55 +01:00
OzzieIsaacs	b1293c84bc	- Implemented autoupdater for testing ... - failed logins are logged - no of backups for log-file increased to 2	2017-01-30 18:58:36 +01:00
OzzieIsaacs	935b6e3143	Code cosmetics ... Bugfix download opds added changable title to opds feed removed unused search.xml file	2017-01-29 21:06:08 +01:00
OzzieIsaacs	e9d0bff559	- added statistics for Tags and series ... - Loglevel is displayed as text instead of value	2017-01-28 20:54:31 +01:00
OzzieIsaacs	2c615fdf05	Finalize graphical setup for calibre-web	2017-01-28 20:16:40 +01:00
OzzieIsaacs	75c89c28e1	Bugfix for accessing config database ... Title now displaed on every page Title can be changed from within application	2017-01-22 21:30:36 +01:00
OzzieIsaacs	4eee58c21c	Started migration of config to app database	2017-01-22 16:44:37 +01:00
OzzieIsaacs	a2a48515d4	Fixed language and locale preset for new users	2017-01-22 14:07:54 +01:00
OzzieIsaacs	afdfb30d80	Update email settings	2017-01-18 19:07:45 +01:00
OzzieIsaacs	0967b03a22	Merge branch 'master' into patch1	2017-01-18 19:01:16 +01:00
OzzieIsaacs	5a8dd19b4b	Bugfix Authentication for opds search calibre companion	2017-01-17 17:45:23 +01:00
idalin	9f1f678bef	reset to last commit url_for without _external	2017-01-17 11:09:02 +08:00
idalin	4a2f67bc00	fixed url_for return without port when port is not the standard port.	2017-01-16 16:26:20 +08:00
idalin	eb22fbf9fa	fixed url_for return without port when port is not the standard port.	2017-01-16 16:18:53 +08:00
OzzieIsaacs	e5d881edf8	Bugfix empty search for opds feed	2017-01-15 12:37:58 +01:00
OzzieIsaacs	4b8fdb04e6	Improvement mimetypes for downloaded files	2017-01-15 12:23:08 +01:00
OzzieIsaacs	99430fc98e	Bugfix (#79). ... - Fixed download with anonymous user in opds feed - Added mor filetypes to opds feed, if unknown filetype, nothing is published instead of mobi	2017-01-15 11:05:28 +01:00
OzzieIsaacs	2335252b1f	Merge branch 'Chinese_tanslation' (#90) ... Thanks @idalin user language should be detected from browser, or otherwise with enabled anonymous browsing it can be selected as admin (configure language for user guest). Annymous browsing can be deactivated afterwards	2017-01-14 15:05:49 +01:00
OzzieIsaacs	8759edd587	Calibre-companion now working (#79)	2017-01-14 13:18:35 +01:00
OzzieIsaacs	0107c52b66	Anonymous account now can also be configured like normal user (e.g. download permissions, change visibility of sidebar) (#35) ... Search now working for calibre-companion (#79), download not working yet metadata view 80% finished	2017-01-12 20:43:36 +01:00
OzzieIsaacs	beca61a596	Nonexisting books are deleted from downloaded list (#91)	2017-01-10 21:20:12 +01:00
OzzieIsaacs	c6d1c186f0	Metadata viewing should work with calibre-companion now (#79)	2017-01-09 21:18:49 +01:00
OzzieIsaacs	6cf82dc9b9	Loading further items in calibrecompanion should now work (#79)	2017-01-09 19:10:39 +01:00
idalin	9f65eae024	add default language configuration	2017-01-09 13:47:50 +08:00
OzzieIsaacs	9927a6cc71	Covers should now be downloadable with calibre-companion (#79)	2017-01-08 16:46:57 +01:00
OzzieIsaacs	c13a2a4557	OPDS Marvin (and Marvin 3) now really work (#79) ... OPDS should now also work with reverse proxy configuration Changed readme (reverse proxy configuration) No progress for calibre companion	2017-01-08 14:46:30 +01:00
OzzieIsaacs	a16321179d	Improvements for OPDS on iOS with Bookari- and Chunky-Reader	2017-01-07 18:08:12 +01:00
OzzieIsaacs	c7b35250c6	Bugfix E-Mailsettings	2017-01-06 14:45:43 +01:00
OzzieIsaacs	ea2e8205e3	Added code for rearranging shelfs #73	2017-01-03 20:19:32 +01:00
OzzieIsaacs	490f8ef5f2	Shelfs of diffrent users can have the same name now ... Removing ratings by giving a rating of zero is now possible (like in calibre)	2017-01-03 19:29:33 +01:00
OzzieIsaacs	453d04b566	Final fix for #86 (reverse proxy error) ... renamed admin_user to admin added configuration infos inm admin panel	2017-01-02 18:52:33 +01:00
OzzieIsaacs	0bcdbc4a82	Bugfix Search opds feed ... Improvement OPDS feed for displaying covers	2016-12-29 19:19:40 +01:00
OzzieIsaacs	f434511db8	Fixed lout issue with redirects ... fixed database migration problem which was introduced with the shelf order commit	2016-12-29 10:30:42 +01:00
OzzieIsaacs	157a2e6e4a	Renamed feed to opds for better compatibility with some readers ... added clickable links to feed (should hopefully solve #79) updated readme	2016-12-28 15:51:58 +01:00
OzzieIsaacs	c33a329f08	Add search for series and languages (#56) ... Add database migration for shelf ordering (#73)	2016-12-27 16:07:25 +01:00
OzzieIsaacs	e0459eb62b	Removed unused wishlist code ... Added renaming of shelf name Added sorting abilty to shelfs jquery is loaded locally now	2016-12-26 11:33:32 +01:00
OzzieIsaacs	ba44a15891	changes for #77 ... Code cosmetics #75: - More debug infos for kindlegen and sending e-mail. - Button for sending test e-mail. - timeout of 5min for sending e-mail	2016-12-23 09:53:39 +01:00
OzzieIsaacs	811975f1a4	Added french translation	2016-11-13 19:28:38 +01:00
OzzieIsaacs	0aa3ff4f6d	Remove trailing spaces from username during login ... Upload of books working on windows without errors	2016-11-12 21:28:40 +01:00
OzzieIsaacs	bbf6d9b026	Translation of UI (german and english) ... Bugfix for feeds - removed categories related and up - load new books now working - category random now working login page is free of non accessible elements boolean custom column is vivible in UI books with only with certain languages can be shown book shelfs can be deleted from UI Anonymous user view is more resticted Added browse of series in sidebar Dependencys in vendor folder are updated to newer versions (licencs files are now present) Bugfix editing Authors names Made upload on windows working	2016-11-09 19:24:33 +01:00
OzzieIsaacs	a6b6700a73	Removed non working search from epub viewer	2016-11-01 18:49:47 +01:00
OzzieIsaacs	313116dca7	Uploader is working on windows	2016-10-30 11:44:02 +01:00
OzzieIsaacs	12db39523c	Merge branch 'master' of https://github.com/wuqi/calibre-web ... # Conflicts: # .gitignore # cps/static/css/colors.css # cps/static/css/style.css # cps/web.py	2016-10-24 19:04:16 +02:00
OzzieIsaacs	05189f78bc	Fix for #67	2016-10-05 12:44:32 +02:00
OzzieIsaacs	753a0a82a1	Fix for #66 advanced search	2016-10-03 12:08:34 +02:00
OzzieIsaacs	897c1648bb	Add fix for #58 remove trailing spaces	2016-08-27 10:32:53 +02:00
Cervinko Cera	8a9b4e7fc7	remove print	2016-08-08 21:04:09 +02:00
Cervinko Cera	0f8c308973	Fix for deleting kindle mail adresee #54	2016-08-08 21:01:38 +02:00
cervinko	52ba2adf73	Merge pull request #48 from OzzieIsaacs/patch-1 ... Fix for #45 DB_ROOT not found	2016-08-07 22:51:06 +02:00
Cervinko Cera	2b2d485730	upload more than pdf fixes	2016-08-07 22:10:00 +02:00
Cervinko Cera	f5773cc75f	resolve conflicts with PR 30	2016-08-07 18:46:38 +02:00
OzzieIsaacs	59136a9cc2	Linux path problem solved (finally)	2016-08-07 10:32:45 +02:00
wuqi	b846cc11d8	fix some error ... Fix TypeError: 'bool' object is not callable	2016-07-19 10:59:46 +08:00
wuqi	ab97ead264	merge test	2016-07-16 17:17:43 +08:00
wuqi	350f4e21e6	Add txt reader ... add txt file reader,and add select for read the book	2016-07-16 16:44:47 +08:00
janeczku	f95ac38c54	Fix redirects with reverse proxy ... See #36	2016-07-15 01:28:12 +02:00
janeczku	34e11fab79	Support reverse proxy subdirectory ... Closes #19	2016-07-14 02:12:21 +02:00
wuqi	9a8d795eff	Update epub reader and pdf reader ... Update epub reader and use pdf.js tu view pdf files	2016-07-09 16:54:13 +08:00
janeczku	62f9120a0f	Merge branch 'zip-check'	2016-06-17 21:08:59 +02:00
janeczku	e42f768909	Check if epub file exists before trying to extract	2016-06-17 20:59:44 +02:00
janeczku	46c83bbe8b	Fix recursive path creation	2016-06-17 20:01:27 +02:00
Pavel Yakunin	43d6077815	cleanup	2016-06-05 22:32:26 +03:00
Pavel Yakunin	44df873f33	logging, tmp cleanup	2016-06-05 19:42:18 +03:00
Pavel Yakunin	027e103ce3	refactoring to make adding new formats possible	2016-06-05 18:41:47 +03:00
Cervinko Cera	c26eb6aa08	add exclude tags to advanced search	2016-05-03 14:27:38 +02:00
Cervinko Cera	80c3c19c01	some fixes for advanced search	2016-05-03 11:00:45 +02:00
Cervinko Cera	7fce28790d	add search_form.html	2016-05-02 23:25:21 +02:00
Cervinko Cera	431b6009a5	add advanced search	2016-05-02 22:43:50 +02:00
janeczku	3719b7e4eb	Add ANON_BROWSE configuration option	2016-04-29 22:36:36 +02:00
Cervinko Cera	8f4c444929	add basic auth for feed sites	2016-04-27 18:29:45 +02:00
Cervinko Cera	f66d7ce29b	add permission for changing own password	2016-04-27 16:00:58 +02:00
Cervinko Cera	c7b7b3866e	add user-permission management	2016-04-27 10:35:23 +02:00
Cervinko Cera	b2146ba4b9	add support for is_multiple custom columns	2016-04-21 19:18:52 +02:00
Cervinko Cera	931981a37a	fix for custom column 'rating'	2016-04-21 12:46:26 +02:00
Cervinko Cera	a21a9d6510	save rating as rating*2 in db and show rating/2 in interface	2016-04-21 09:04:08 +02:00
Cervinko Cera	27d5a79efb	remove some commented code and debug prints	2016-04-20 19:42:24 +02:00
Cervinko Cera	704198655b	custom columns unfinished	2016-04-20 19:25:47 +02:00
Cervinko Cera	202cbc26a7	custom columns unfinished	2016-04-20 19:25:47 +02:00
Cervinko Cera	0ee46e4b5e	custom columns unfinished	2016-04-20 19:25:46 +02:00
Cervinko Cera	2207622bbf	fix for edit page after upload	2016-04-20 00:23:14 +02:00
JanB	8d2a865436	Catch file permission errors when uploading PDF	2016-04-17 17:42:22 +02:00
Cervinko Cera	826159c432	show 'better author and tags editing; partly copied from https://bitbucket.org/SpeedProg/calibreserver	2016-04-15 23:51:26 +02:00
JanB	76c7cdf465	Add config option for upload feature	2016-04-15 19:44:13 +02:00
JanB	952d389dc5	Ship config.ini with defaults; log errors to file; fix OPDS catalog name	2016-04-15 18:54:23 +02:00
Cervinko Cera	51f1453917	check if wand is available, add dummy cover.jpg otherwise	2016-04-08 22:57:16 +02:00
Cervinko Cera	e4ffc9f2a0	set last_modified when pdf is uploaded	2016-04-06 12:55:20 +02:00
Cervinko Cera	4e0621479a	don't show upload button for users	2016-04-06 11:04:06 +02:00
Cervinko Cera	bda3055a19	improvements for pdf upload function	2016-04-05 20:50:28 +02:00
Cervinko Cera	3324669702	improvements for pdf upload function	2016-04-04 23:25:53 +02:00
Cervinko Cera	748dd2ad1f	Merge remote-tracking branch 'upstream/master'	2016-04-03 23:52:37 +02:00
Cervinko Cera	3ddecc007c	Adding unfinished upload function	2016-04-03 23:52:32 +02:00
Jan Broer	7342837aa3	Merge branch 'html-fixes'	2016-04-03 23:33:43 +02:00
Jan Broer	318d65bf3a	Small UI fixes ... * Smart truncate long titles in overview pages * Fix responsive grid in overview * Update favicon	2016-04-03 23:33:29 +02:00
Cervinko Cera	cb2ac4d142	for for editing Author	2016-04-03 23:22:26 +02:00
Cervinko Cera	a96417f2a5	fix for password edit at the admin page	2016-04-03 15:12:48 +02:00
Cervinko Cera	a395e9f301	remove orphaned authors	2016-04-03 00:31:30 +02:00
Cervinko Cera	c6500b7eca	Merge remote-tracking branch 'upstream/master'	2016-03-29 13:56:24 +02:00
Cervinko Cera	1a922d4552	Fix crash when 'view book after edit' is not checked	2016-03-29 00:30:59 +02:00
Cervinko Cera	cd0aeb2857	Add Typeahead for Author input	2016-03-29 00:09:11 +02:00
Jan Broer	13a024a77d	Add logging / Optimize CSS	2016-03-28 21:14:16 +02:00
Cervinko Cera	d979ed89c6	Fixes for editing Authors	2016-03-28 16:42:38 +02:00
Jan Broer	34cd613e29	Fixes broken send-to-kindle	2016-03-27 23:41:55 +02:00
Jan Broer	17622c1fbf	Fix download error when book title contains non-latin characters (e.g. Chinese)	2016-03-26 17:17:11 +01:00
Jan Broer	f163ef2202	make pretty filenames for downloads; remove random books section on most pages	2016-03-26 16:12:29 +01:00
Jan Broer	2b846b1e6b	Make shelf names required unique	2015-10-13 19:12:18 +02:00
Jan Broer	350285607b	Add HTTP-BASIC Auth for OPDS downloads	2015-10-13 19:06:37 +02:00
Jan Broer	6b4ddbe946	Fix: admin functions were accessible for regular users	2015-10-13 18:07:17 +02:00
Jan Broer	e21e974457	Add public account registration	2015-10-13 02:30:55 +02:00
Jan Broer	af4f7396cd	Fix titles and covers	2015-10-12 04:04:47 +02:00
Jan Broer	2e4117eac2	support for removing books from shelfs	2015-10-12 03:09:56 +02:00
Jan Broer	c92de6e539	Fix filename of book download (was pre- and suffixed with single quotes)	2015-08-06 04:10:47 +02:00
Jan Broer	0b5b3b8424	User edit email fix	2015-08-02 21:43:33 +02:00
Jan Broer	aef608aa10	Refactor (settings database, etc...)	2015-08-02 21:23:24 +02:00
Jan Broer	64a9cbce2d	Initial Fork from https://bitbucket.org/raphaelmutschler/calibreserver/	2015-08-02 20:59:11 +02:00