4319 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jack Darlington	df9124f78b	Fix OPDS download	2017-03-02 09:14:46 +00:00
Jack	b8137d2c70	Fixing error with uploading new book / metadata as file was being backed up	2017-03-02 00:28:30 +00:00
Jack Darlington	8e85d1b5bd	Merge branch 'develop' into personal	2017-03-01 22:40:28 +00:00
Jack Darlington	78abf81b2f	Fix for editing metadata and uploading for GDrive	2017-03-01 22:38:03 +00:00
OzzieIsaacs	896dc04648	Merge remote-tracking branch 'gitignore/cover-patch-20170301'	2017-03-01 18:10:14 +01:00
OzzieIsaacs	01a1f838f5	Merge remote-tracking branch 'gitignore/kindlegen-patch-20170301'	2017-03-01 18:02:59 +01:00
林檎	c439f5088c	ignore kindlegen in vendor folder	2017-03-01 17:42:56 +08:00
林檎	583380e71a	path join bug ... , instead of + because get_main_dir is not endswith os.sep	2017-03-01 17:20:58 +08:00
林檎	9a2877ebd5	situation when opf file content is ... <meta name="cover" content="cover.jpg"/>	2017-03-01 14:36:31 +08:00
林檎	7972b987d4	Read img tag of cover file if cover is (x)html ... for example ‘<item id="cover" href="Text/cover.xhtml" media-type="application/xhtml+xml”/>’	2017-03-01 13:18:14 +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	ee5870c6cf	Merge branch 'master' into develop	2017-02-28 22:19:44 +00:00
idalin	338ca61cf9	fixed douban api not working in some cases	2017-02-28 15:17:37 +08:00
idalin	f44574af67	update Chinese translation.	2017-02-28 15:05:14 +08:00
idalin	54bc299e88	get metadata from douban and google while editing.	2017-02-28 14:58:11 +08:00
idalin	67df150aba	Merge branch 'janeczku-master'	2017-02-28 14:54:43 +08:00
idalin	e100702345	get metadata from douban and google while editing.	2017-02-28 14:52:55 +08:00
Radosław Kierznowski	9dfd30e6f3	Merge remote-tracking branch 'origin/master' ... # Conflicts: # cps/translations/pl/LC_MESSAGES/messages.mo # cps/translations/pl/LC_MESSAGES/messages.po	2017-02-27 23:04:34 +01:00
Radosław Kierznowski	2f7fd1d957	Aktualizacja stanu tłumaczenia	2017-02-27 22:57:29 +01:00
Radosław Kierznowski	76c907484b	Merge remote-tracking branch 'refs/remotes/janeczku/master'	2017-02-27 22:40:42 +01:00
OzzieIsaacs	90aa269e92	Merge remote-tracking branch 'polish_translation/master' ... @radzio1993 : Thanks	2017-02-27 21:15:36 +01:00
Radosław Kierznowski	36264e7400	Update polish translation (POT: 2017-02-20 19:47)	2017-02-27 20:48:46 +01:00
Jack Darlington	d9c48a6203	Merge branch 'master' into develop ... # Conflicts: # cps/db.py # cps/web.py	2017-02-26 19:49:49 +00:00
Radosław Kierznowski	9ec5303fdc	Update polish translation (POT: 2017-02-20 19:47)	2017-02-26 18:29:38 +01:00
Radosław Kierznowski	1a2aa10c00	Merge remote-tracking branch 'refs/remotes/janeczku/master'	2017-02-26 17:52:32 +01:00
OzzieIsaacs	679effbaef	Bugfix placement of "recent downloads in "edit user section"	2017-02-25 13:34:33 +01:00
OzzieIsaacs	156a653c49	Make better usage of big screens in lists	2017-02-25 13:28:57 +01:00
OzzieIsaacs	00763d6e4c	Read book is now tied to the right downlolad books for guest users (fixes #110)	2017-02-25 11:14:45 +01:00
OzzieIsaacs	1a83ad713c	Additional version info for sqlite database	2017-02-25 09:02:59 +01:00
Ozzie Isaacs	b876505f22	Delete doubtable.js	2017-02-25 06:15:00 +01:00
OzzieIsaacs	40c6ef3a18	More generic aproach for postion of epub coverfile (#122)	2017-02-24 20:20:41 +01:00
idalin	4a2b5b46a3	merge	2017-02-24 14:36:10 +08:00
idalin	2f1fdab9de	delete douban_meta.js in master.(This is for Chinese user only)	2017-02-24 14:34:08 +08:00
idalin	d6dd28e703	limit search results to 20	2017-02-24 14:29:44 +08:00
OzzieIsaacs	41a20fe3e1	Added version info of dependencys in about section	2017-02-23 19:58:56 +01:00
OzzieIsaacs	0277d08706	Merged #123. ... Thanks @idalin. I think this solves permanently sending to kindle issues like (#94)	2017-02-23 19:06:52 +01:00
idalin	c98617a1cb	Merge branch 'master' into prod	2017-02-23 13:53:36 +08:00
idalin	3dcfebca60	update translations	2017-02-23 13:52:58 +08:00
idalin	b488af4c76	Merge branch 'master' into prod	2017-02-23 12:06:56 +08:00
idalin	9020c35819	fixed send to kindle not working problem for some smtp provider. #94	2017-02-23 11:26:39 +08:00
idalin	a09a2d9ed0	Merge branch 'master' into prod	2017-02-23 09:31:51 +08:00
idalin	2853ed1477	Merge branch 'janeczku-master'	2017-02-23 09:31:04 +08:00
Jack Darlington	51bd888765	Fix registering watch callback	2017-02-23 00:17:14 +00:00
Jack Darlington	6882dd925f	Merge branch 'master' into develop	2017-02-22 23:49:22 +00:00
JackED42	59f3a18998	Update readme.md	2017-02-22 23:48:18 +00:00
JackED42	b9fb621f63	Update readme.md	2017-02-22 23:46:06 +00:00
Jack Darlington	82d01c9001	Merge branch 'master' into develop ... # Conflicts: # cps/web.py	2017-02-22 22:45:19 +00:00
JackED42	a7cd993caa	Merge pull request #1 from janeczku/master ... Bringing fork up to date	2017-02-22 22:28:01 +00:00
Jack Darlington	ff0e0be2cd	Merge branch 'feature/google_drive' into develop	2017-02-22 22:14:48 +00:00