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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							a752e62963 
							
						 
					 
					
						
						
							
							Fix Import problem on python2  
						
						 
						
						
						
					 
					
						2017-03-07 21:08:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c725afc3a8 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'JackED42/feature/ignorable_columns'  
						
						 
						
						
						
					 
					
						2017-03-07 20:36:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							38c782fcf1 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'Douban/prod'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/book_edit.html 
						
					 
					
						2017-03-07 20:30:55 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							bdf28e1475 
							
						 
					 
					
						
						
							
							fix bug for metadata searching result.  
						
						 
						
						
						
					 
					
						2017-03-07 09:49:59 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							a6b2977286 
							
						 
					 
					
						
						
							
							add i18n message for getmeta feature.  
						
						 
						
						
						
					 
					
						2017-03-07 09:46:09 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							f8e4bed8bf 
							
						 
					 
					
						
						
							
							Merge branch 'janeczku-master'  
						
						 
						
						
						
					 
					
						2017-03-07 09:01:56 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							a1cb349fda 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into personal  
						
						 
						
						
						
					 
					
						2017-03-06 23:18:29 +00: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 
							
						 
					 
					
						
						
						
						
							
						
						
							475daaec75 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into personal  
						
						 
						
						
						
					 
					
						2017-03-06 19:23:36 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							e0c35b7420 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'polish_translation/master'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po 
						
					 
					
						2017-03-06 19:21:17 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							376eb8752e 
							
						 
					 
					
						
						
							
							wrong conflict merge  
						
						 
						
						
						
					 
					
						2017-03-06 14:46:44 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radosław Kierznowski 
							
						 
					 
					
						
						
						
						
							
						
						
							cbc47c754e 
							
						 
					 
					
						
						
							
							Update polish translation  
						
						 
						
						... 
						
						
						
						I fixed some of the phrases more understandable. 
						
					 
					
						2017-03-04 21:41:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							e845bdbd56 
							
						 
					 
					
						
						
							
							Fix attachment filename  
						
						 
						
						... 
						
						
						
						File attachment should be url encode rather than utf-8 format 
						
					 
					
						2017-03-05 00:28:37 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							a850e64bfb 
							
						 
					 
					
						
						
							
							Refactor cover detection  
						
						 
						
						... 
						
						
						
						obsolate hardcode %cover_id%= ‘cover’ in <pkg:item name=%cover_id% href=%coverfile%>
