Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						09e7d76c6f 
					 
					
						
						
							
							Merge remote-tracking branch 'kobo_book_delete' into Develop  
						
						... 
						
						
						
						# Conflicts:
#	cps/kobo.py
#	cps/services/SyncToken.py
#	cps/templates/book_edit.html
#	cps/ub.py 
						
						
					 
					
						2020-03-12 20:43:39 +01:00 
						 
				 
			
				
					
						
							
							
								Wanoo 
							
						 
					 
					
						
						
							
						
						a0535aa3db 
					 
					
						
						
							
							Add ComicVine Api  
						
						... 
						
						
						
						Fetching Metadata for comicBook with ComicVine API 
						
						
					 
					
						2020-02-28 16:04:07 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						146068c936 
					 
					
						
						
							
							Merge branch 'Develop'  
						
						... 
						
						
						
						# Conflicts:
#	cps/db.py
#	cps/templates/user_edit.html 
						
						
					 
					
						2020-02-23 13:15:30 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						3b8c5ef21a 
					 
					
						
						
							
							Merge remote-tracking branch 'get_metadata/patch-1'  
						
						... 
						
						
						
						Fix  #1210  Load multiple authors correct via get metadata 
					
						2020-02-23 13:14:12 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						7c89f0b5b9 
					 
					
						
						
							
							Merge with branch develop  
						
						... 
						
						
						
						Release version 
						
						
					 
					
						2020-02-23 09:08:01 +01:00 
						 
				 
			
				
					
						
							
							
								OzzieIsaacs 
							
						 
					 
					
						
						
							
						
						371097eb4d 
					 
					
						
						
							
							Update Updater  
						
						
						
						
					 
					
						2020-02-23 07:54:58 +01:00 
						 
				 
			
				
					
						
							
							
								Johnny A. dos Santos 
							
						 
					 
					
						
						
							
						
						29cb8bfec4 
					 
					
						
						
							
							Fix   #1210  
						
						
						
						
					 
					
						2020-02-21 18:25:02 -03:00 
						 
				 
			
				
					
						
							
							
								Michael Shavit 
							
						 
					 
					
						
						
							
						
						7d99e21d0d 
					 
					
						
						
							
							Merge remote-tracking branch 'original/Develop' into kobo_book_delete  
						
						
						
						
					 
					
						2020-02-17 14:49:42 -05:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						814ad87a42 
					 
					
						
						
							
							Updated pdf viewer to 2.2.228 ( #1184 )  
						
						
						
						
					 
					
						2020-02-09 17:02:47 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						3e4b5e23fa 
					 
					
						
						
							
							Updated pdf viewer to 2.2.228 ( #1184 )  
						
						
						
						
					 
					
						2020-02-09 17:02:28 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						50ba2e329a 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						... 
						
						
						
						# Conflicts:
#	cps/shelf.py 
						
						
					 
					
						2020-02-09 07:00:04 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						b33a2ac90d 
					 
					
						
						
							
							Fix   #1170  Auth-digest Header no longer crashs calibre-web  
						
						... 
						
						
						
						Fix  #1161  Shelfs are reordering again
Update Sortable.js to 2.10.1
Code cosmetics 
					
						2020-02-02 07:47:27 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Shavit 
							
						 
					 
					
						
						
							
						
						c0239a659c 
					 
					
						
						
							
							Add UI support for archived books.  
						
						... 
						
						
						
						Archived books will no longer appear in any book lists or searches, and
may only be restored from the Archive view. 
						
						
					 
					
						2020-01-26 00:27:54 -05:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						3a4d351a57 
					 
					
						
						
							
							Merge remote-tracking branch 'develop/calibur-fix-colon' into Develop  
						
						
						
						
					 
					
						2020-01-15 17:57:00 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						973f555544 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						... 
						
						
						
						(updated tinymce and bootstrap datepicker) 
						
						
					 
					
						2020-01-13 18:39:25 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						1d7e52c198 
					 
					
						
						
							
							Merge with develop:  
						
						... 
						
						
						
						- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup 
						
						
					 
					
						2020-01-13 18:37:29 +01:00 
						 
				 
			
				
					
						
							
							
								Simon Latapie 
							
						 
					 
					
						
						
							
						
						56964a890b 
					 
					
						
						
							
							caliBlur theme: fix custom column display that contain colons  
						
						
						
						
					 
					
						2020-01-12 14:26:07 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						68ca0b86da 
					 
					
						
						
							
							Updated tiniymce + locale  
						
						... 
						
						
						
						updated datepicker + locale
Included cs, fi language, updated ru language 
						
						
					 
					
						2020-01-12 14:11:53 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						79a9ef4859 
					 
					
						
						
							
							Make Kobo optional  
						
						... 
						
						
						
						move jsonschema dependency to optional-requirements.txt
Added version of jsonschema to about section
Added additional column to RemoteAuthToken table
Update configuration of Kobo sync protocol 
						
						
					 
					
						2020-01-12 13:42:39 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						661ed17d23 
					 
					
						
						
							
							Handle stream output in logviewer  
						
						... 
						
						
						
						Add migration of global matrue content settings to user based settings
Fix Caliblur Theme (Publisherslist)
Allow/deny list/edit/add/delete of tags and custom columns
Colored table background for tags restriction 
						
						
					 
					
						2020-01-07 20:26:59 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						d9adb4fc94 
					 
					
						
						
							
							Improvements for limit tags  
						
						
						
						
					 
					
						2020-01-01 17:30:08 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						513ac6cfb4 
					 
					
						
						
							
							Fix for  #768  (If email server is configured, admins can send user passwords, also domains can be denied from registration)  
						
						... 
						
						
						
						Fixes from tests
Fix response opds with read/unread
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages 
						
						
					 
					
						2020-01-01 17:29:01 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						1da4efec86 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						
						
						
					 
					
						2019-12-31 10:52:45 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						5887f0fe6b 
					 
					
						
						
							
							Fix for  #768  (If email server is configured, admins can send user passwords, also domains can be denied from registration)  
						
						
						
						
					 
					
						2019-12-29 13:54:52 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						bbe91f439a 
					 
					
						
						
							
							Merge from master  
						
						
						
						
					 
					
						2019-12-22 15:28:43 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						b586a32843 
					 
					
						
						
							
							Fix   #1115  (comic reader not working under iOS, maybe invalid issue)  
						
						... 
						
						
						
						Improvement for #925  (Next/Prev buttons are bigger) 
						
						
					 
					
						2019-12-22 15:24:22 +01:00 
						 
				 
			
				
					
						
							
							
								zhiyue 
							
						 
					 
					
						
						
							
						
						222797e631 
					 
					
						
						
							
							support douban book search using apikey  
						
						
						
						
					 
					
						2019-12-04 11:59:06 +08:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						0c40e40dc3 
					 
					
						
						
							
							Fix logfile loading behind reverse proxy ( #1047 )  
						
						
						
						
					 
					
						2019-09-27 08:15:10 +02:00 
						 
				 
			
				
					
						
							
							
								Dmitriy Istomin 
							
						 
					 
					
						
						
							
						
						a65ad9483c 
					 
					
						
						
							
							update Bootstrap v3.4.0 -> 3.4.1  
						
						
						
						
					 
					
						2019-08-16 11:18:39 -04:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						c6542fdec6 
					 
					
						
						
							
							New Oauth code  
						
						
						
						
					 
					
						2019-07-20 20:01:05 +02:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						4708347c16 
					 
					
						
						
							
							Merge branch 'Develop'  
						
						... 
						
						
						
						# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt 
						
						
					 
					
						2019-07-13 20:54:21 +02:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						f79d549910 
					 
					
						
						
							
							Fix duplicate user and email (now case insensitive  #948 )  
						
						... 
						
						
						
						Fix sorting in comics (#950 )
Fix log error on Calibre converter error (#953 )
Fix long running tasks (#954 ) 
						
						
					 
					
						2019-07-06 14:35:12 +02:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						cd546eb6d4 
					 
					
						
						
							
							Update comic reader js  
						
						
						
						
					 
					
						2019-06-17 19:48:17 +02:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						c81d4edb7d 
					 
					
						
						
							
							Fix for  #923  
						
						
						
						
					 
					
						2019-06-10 16:38:29 +02:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						26e45f1f57 
					 
					
						
						
							
							Merge remote-tracking branch 'comic-reader/master'  
						
						
						
						
					 
					
						2019-05-31 08:43:51 +02:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						ecedf92783 
					 
					
						
						
							
							Update version  
						
						... 
						
						
						
						Make custom columns visible (#904 ) 
						
						
					 
					
						2019-05-30 10:21:11 +02:00 
						 
				 
			
				
					
						
							
							
								subdiox 
							
						 
					 
					
						
						
							
						
						867aa2f0bd 
					 
					
						
						
							
							Beautify bitjs  
						
						
						
						
					 
					
						2019-05-14 04:28:06 +09:00 
						 
				 
			
				
					
						
							
							
								subdiox 
							
						 
					 
					
						
						
							
						
						7982ed877c 
					 
					
						
						
							
							Downgrade bitjs to es5 branch  
						
						
						
						
					 
					
						2019-05-13 14:53:25 +09:00 
						 
				 
			
				
					
						
							
							
								subdiox 
							
						 
					 
					
						
						
							
						
						c0d136ccd8 
					 
					
						
						
							
							Fix slow loading  
						
						
						
						
					 
					
						2019-05-10 08:16:03 +09:00 
						 
				 
			
				
					
						
							
							
								subdiox 
							
						 
					 
					
						
						
							
						
						c2bfb29726 
					 
					
						
						
							
							Add reading direction settings to readcbr page  
						
						
						
						
					 
					
						2019-04-21 18:20:15 +09:00 
						 
				 
			
				
					
						
							
							
								subdiox 
							
						 
					 
					
						
						
							
						
						204de4aef6 
					 
					
						
						
							
							Fix an issue that fullscreen doens't work on some browsers  
						
						
						
						
					 
					
						2019-04-21 18:02:02 +09:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						0b8624b542 
					 
					
						
						
							
							Deleted load metadata from douban, as API seems to be shut down ( #858 )  
						
						
						
						
					 
					
						2019-04-17 19:55:32 +02:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						436c2671d1 
					 
					
						
						
							
							Fix delete domain entries  
						
						... 
						
						
						
						Fix error handling smtp.authentication error 
						
						
					 
					
						2019-04-14 14:08:49 +02:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						dc933f3d66 
					 
					
						
						
							
							Merge remote-tracking branch 'pdf.js/epubjs'  
						
						... 
						
						
						
						Updated pdf.js 
						
						
					 
					
						2019-04-13 15:02:01 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Pavel 
							
						 
					 
					
						
						
							
						
						439ce19b5d 
					 
					
						
						
							
							Updated epub.js to v0.3.66  
						
						
						
						
					 
					
						2019-03-28 07:23:45 +02:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						4b301a7961 
					 
					
						
						
							
							Additional fix for  #845  (in case of error)  
						
						
						
						
					 
					
						2019-03-26 18:19:39 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						8612dce97c 
					 
					
						
						
							
							Merge remote-tracking branch 'author/shorten-authors'  
						
						
						
						
					 
					
						2019-03-09 20:14:16 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						0b0e62fdf2 
					 
					
						
						
							
							Merge remote-tracking branch 'dialog/master'  
						
						... 
						
						
						
						Fix for #833  
						
						
					 
					
						2019-03-09 20:02:17 +01:00 
						 
				 
			
				
					
						
							
							
								Ozzieisaacs 
							
						 
					 
					
						
						
							
						
						6f80a63ca6 
					 
					
						
						
							
							Fix for  #827  
						
						
						
						
					 
					
						2019-03-09 07:05:43 +01:00 
						 
				 
			
				
					
						
							
							
								Andrew Sullivan 
							
						 
					 
					
						
						
							
						
						3dfc2f2580 
					 
					
						
						
							
							fixing issue  #833  
						
						
						
						
					 
					
						2019-03-08 20:44:45 -05:00