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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							90b9d37772 
							
						 
					 
					
						
						
							
							Updated readme  
						
						 
						
						
						
					 
					
						2017-03-19 17:22:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9583e57b2e 
							
						 
					 
					
						
						
							
							Update readme  
						
						 
						
						
						
					 
					
						2017-03-19 17:21:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							078afa41cf 
							
						 
					 
					
						
						
							
							Update Readme  
						
						 
						
						
						
					 
					
						2017-03-19 17:19:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0e0e72fb71 
							
						 
					 
					
						
						
							
							Fixes for gevent/gdrive  
						
						 
						
						
						
					 
					
						2017-03-19 17:14:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							907a2eca68 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/janeczku/calibre-web  into develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps.py 
						
					 
					
						2017-03-18 12:48:59 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							806cb5d856 
							
						 
					 
					
						
						
							
							Fixes   #132  
						
						 
						
						
						
					 
					
						2017-03-17 19:58:07 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							8f666d925f 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/janeczku/calibre-web  
						
						 
						
						
						
					 
					
						2017-03-13 14:55:57 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JackED42 
							
						 
					 
					
						
						
						
						
							
						
						
							185380fac0 
							
						 
					 
					
						
						
							
							Merge pull request  #3  from janeczku/master  
						
						 
						
						... 
						
						
						
						Updated translations 
						
					 
					
						2017-03-12 12:36:00 +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