now  %cover_id% retrieve from <meta name=“cover” content=%cover_id%> 
						
					 
					
						2017-03-04 15:48:59 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							c702b14340 
							
						 
					 
					
						
						
							
							Fixes for READ/UNREAD  
						
						 
						
						
						
					 
					
						2017-03-03 21:38:54 +00: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kennyl 
							
						 
					 
					
						
						
						
						
							
						
						
							19f939a46c 
							
						 
					 
					
						
						
							
							Update epub.py  
						
						 
						
						... 
						
						
						
						initialize covefile to None first 
						
					 
					
						2017-03-03 00:27:54 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							d5e525305d 
							
						 
					 
					
						
						
							
							Lower case text, some epub have uppercased which is beyond iso639 standard.  
						
						 
						
						
						
					 
					
						2017-03-02 23:20:37 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							13b4ae4c24 
							
						 
					 
					
						
						
							
							more error adaptive  
						
						 
						
						
						
					 
					
						2017-03-02 23:15:15 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							879510da82 
							
						 
					 
					
						
						
							
							Upload support detection of  language  
						
						 
						
						
						
					 
					
						2017-03-02 22:57:02 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								林檎 
							
						 
					 
					
						
						
						
						
							
						
						
							4afb486986 
							
						 
					 
					
						
						
							
							add languages field for BookMeta  
						
						 
						
						
						
					 
					
						2017-03-02 19:59:35 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							896dc04648 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'gitignore/cover-patch-20170301'  
						
						 
						
						
						
					 
					
						2017-03-01 18:10:14 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							80e6311b93 
							
						 
					 
					
						
						
							
							fetch metadata from douban while editing metadata  
						
						 
						
						
						
					 
					
						2017-02-21 17:49:43 +08: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 
							
						 
					 
					
						
						
						
						
							
						
						
							3cadde6579 
							
						 
					 
					
						
						
							
							Fix for ( #117 )  
						
						 
						
						
						
					 
					
						2017-02-18 20:12:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							eaccc3f408 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/janeczku/calibre-web  
						
						 
						
						
						
					 
					
						2017-02-18 10:38:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e712649612 
							
						 
					 
					
						
						
							
							Improvement for  #83 , higher contrast of hamburger menu  
						
						 
						
						... 
						
						
						
						Improvement for #84 , search is excluded from mobile view 
						
					 
					
						2017-02-18 10:38:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							075c4c58e7 
							
						 
					 
					
						
						
							
							Revert os.rename to os.renames  
						
						 
						
						
						
					 
					
						2017-02-17 22:54:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ad40a2b5a6 
							
						 
					 
					
						
						
							
							Bugfix parsing publishing date with milliseconds ( #114 )  
						
						 
						
						
						
					 
					
						2017-02-17 18:22:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							13caa54aad 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'Polish_translation/master'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po 
						
					 
					
						2017-02-12 08:14:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radosław Kierznowski 
							
						 
					 
					
						
						
						
						
							
						
						
							437358d685 
							
						 
					 
					
						
						
							
							Updated Polish translations (170210.2017)  
						
						 
						
						... 
						
						
						
						The update is based on the .pot file on 2017-02-10 20:17 
						
					 
					
						2017-02-11 16:08:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1692044d46 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'default_user_settings/master' ( #105 )  
						
						 
						
						
						
					 
					
						2017-02-10 20:18:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8ededba350 
							
						 
					 
					
						
						
							
							Merged  #106  (polish translation)  
						
						 
						
						
						
					 
					
						2017-02-10 20:01:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radosław Kierznowski 
							
						 
					 
					
						
						
						
						
							
						
						
							c49d5e22cd 
							
						 
					 
					
						
						
							
							Upload polish version  
						
						 
						
						
						
					 
					
						2017-02-10 12:45:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radosław Kierznowski 
							
						 
					 
					
						
						
						
						
							
						
						
							b686498593 
							
						 
					 
					
						
						
							
							I added Polish translation calibre-web  
						
						 
						
						... 
						
						
						
						Translation requires a small fixes. 
						
					 
					
						2017-02-10 00:21:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							bff86f02ca 
							
						 
					 
					
						
						
							
							settings for default role of new register user  
						
						 
						
						
						
					 
					
						2017-02-09 13:46:07 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							df2eb82408 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master  
						
						 
						
						
						
					 
					
						2017-02-09 11:37:23 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ba8e107402 
							
						 
					 
					
						
						
							
							Move vendored css/js to libs folders to fix language stats  
						
						 
						
						
						
					 
					
						2017-02-07 20:33:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ea305ff578 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/move-js-libs'  
						
						 
						
						
						
					 
					
						2017-02-07 20:27:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							98ed740e73 
							
						 
					 
					
						
						
							
							Fixed missing js files for sorting shelfs  
						
						 
						
						
						
					 
					
						2017-02-07 20:14:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								janeczku 
							
						 
					 
					
						
						
						
						
							
						
						
							13919a1d23 
							
						 
					 
					
						
						
							
							Move vendored css/js to libs folders to fix language stats  
						
						 
						
						
						
					 
					
						2017-02-07 19:21:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								idalin 
							
						 
					 
					
						
						
						
						
							
						
						
							219f36be0e 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:janeczku/calibre-web into janeczku-master  
						
						 
						
						
						
					 
					
						2017-02-07 10:12:40 +08:00