1394 Commits

Author	SHA1	Message	Date
Ozzieisaacs	c1818e8f36	Fix for #672	2018-10-30 22:33:19 +01:00
Ozzieisaacs	ee85492c7d	Fix #662	2018-10-30 21:47:33 +01:00
Ozzieisaacs	5fc742c9c4	Fix #690	2018-10-30 19:29: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
Ozzieisaacs	e080c74032	Merge remote-tracking branch 'ru-translation/patch-2'	2018-10-28 14:10:06 +01:00
OzzieIsaacs	58df19972f	Merge remote-tracking branch 'hungarian/loc-hu' ... Update spanish language	2018-10-15 20:33:54 +02: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	9b4ca22254	Update shelf.html	2018-10-11 18:39:31 +02:00
otapi	c6d3613e57	Add UI link button to shelves	2018-10-11 18:20:38 +02:00
otapi	1201d4086f	Few termchanges	2018-10-11 18:14:57 +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
Chintogtokh Batbold	13883db5a0	Add anchor tags to titles	2018-10-09 11:52:16 +00:00
otapi	922e21438c	Minor fix	2018-10-06 21:42:03 +02:00
otapi	32366ab1ba	HU translation fixes	2018-10-06 21:32:53 +02:00
otapi	62d172f1e0	Delete dummy	2018-10-06 21:05:32 +02:00
otapi	67ecc2c088	HU translation	2018-10-06 21:04:55 +02:00
otapi	81a3b85c07	Create dummy	2018-10-06 21:02:53 +02:00
Victorhck	c09b7f39a5	spanish translation finished	2018-10-05 11:28:06 +02:00
Victorhck	b32ee84d4f	update Spanish translation (WIP	2018-10-04 13:02:25 +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	d8107fb50f	Addressed Codacy trailing space items ... again	2018-10-02 10:22:01 -04:00
bodybybuddha	46b2c9919a	Fix for #295 ... Allow for azw and azw3 files to be "sent" to kindle - these books are actually converted to mobi first	2018-10-01 15:35:51 -04:00
bodybybuddha	1144d97bc1	Fixed updating new book format to be all caps in database ... This keeps us inline with calibre's behavior.	2018-10-01 15:34:16 -04: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	6a007ec881	fix indentations	2018-09-30 18:42:48 +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	c36b1ed58a	Added additional ids and classes for easier testing	2018-09-29 15:44:42 +02: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	cab98a9165	Update translation files	2018-09-23 19:03:14 +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
eddriesen	522e897fee	Updated Dutch translation to current codebase ... As requested, A Dutch update	2018-09-23 15:52:11 +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	80e1a6910d	Fix Updater	2018-09-14 21:18:20 +02:00
OzzieIsaacs	b5ef63d327	Removed fixed update Informations	2018-09-14 21:16:09 +02:00
OzzieIsaacs	4eeeb02b1d	Merge remote-tracking branch 'update_check/master'	2018-09-14 21:12:45 +02:00
OzzieIsaacs	36d26f2089	Merge remote-tracking branch '625/625' ... Update russian translation	2018-09-14 20:36:45 +02:00
bodybybuddha	03dc179bc3	Fixed Codacy Issues	2018-09-14 10:35:01 -04:00
bodybybuddha	89c0904ac9	Fix to #625 - Check to see if target book format already exists before executing conversion.	2018-09-13 21:24:21 -04:00
Admiral Laser Beard	21582f097e	update translation	2018-09-14 00:06:53 +03: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	9616562a76	Revert change from #10478594240d17f2bd73cda597439ade665a1e5c (move general information back to configuration block)	2018-09-09 14:18:56 +02:00
Virgil Grigoras	cfae6e893a	Move update relevant parts to own section	2018-09-09 14:12:12 +02:00
Virgil Grigoras	1047859424	Place general information (db location, amount of books...) on top	2018-09-09 14:01:28 +02:00
Virgil Grigoras	354eac1512	fix html errors and formating	2018-09-09 13:51:28 +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	2f1fe60cd6	Merge remote-tracking branch 'chinese_translation/master'	2018-09-08 09:28:12 +02:00
OzzieIsaacs	0091006aad	Fix #611 ... Fix for #615	2018-09-07 20:04:35 +02:00
OzzieIsaacs	b48de7dc77	Fix for #609	2018-09-06 20:54:48 +02:00
idalin	b103ecdb5c	update simplified Chinese	2018-09-06 16:59:30 +08:00
OzzieIsaacs	0bcb20f674	Fix #604 ... Added missing translation for "select option"	2018-09-03 19:12:15 +02:00
Virgil Grigoras	db9561db89	Show add to shelf button only when there is a result	2018-09-02 22:21:37 +02:00
OzzieIsaacs	0e1711631c	Fix for #600 ... publisher-info is shown on edit page (#599)	2018-09-02 17:21:01 +02:00
OzzieIsaacs	3f2d0ea7bb	Fix #601 ... Removed trailing comma on edit page	2018-09-02 14:05:09 +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	a4190f39de	Fix #577	2018-09-02 08:54:46 +02:00
OzzieIsaacs	4dd6c55c38	Fix for #587 (Better handling of errors in sending email)	2018-09-02 08:41:09 +02:00
OzzieIsaacs	c3b0492834	Refactored make_mobi and convert_ebook functions	2018-08-31 15:19:48 +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	f6ab724020	Fix generating links on tasks pafge	2018-08-22 21:55:26 +02:00
OzzieIsaacs	72fff2a297	Update for running calibre-convert in docker	2018-08-22 21:24:28 +02:00
OzzieIsaacs	7917347508	Revert accidently commited change in admin.html (#580)	2018-08-20 06:59:23 +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	7dac87fa5d	Code cosmetics unrar	2018-08-18 18:38:28 +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	273b1c3fa8	Fix calibre-converter/kindlegen handling on windows and python3	2018-08-18 08:48:42 +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	f8132f4d02	Fix for #574	2018-08-14 17:38:38 +02:00
OzzieIsaacs	bb5d7d7bc0	Fix for #574	2018-08-13 20:43:18 +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	fac0921acf	Fix in exception of emailing	2018-08-13 17:40:11 +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	11b798a01c	Fix #571	2018-08-08 20:03:11 +02:00
OzzieIsaacs	1e5cb29fc9	#571 (temporary fix)	2018-08-08 06:54:38 +02:00
OzzieIsaacs	5ec9051f2e	Add charset to opds feed for read books	2018-08-07 18:19:08 +02:00
Unknown	fdabb804cf	Call print as a function	2018-08-07 17:19:25 +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	82fe282e9b	Converting books from gdrive implemented	2018-08-04 14:00:51 +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	dbf55d6f41	Fix #565	2018-08-01 18:34:54 +02:00
Ozzie Isaacs	7a38c05f12	Stop e-mail-thread on quit or restart	2018-07-31 20:19:43 +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	f8c9777668	Merge remote-tracking branch 'show_url/url-links'	2018-07-24 20:46:04 +02:00
OzzieIsaacs	ab63d08d71	Fix for linux subprocess calibre-convert	2018-07-24 20:43:40 +02:00
Ben Bennett	b271b5f686	Changed the args to subprocess.Popen to pass args to the command ... Before the command was not working correctly to check the calibre version since it seemed to be treating the entire string as the command. So when ' --version' was added it was breaking. I changed the format to pass the command and args as a list and it seems to work correctly.	2018-07-23 11:53:44 -04:00
PJ Eby	83db0f9ad5	Render 'url:' ID type as a link ... Calibre allows 'url:' as a kind of book identifier and shows it in the UI as a link; this change makes calibre-web do the same.	2018-07-18 15:36:51 -04: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	ae0c5d7ec2	Fix for #549	2018-07-18 18:48:41 +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	8d406117ce	Fix #432 added more checks for deleting books	2018-07-14 19:40:59 +02:00
OzzieIsaacs	eb65647774	Fix #539 ... Update Translations	2018-07-14 19: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	9ca454730c	Bugfix finding settings.yaml and dgrive_credentials file	2018-07-07 12:00:46 +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
SiphonSquirrel	30799996c9	Merge remote-tracking branch 'remotes/origin/goodreads-fix' into patch-test	2018-06-03 21:19:19 -04:00
SiphonSquirrel	274d2d9d21	Improve rename logic for directory name collisions.	2018-06-03 21:17:22 -04:00
Ozzie Isaacs	7d5302b47f	Fix accidentially deleted gevent ds	2018-06-02 17:12:54 +02:00
OzzieIsaacs	bf44774f22	Tags in detail view are sorted now	2018-06-02 17:02:18 +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
OzzieIsaacs	43a391d1bd	Redownloaded glyphicon font files #515	2018-05-31 09:33:43 +02:00
Eric Le Lay	513355e2e5	fix #513 OPDS updated date format invalid per Atom specification ... replace space separating date from time with 'T'	2018-05-26 17:21:20 +02:00
Ozzie Isaacs	9867959916	Changed calibre to calibre-web	2018-05-06 16:48:49 +02:00
OzzieIsaacs	1f9527f0e1	Fix #496	2018-05-06 09:55:08 +02:00
Andriy Zasypkin	b2ba8bceb2	tags in detail view are sorted	2018-04-22 14:43:43 -04:00
OzzieIsaacs	66c1966b44	Update french translation	2018-04-13 21:16:37 +02:00
OzzieIsaacs	c27805b4e7	Bugfix Updater python3 ... Bugfix Updater in case of error	2018-04-10 18:50:04 +02:00
OzzieIsaacs	7a20c14dea	Integrated caliblur css	2018-04-03 17:59:06 +02: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	62f7674761	fixed #410 advanced search for publishing date ... fixed misstyping in italian language removed next to "me" after login	2018-04-01 19:31:41 +02:00
OzzieIsaacs	6a2449ffaf	Fix for SSL/NonSSL and gevent	2018-03-31 20:19:37 +02:00
OzzieIsaacs	691a4a88e6	Added support for svg in comics (not working in IE11)	2018-03-31 17:05:15 +02:00
OzzieIsaacs	8bfd3c7e4f	Fix #476	2018-03-31 13:30:22 +02:00
OzzieIsaacs	97adb36f1b	Bugfix Upload Message ... Improved errorhandling at import imagemagick	2018-03-31 08:00:51 +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	ea6a957c05	Changed mulitple books upload to single button	2018-03-26 20:50:04 +02:00
OzzieIsaacs	ee5677f376	Merge remote-tracking branch 'multiload/master'	2018-03-26 20:39:49 +02:00
Mingyue Gao	c6f568534f	fix(template): download book with capital ext by kindle's browser	2018-03-23 22:39:31 +01: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	43eb3b6f9c	button names fixed	2018-03-06 15:41:24 +03:00
Faisal Alghamdi	ff9ee82451	adding multiple files upload feature	2018-03-06 15:31:46 +03:00
OzzieIsaacs	ff2d53b998	Integrated japapanese translation. ... Updated german translation	2018-02-13 16:44:57 +01:00
OzzieIsaacs	0b92a718ba	Merge remote-tracking branch 'Translation/master'	2018-02-13 16:31:55 +01:00
SpaceWhite	51fbb07124	Add japanese translation	2018-02-09 04:35:04 -05:00
OzzieIsaacs	21c2ee4d63	Fix for #443	2018-02-04 08:05:08 +01:00
OzzieIsaacs	7371803184	Fix for #444	2018-02-04 07:37:40 +01:00
OzzieIsaacs	4346e947e3	Fix for #447	2018-02-04 07:21:08 +01: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
OzzieIsaacs	e99e93db1f	#424, #437 Added "apple-touch-icon" for apple devices	2018-01-14 14:15:07 +01:00
OzzieIsaacs	8716054dcf	Fix #436	2018-01-13 14:11:59 +01:00
Andriy Zasypkin	fb41aa8b57	removed debug statement from production	2018-01-11 08:49:49 -05:00
Andriy Zasypkin	28dac34119	auto select format if only one	2018-01-11 08:43:39 -05:00
OzzieIsaacs	2850a84bbc	Fix for deleting books if book path contains no path (#432)	2018-01-10 21:16:51 +01:00
OzzieIsaacs	07d6ba094b	Fix for deleting books in shelfs (#419)	2018-01-06 12:08:55 +01:00
OzzieIsaacs	0329306031	Favicon replaced (#424) with hiher resolution	2018-01-06 11:36:23 +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
OzzieIsaacs	03e2a1e73b	Restored click on progressbar	2017-12-10 14:02:49 +01: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	319077aea9	Import covers from comic files during upload	2017-12-02 17:33:55 +01:00
OzzieIsaacs	5809acfa9e	anonymous user now have always the right to read books (as any other user, too) ... (Fix #287)	2017-12-02 14:25:18 +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	4e11272023	Working on IE11	2017-12-01 10:10:42 +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	0943d50876	Code cosmetics ... Bugfix click on progressbar	2017-11-21 12:46:03 +01:00
OzzieIsaacs	aae9e285a8	Code cosmetics	2017-11-20 21:54:55 +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	9f8cbe8c1f	Merge enhanced UI from ytilis repro	2017-11-19 13:20:59 +01: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	b8d45b664a	Typeahead working again ... Fix for replacing characters in filenames	2017-11-12 18:48:44 +01:00
OzzieIsaacs	ad16194798	Error on deleting non existing book fixed (#382)	2017-11-12 18:08:13 +01:00
OzzieIsaacs	09f86ee8d4	Fix #385	2017-11-12 14:56:49 +01:00
OzzieIsaacs	8388df202f	Merge remote-tracking branch 'dutch/dutchupdate'	2017-11-12 14:52:31 +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	fd39cbaa6f	Fix #363	2017-11-12 13:40:56 +01:00
Thijs van Ulden	5b13171060	Updated Dutch translation	2017-11-05 10:24:35 +01:00
OzzieIsaacs	af8d908bba	Fix #371, #372	2017-11-01 16:55:51 +01:00
OzzieIsaacs	ae1e7c57d5	Update french translation	2017-11-01 16:10:05 +01:00
Yamakuni	f5e1b38e63	French translation correction	2017-10-26 22:44:16 +02: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
OzzieIsaacs	9182d89128	# Fix 361	2017-10-13 19:31:03 +02:00
Cory Sitko	5e4c8c6c65	fixed is_authenticated check	2017-10-10 20:48:50 -04:00
Cory Sitko	8fd67fb1fc	UserBase methods should be properties not classmethods	2017-10-10 18:14:19 -04: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	1eb10be253	Code cosmetics comic reader	2017-10-08 10:41:43 +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	1ada1704b0	excluded read/unread when exposing the catalog to an anonymous user	2017-10-01 18:42:35 +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	d336f9faa6	fixed OPDS templates	2017-10-01 17:16:57 +02:00
unknown	7ddfa1881b	added FB2 mime type	2017-10-01 17:15:44 +02:00
unknown	70d093b193	unicode gave an NameError with python3	2017-10-01 17:14:20 +02:00
Jonathan Rehm	56c71dd4bf	Disable bookmarking when anonymous users are reading	2017-09-30 10:51:20 -07:00
OzzieIsaacs	0512e5a940	Fix #342	2017-09-30 16:25:29 +02:00
OzzieIsaacs	c56a02bab6	Fix #339	2017-09-30 15:24:18 +02:00
OzzieIsaacs	031a175474	Fix Comic reader	2017-09-24 19:38:15 +02:00
Andriy Zasypkin	442fb23b18	python3 compatibility	2017-09-24 07:52:59 -04:00
OzzieIsaacs	2302db4e06	Merge remote-tracking branch 'adv/fix-douban-rating'	2017-09-22 20:57:24 +02:00
OzzieIsaacs	299cf82921	Merge remote-tracking branch 'translation/master' ... # Conflicts: # cps/translations/fr/LC_MESSAGES/messages.mo # cps/translations/fr/LC_MESSAGES/messages.po	2017-09-22 20:56:36 +02:00
Yamakuni	85ec9cba1f	New correction of translation	2017-09-21 12:34:06 +02:00
OzzieIsaacs	a6dfcedfdb	Code cosmetics	2017-09-20 21:13:32 +02:00
OzzieIsaacs	0405cec4ac	Code cosmetics ... Bugfix "Error load settings"	2017-09-18 18:59:08 +02:00
OzzieIsaacs	378a0ca662	Merge remote-tracking branch 'adv/bookmarks'	2017-09-17 20:26:58 +02:00
OzzieIsaacs	2a78a02e0b	Code cosmetics	2017-09-17 19:16:29 +02:00
OzzieIsaacs	34e9ef35f5	Code cosmetics	2017-09-17 15:33:22 +02:00
OzzieIsaacs	a159bb0b97	Code Csmetics kthoom integration	2017-09-17 15:06:01 +02:00
OzzieIsaacs	5b9b36f997	Code cosmetics	2017-09-17 14:51:17 +02:00
OzzieIsaacs	85068d75bf	Update comic reader	2017-09-17 13:37:21 +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	4582aebec1	Bugfix gdriveutils	2017-09-17 10:54:23 +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	dfd3b40865	Fix #325	2017-09-16 19:57:00 +02:00
OzzieIsaacs	bde92113d4	Bugfix Datepicker	2017-09-16 19:30:49 +02:00
OzzieIsaacs	f87800d11c	Merge remote-tracking branch 'meta/upload_new_format_of_existing_book'	2017-09-16 18:55:34 +02:00
OzzieIsaacs	7acf4d40a4	Merge remote-tracking branch 'adv/escape-filename'	2017-09-16 18:53:33 +02:00
OzzieIsaacs	2ef6dc30bd	Added italian translation	2017-09-16 16:58:42 +02:00
OzzieIsaacs	abadaa3f1d	Merge remote-tracking branch 'l/master'	2017-09-16 08:06:35 +02:00
OzzieIsaacs	b30a73c505	Merge remote-tracking branch 'adv/def-variables'	2017-09-16 07:55:44 +02:00
OzzieIsaacs	af0cefa4ac	Update translations	2017-09-16 07:52:53 +02:00
OzzieIsaacs	e26c8a1e46	Merge remote-tracking branch 'd/patch-1'	2017-09-16 07:40:29 +02:00
OzzieIsaacs	5e370fb4b3	Merge remote-tracking branch 'y/master'	2017-09-16 07:38:50 +02:00
Yamakuni	f147c072c6	French translation ... Add and correct	2017-09-14 12:03:36 +02:00
Wouter Dijk	c048a96e07	Updated Dutch translations ... I've added some missing translations and edit some faulty ones. Not finished yet, will continue later on! ;-)	2017-09-14 10:36:39 +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	29f21b148b	Translate 10-based rating to 5-based	2017-09-11 09:58:39 -07:00
Jonathan Rehm	e806494b54	Ensure variables exist before they're used	2017-09-11 09:24:20 -07:00
kyos	8937599ba7	Fixed codacy code control	2017-09-11 17:18:11 +02: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	3366aae6c7	Merge remote-tracking branch 'origin/upload_new_format_of_existing_book' into upload_new_format_of_existing_book ... # Conflicts: # cps/static/css/style.css	2017-09-11 10:48:57 +02:00
kyos	e5b4bed01c	Fixed codacy requirements	2017-09-11 10:48:30 +02:00
kyos	9086f4e0e7	Added option to upload a new format to a given book	2017-09-11 10:48:30 +02:00
Jonathan Rehm	a4f81dd812	Do not include empty strings in list of bookmarks	2017-09-10 15:38:24 -07:00
OzzieIsaacs	c9f36a4d1a	Merge remote-tracking branch 'adv/bookmarks'	2017-09-10 15:00:27 +02:00
Torben Mohrfeldt	94f8cc247c	Reflect title in the logo	2017-09-09 23:59:06 +02:00
OzzieIsaacs	b6b5313f2d	Fix for #315	2017-09-09 14:23:25 +02:00
teflontoni	4527693fe3	Move "Show mature content" Checkbox ... In order to make the option safe and sane we move the corresponding checkbox to the settings that need administrator privileges.	2017-09-08 15:47:22 +02:00
Louis Jencka	b3217496d1	Add progress bar to upload form	2017-09-02 11:51:11 -06:00
OzzieIsaacs	81219663fe	Update translation	2017-09-01 20:39:56 +02:00
OzzieIsaacs	c959a1ccc6	Merge remote-tracking branch 'iss/typo'	2017-09-01 20:31:01 +02:00
OzzieIsaacs	f860694487	Merge remote-tracking branch 'adv/goodreads-more-by'	2017-09-01 20:29:45 +02:00
OzzieIsaacs	429f4a11a9	Merge remote-tracking branch 'adv/es5-syntax'	2017-09-01 20:12:22 +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	282837c7c5	Use ES5 syntax	2017-08-29 07:14:32 -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
Ivan Smirnov	12c98157d5	fix typo:: diffrent -> different	2017-08-27 19:31:58 -07:00
OzzieIsaacs	a8b53ab38a	Merge remote-tracking branch 'adv/common-filters'	2017-08-27 09:36:02 +02:00
OzzieIsaacs	62f6bb4e64	Remove In author marker on authors page	2017-08-27 09:27:55 +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	cf5e2f7cd1	search button is displayed in moon reader (#283), search result is not displayed	2017-08-20 07:10:53 +02:00
OzzieIsaacs	f6425a6569	Merge remote-tracking branch 'adv/cache-buster'	2017-08-19 23:10:12 +02:00
Jonathan Rehm	cda733f4a4	Escape special characters in file names ... Follows Calibre's convention of using underscores as replacements	2017-08-19 11:56:29 -07:00
Jonathan Rehm	8cbd6a8431	Do not append query string if file_hash is not found	2017-08-19 09:09:12 -07:00
Jonathan Rehm	13c2a53c0f	Fix issues with Windows path separators	2017-08-19 08:32:00 -07: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	bd02c92162	Merge remote-tracking branch 'adv/get-meta-data'	2017-08-17 15:32:14 +02:00
OzzieIsaacs	e3d416db4c	Merge remote-tracking branch 'adv/cover-upload'	2017-08-17 15:27:32 +02:00
Jonathan Rehm	866f7944eb	Meta data improvements ... * Add buttons to show/hide results from Douban & Google * Trigger search with "Enter" key * Use Underscore.js template instead of build HTML strings in JavaScript * Keep click event handler in JavaScript instead of using HTML's `onclick` * Normalize Douban & Google results * Update cover image & add cover URL to the form input	2017-08-15 22:11:01 -07:00
OzzieIsaacs	a1538e12e8	Bugfix typeahead on advanced serach page	2017-08-14 20:30:23 +02:00
OzzieIsaacs	de112b0b05	Merge remote-tracking branch 'adv/eslint'	2017-08-14 20:21:52 +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
Jonathan Rehm	08d0404e9c	Add mature_content property to Anonymous class	2017-08-13 07:05:45 -07:00
Jonathan Rehm	8171943b8e	Update to ES5 standards ... Also fix ESLint issues	2017-08-12 22:46:27 -07:00
OzzieIsaacs	91cdb5f60f	Merge remote-tracking branch 'Upper_case/master'	2017-08-12 19:02:57 +02:00
OzzieIsaacs	2f7177742d	Update chinese translation	2017-08-12 18:59:57 +02:00
OzzieIsaacs	dd6c928e2c	Merge remote-tracking branch 'translation/master'	2017-08-12 18:55:08 +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
idalin	274d0f6577	update Chinese translations	2017-08-11 09:32:01 +08:00
idalin	2b27d6570f	Merge branch 'janeczku-master'	2017-08-11 09:26:36 +08:00
idalin	b5cca553b3	update Chinese translations	2017-08-11 09:25:39 +08:00
kyos	9a17a09cc7	Fixed codacy requirements	2017-08-10 12:34:54 +02:00
Ruben Herold	68e3867af3	fix books with uppercase extension	2017-08-10 12:29:08 +02:00
kyos	aa4a5dc3ef	Added option to upload a new format to a given book	2017-08-09 19:56:46 +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
Carlos Clavero	8f5bc2a484	Merge pull request #9 from Kyosfonica/add_css_separation_for_tags_in_advance_search ... Added a 5px separation for all input labels in advanced search	2017-08-01 17:53:07 +02:00
kyos	e948844ea4	Added a 5px separation for all input labels in advanced search to improve readability	2017-08-01 17:51:38 +02:00
Carlos Clavero	1500e0f54f	Merge pull request #8 from Kyosfonica/add_css_separation_for_tags_in_advance_search ... Added a 5px separation for all input labels in advanced search	2017-08-01 17:50:24 +02:00
kyos	b6f097f673	Added a 5px separation for all input labels in advanced search to improve readability	2017-08-01 17:49:14 +02:00
Carlos Clavero	5f78ec4e83	Merge pull request #7 from Kyosfonica/add_css_separation_for_tags_in_advance_search ... Added a 5px separation for all input labels in advanced search	2017-08-01 17:46:13 +02:00
kyos	6048bf3c79	Added a 5px separation for all input labels in advanced search to improve readability	2017-07-31 20:01:55 +02:00
Carlos Clavero	80c021939e	Merge pull request #6 from Kyosfonica/master ... Update dev with latests changes from master	2017-07-31 18:17:59 +02: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	fe52de6b4b	Merge remote-tracking branch 'adv/lighthouse-audit'	2017-07-30 06:59:12 +02:00
OzzieIsaacs	cd2e27d7ad	Merge remote-tracking branch 'adv/previous-pagination'	2017-07-30 06:51:05 +02:00
OzzieIsaacs	82165a67a1	Merge remote-tracking branch 'mail/master'	2017-07-30 06:44:10 +02:00
OzzieIsaacs	626e2e393e	Merge remote-tracking branch 'adv/edit-publish-date'	2017-07-30 06:37:18 +02:00
Mikhail Akushsky	4313910ba0	Fix hmac creation in send_test_email function	2017-07-29 18:06:16 +03:00
Jonathan Rehm	ec118c2254	Move scripts to bottom of body to prevent execution from delaying DOM rendering	2017-07-28 20:07:10 -07:00
Jonathan Rehm	dde4f6afe2	Add missing label	2017-07-28 20:03:43 -07:00
Jonathan Rehm	0b47958fad	Add lang attribute to html tag	2017-07-28 20:03:23 -07:00
Jonathan Rehm	c86fa268c2	Fix/remove duplicate id's	2017-07-28 20:02:53 -07:00
Jonathan Rehm	5162e2eed7	Add img alt attributes	2017-07-28 20:01:31 -07:00
Jonathan Rehm	5465b8e8b7	Add "Previous" pagination button ... I imagine these buttons are still in use when JavaScript is disabled or not loading.	2017-07-28 07:38:35 -07:00
Jonathan Rehm	0afc8f94da	Use TinyMCE's API to update the description's content	2017-07-25 13:16:12 -07:00
Jonathan Rehm	dd124ab356	Make change requested by Codacy	2017-07-23 13:36:21 -07:00
Jonathan Rehm	59afc7eb9f	Make changes requested by Codacy	2017-07-23 13:36:21 -07:00
Jonathan Rehm	3258f4fb79	Make changes requested by Codacy	2017-07-23 13:36:21 -07:00
Jonathan Rehm	61e0405f75	Move TinyMCE into edit_books.js	2017-07-23 13:36:21 -07:00
Jonathan Rehm	5715d27c97	Show localized date over top of date input ... Also move datepicker logic into edit_books.js and edit_books.js below the datepicker file declaration(s)	2017-07-23 13:36:21 -07:00
Jonathan Rehm	36c2b35588	Use bootstrap-datepicker to add datepicking UI for browsers that do not have one built-in	2017-07-23 13:35:35 -07:00
Jonathan Rehm	cc916a4eb4	Add timestamp to default publishing date	2017-07-23 13:35:35 -07:00
Jonathan Rehm	a07798b0db	Standardize indentation	2017-07-23 13:35:35 -07: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	df1b503c2d	Update Translation	2017-07-23 13:25:54 +02:00
OzzieIsaacs	c403fdfa2e	Merge remote-tracking branch 'adv/sorting'	2017-07-23 13:18:24 +02:00
OzzieIsaacs	97d577ef2e	Merge remote-tracking branch 'adv/add-to-shelf-ajax'	2017-07-23 13:16:20 +02:00
OzzieIsaacs	4311091d7d	Merge remote-tracking branch 'adv/python3-fix'	2017-07-23 13:11:37 +02:00
Jonathan Rehm	693c26c2b3	Attach events to button toolbar ... Since this is closer to the elements, we can be more sure that we won't have events fire when we don't want them to. For example, if we're viewing the page in a modal, we don't want the event handler living longer than the content itself.	2017-07-22 11:24:47 -07:00
Jonathan Rehm	d85e0b96dc	Prevent jQuery from cache busting static assets ... If the HTML that's returned from the `$.get` request contains a `<script src="..."/>` tag it loads the JavaScript file via ajax, and by default it attaches a timestamp to it to bust cache. That means the file loads every time the modal is opened, and the browser treats it as a new file each time. The result is that code fires multiple times and events listeners are added multiple times.	2017-07-22 11:11:14 -07:00
Jonathan Rehm	e1a88aa0ab	Make change requested by Codacy	2017-07-22 07:34:38 -07: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
Ozzie Isaacs	2e8a268dfa	Fix #241 No1	2017-07-18 20:39:35 +02:00
OzzieIsaacs	6a9d8efc93	Fixes for #233 (detection of permission errors)	2017-07-16 22:04:40 +02:00
Jonathan Rehm	85ce06850c	Fix for Python 3	2017-07-13 21:28:00 -07:00
Jonathan Rehm	91ba0f0362	Resolve issues with unicode characters in author's name ... I've been unable to reproduce the issue on macOS with Python 2.7/3.6 and Fedora with Python 2.7, but if it happens for others, then it's worth the change.	2017-07-13 21:22:34 -07:00
Jonathan Rehm	51bd2f89df	Use dot notation	2017-07-13 18:09:33 -07:00
Jonathan Rehm	c9c6529567	Use SECRET_KEY from environment variable (#232)	2017-07-11 18:35:55 +02:00
OzzieIsaacs	5985342b79	Bugfix for typeahead in search function and on edit books page	2017-07-11 18:08:12 +02:00
OzzieIsaacs	a8aa1e7623	Merge remote-tracking branch 'button_padding/limit-typeahead-requests'	2017-07-11 17:48:33 +02:00
OzzieIsaacs	cfa69ff4f2	Merge remote-tracking branch 'button_padding/smtp-from'	2017-07-11 17:38:52 +02:00
Jonathan Rehm	9683d50f36	Send mail from the FROM address instead of the login ... When SMTP is configured to use a service that doesn't use an email address to log in – e.g. AWS SES or Postmark – the sendmail request fails saying the FROM address is invalid.	2017-07-11 07:16:19 -07:00
Ozzie Isaacs	f79fb420ba	Removed whitespaces	2017-07-11 16:13:33 +02:00
Jonathan Rehm	802eb628c8	Split event listener and selector string ... Event and selectors appear to have been accidentally combined. The result is that typing in any input triggers a call to the `/get_matching_tags` route. We can probably limit the selector farther to only fire when `#tags` is typed into.	2017-07-10 13:03:58 -07:00
Jonathan Rehm	66231c8737	Associate label with correct input (#228)	2017-07-10 19:26:57 +02:00
Ozzie Isaacs	92f634b6a6	Bugfix link admin section	2017-07-10 12:04:15 +02:00
OzzieIsaacs	74e93e1cdf	Code cosmetics	2017-07-09 20:15:15 +02:00
OzzieIsaacs	1fdb7dc497	Epub Viewer Bugfix Retenia Ipad devices	2017-07-09 16:28:22 +02:00
OzzieIsaacs	16ce7799a2	Improvement of margins in epub reader (fix #210)	2017-07-09 15:49:47 +02:00
OzzieIsaacs	470aea6106	Fix #214 ... Update epub.js lib	2017-07-09 13:27:56 +02:00
OzzieIsaacs	979bcdffd4	Bugfix non working download links ... Bugfix missing divider in detail page	2017-07-09 12:41:09 +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	649579eccd	Move jquery.form to layout.html ... This prevents it from getting loaded each time the details are viewed in a modal dialog.	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	f446e29276	Updater now uses correct "gid" instead of "uid" for change ownership of files (Fix for #213 ) -> update should now working if user id differs from groupid	2017-07-08 14:57:39 +02:00
OzzieIsaacs	2929d95b26	Display all authors names in shelf, like on all other pages (#202)	2017-07-08 13:50:21 +02:00
OzzieIsaacs	aed626b91b	Merge remote-tracking branch 'button_padding/read-unread-counts'	2017-07-08 11:26:07 +02:00
OzzieIsaacs	254e1f5262	Merge remote-tracking branch 'button_padding/simplify-read-code' ... # Conflicts: # cps/static/css/style.css	2017-07-08 11:25:20 +02:00
OzzieIsaacs	15531324ea	Add translation of rich text editor	2017-07-08 11:19:36 +02:00
OzzieIsaacs	77c4da0f07	Merge remote-tracking branch 'button_padding/tinymce'	2017-07-08 11:03:21 +02:00
OzzieIsaacs	4f08608d75	Move download button to top of detail page (#174)	2017-07-08 11:01:40 +02:00
OzzieIsaacs	b876a03f26	- Changed link color on download button to white ... - removed file icons on download button - removed shadow style on download button	2017-07-08 10:57:40 +02:00
OzzieIsaacs	6b71e77436	Merge remote-tracking branch 'Download/feature/download-icon-20170410'	2017-07-08 09:35:09 +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	5276bda153	Merge remote-tracking branch 'button_padding/pad-buttons'	2017-07-06 20:31:25 +02:00
Jonathan Rehm	4fe1536b7e	Simplify the read functionality's code ... * Use block label to toggle the checkbox * Submit form when checkbox's value changes (regardless of whether mouse is used or not) * Remove unused code	2017-07-06 10:33:47 -07:00
Jonathan Rehm	d25300a7fb	Add padding to bottom of buttons on shelf page ... This adds some space between the buttons when viewing them on a mobile device.	2017-07-06 07:44:28 -07:00
OzzieIsaacs	752b813119	Added copyright for language names translations	2017-06-24 13:08:57 +02:00
OzzieIsaacs	0e8d5f158c	Dutch translation included (#207)	2017-06-24 13:04:09 +02:00
Jonathan Rehm	7853cb2602	Add TinyMCE to provide rich-text editing for descriptions	2017-06-22 08:59:28 -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	3acf80c42b	remove debuggingtool	2017-05-22 23:06:55 +02:00
nanu-c	26f314d371	support int custom fields	2017-05-22 22:54:53 +02:00
OzzieIsaacs	5f4d839895	Better output messages for failed kindlegen conversions (fix #191)	2017-05-19 21:30:39 +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	2b50dea304	Updated pdf.js to 1.7.225 (Fix #193)	2017-05-13 14:01:52 +02:00
OzzieIsaacs	a73372d71a	Make kindlegen work again	2017-05-05 21:05:52 +02:00
OzzieIsaacs	6d597f96e5	Integrate Iso639 language name translations to russian translation	2017-05-01 16:24:20 +02:00
Pavel Korovin	a305b65299	Added Russian translation	2017-04-30 22:54:16 +03:00
Murat L	b6fccbd486	Added Google Books and Kobo links (#189) ... * Added Google Books and Kobo links * International link to google	2017-04-27 14:32:30 +01:00
Ozzie Isaacs	4259aa69df	Get rid of shel=true again	2017-04-26 19:39:45 +01:00
Ozzie Isaacs	2d918bfb72	Fix for invalid db path	2017-04-26 19:21:40 +01:00
林檎	95f22aa4b5	add drop shadow to distinct the fixed area	2017-04-26 17:14:18 +08:00
林檎	f6076bc337	media tweak for better download placement	2017-04-26 17:14:18 +08:00
林檎	720c07b9ee	remove empty style	2017-04-26 17:14:18 +08:00
林檎	45eeb6588a	Change Download Style.	2017-04-26 17:14:18 +08:00
Ozzie Isaacs	b8fa748c49	Fix #187 on linux	2017-04-25 22:04:08 +01:00
Ozzie Isaacs	651961ac5e	Fix #187	2017-04-25 20:07:54 +01:00
Matt Hazinski	6f7a240ce2	Ensure file paths in uploads are non-empty, fix #183 (#184) ... * Ensure file paths in uploads are non-empty, fix #183 * Fix AttributeError in process(), handle strings of spaces	2017-04-23 07:22:10 +01:00
Ozzie Isaacs	ede8ae6742	Fix #182, #176	2017-04-21 20:44:17 +02:00
OzzieIsaacs	c80e517c28	Delete books prepared for deleting on doogle drive	2017-04-15 18:24:48 +02:00
OzzieIsaacs	195e581aef	Missing file for deletion of books	2017-04-15 18:18:33 +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	7a07edaff4	Update polish translation	2017-04-14 09:42:15 +02:00
Radosław Kierznowski	3c3720aa0f	Update polish translation (POT: 2017-04-11 22:51)	2017-04-12 14:27:57 +02:00
Radosław Kierznowski	ccf563023b	Merge remote-tracking branch 'refs/remotes/janeczku/master'	2017-04-12 14:00:30 +02:00
林檎	622b1435f1	Fix #172	2017-04-06 22:50:05 +08:00
OzzieIsaacs	fb43110f1c	Merge remote-tracking branch 'spanish_translation/master'	2017-04-04 19:07:20 +02:00
OzzieIsaacs	699bd036e8	Code cosmetics	2017-04-04 19:05:09 +02:00
Gonzalo Cao Cabeza de Vaca	286196fa1d	Updated spanish translations	2017-04-04 15:10:54 +02:00
OzzieIsaacs	dc45b53b24	code cosmetics	2017-04-03 21:05:28 +02:00
OzzieIsaacs	8c7a8a954a	Code cosmetics	2017-04-03 20:05:55 +02:00
OzzieIsaacs	d59be5faf4	Code cosmetics ... Bugfix upload	2017-04-03 19:57:45 +02:00
OzzieIsaacs	ab534b21c1	Code cosmetics	2017-04-02 10:42:33 +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	66181daf6d	Merge remote-tracking branch 'custom-dbpath'	2017-04-02 08:45:47 +02:00
OzzieIsaacs	79d5bab4ba	Code cosmetics	2017-03-31 18:41:05 +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	986f40b80a	Code cosmetics	2017-03-30 21:17:18 +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
Ivan Smirnov	2c173f9848	Read dbpath from $CALIBRE_DBPATH if present ... This is an exploration in potentially enabling multiple libraries to run using the same engine. Since app config is all in the db, we should get no port conflicts and be able to run multiple instances of this app with no issues. Using os.getenv instead of os.environ.get allows us to provide CALIBRE_DBPATH inline with the invocation of the file (`CALIBRE_DBPATH=/foo/bar/` python cps.py)	2017-03-25 13:05:44 -07:00
idalin	4d8b43bd54	update Simplified Chinese translation	2017-03-21 10:16:40 +08:00
Radosław Kierznowski	55ee323ca1	Merge remote-tracking branch 'refs/remotes/janeczku/master' ... # Conflicts: # cps/translations/pl/LC_MESSAGES/messages.mo # cps/translations/pl/LC_MESSAGES/messages.po	2017-03-20 22:01:25 +01: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
Radosław Kierznowski	9c5fe444e6	POT: 2017-03-12 19:10	2017-03-19 16:35:37 +01:00
Jack Darlington	3916205a95	Gdrive optional	2017-03-16 23:36:37 +00:00
Jack Darlington	b352bbfd14	Fix for gevent as optional	2017-03-16 21:02:49 +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
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	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	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
Radosław Kierznowski	89fa9eb02f	Update polish translation ... Calibre Web - polski (POT: 2017-03-11 09:09)	2017-03-11 15:35:38 +01:00
OzzieIsaacs	dbf07cb593	Updated translations	2017-03-11 09:11:19 +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
林檎	d7d29827f4	fix behind	2017-03-08 23:59:56 +08:00
林檎	7bae79d826	fix conflict	2017-03-08 23:56:20 +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	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