Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d87ccae6c9 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/server.py
#	test/Calibre-Web TestSummary_Linux.html 
						
					 
					
						2021-03-19 20:33:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2760a7816d 
							
						 
					 
					
						
						
							
							Fix metadata recognition fb2 files  
						
						 
						
						
						
					 
					
						2021-03-19 20:32:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8f5c649d0f 
							
						 
					 
					
						
						
							
							Updated dependency comicapi (removed pypdf2)  
						
						 
						
						... 
						
						
						
						Updated dependency pyPDF2 ->pyPDF3
Fixed broken updater in case of http error
Bugfixes from testrun
Bugfix load cover for BasicMetadata 
						
					 
					
						2021-03-19 13:35:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fcf9e7a1ef 
							
						 
					 
					
						
						
							
							Upload pdf fixes:  
						
						 
						
						... 
						
						
						
						Handle no title
Handle no author
Fix import of more than one language
Add missing pdf upload publisher handling 
						
					 
					
						2021-03-17 19:06:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2be7b6480a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'pdf/XMP_Metadata3' into master  
						
						 
						
						
						
					 
					
						2021-03-17 19:05:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rra 
							
						 
					 
					
						
						
						
						
							
						
						
							8abfaf0ffd 
							
						 
					 
					
						
						
							
							Parse XMP metadata in separate function, add exception, try multiple metadata formats  
						
						 
						
						
						
					 
					
						2021-03-16 17:53:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b070ba142f 
							
						 
					 
					
						
						
							
							Selects are working in user management with generic confirm dialog  
						
						 
						
						
						
					 
					
						2021-03-16 15:52:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							bd7c6828bf 
							
						 
					 
					
						
						
							
							Selects are working in user management  
						
						 
						
						
						
					 
					
						2021-03-16 15:03:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							da2c3e9ed7 
							
						 
					 
					
						
						
							
							Edit user mass change checkbox working  
						
						 
						
						
						
					 
					
						2021-03-15 16:46:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f62d6abb69 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/server.py
#	test/Calibre-Web TestSummary_Linux.html 
						
					 
					
						2021-03-15 13:53:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							12ad7a6322 
							
						 
					 
					
						
						
							
							Suppress some errors  
						
						 
						
						
						
					 
					
						2021-03-15 13:52:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b75247ea3a 
							
						 
					 
					
						
						
							
							Suppress some errors  
						
						 
						
						
						
					 
					
						2021-03-15 13:48:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9a963bbe79 
							
						 
					 
					
						
						
							
							Refactored code  
						
						 
						
						... 
						
						
						
						Testrun 
						
					 
					
						2021-03-15 13:10:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							994bc8b0e4 
							
						 
					 
					
						
						
							
							Removed dropdown button on single file listen/read ( Fix   #1840 )  
						
						 
						
						
						
					 
					
						2021-03-15 09:06:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2451605033 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'djvu/read-djvu' into master  
						
						 
						
						
						
					 
					
						2021-03-15 08:43:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							10942527f3 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html 
						
					 
					
						2021-03-15 08:22:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4909ed5ccd 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'cliblur/master' into development  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/static/css/style.css 
						
					 
					
						2021-03-15 08:21:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							5cf5df68dc 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'cliblur/master' into master  
						
						 
						
						
						
					 
					
						2021-03-15 08:19:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							dd32cc99ea 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'es/patch-1' into master  
						
						 
						
						
						
					 
					
						2021-03-15 08:17:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							79092dc8eb 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'it/patch-21' into master  
						
						 
						
						
						
					 
					
						2021-03-15 08:11:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6229e4610a 
							
						 
					 
					
						
						
							
							Updated teststatus and bugfix convert ebooks  
						
						 
						
						
						
					 
					
						2021-03-15 08:10:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Northguy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							bfe36d3f4a 
							
						 
					 
					
						
						
							
							change in color definition  
						
						 
						
						... 
						
						
						
						Making color the same as in:
.container-fluid .book .meta .author, .container-fluid .book .meta .author > a {
    color: hsla(0, 0%, 100%, .45)
} 
						
					 
					
						2021-03-15 00:12:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Northguy 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d42bf44fad 
							
						 
					 
					
						
						
							
							Added same color for series name and series number  
						
						 
						
						
						
					 
					
						2021-03-14 23:46:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rra 
							
						 
					 
					
						
						
						
						
							
						
						
							33e352819c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into XMP_Metadata3  
						
						 
						
						
						
					 
					
						2021-03-14 19:58:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							53ee0aaee1 
							
						 
					 
					
						
						
							
							Some functions refactored  
						
						 
						
						
						
					 
					
						2021-03-14 17:34:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							42707a19bd 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 16:57:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0888706790 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 16:53:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							16453a05f8 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 16:02:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2fbb7466d3 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 15:44:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f29f94f45f 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 15:41:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cd973868fc 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 15:29:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3c35f02cac 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 15:18:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							22c93e2389 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						
						
					 
					
						2021-03-14 15:06:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8c751eb532 
							
						 
					 
					
						
						
							
							Some code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 15:06:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4df443e007 
							
						 
					 
					
						
						
							
							Some code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 14:40:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f52fa41439 
							
						 
					 
					
						
						
							
							Fix restart server  
						
						 
						
						... 
						
						
						
						Some code cosmetics 
						
					 
					
						2021-03-14 14:29:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f77d72fd86 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/static/css/style.css 
						
					 
					
						2021-03-14 14:06:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9b80c84794 
							
						 
					 
					
						
						
							
							Some code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 14:05:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							725fc658f8 
							
						 
					 
					
						
						
							
							Some code cosmetics  
						
						 
						
						
						
					 
					
						2021-03-14 13:28:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ElQuimm 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d31b26ae7d 
							
						 
					 
					
						
						
							
							Updated italian message.po  
						
						 
						
						... 
						
						
						
						Have a nice day. 
						
					 
					
						2021-03-04 14:26:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zaroz 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5511925ba2 
							
						 
					 
					
						
						
							
							Removed elif "url" identifier format type  
						
						 
						
						... 
						
						
						
						Removed elif "url" identifier format type, since else output is identical 
						
					 
					
						2021-03-03 21:18:08 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Angel Docampo 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f96b20717d 
							
						 
					 
					
						
						
							
							Updated spanish messages.po  
						
						 
						
						... 
						
						
						
						Corrected a grammatical error 
						
					 
					
						2021-03-04 00:01:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Zaroz 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							940c9c45d7 
							
						 
					 
					
						
						
							
							Updated db.py  
						
						 
						
						... 
						
						
						
						changed __repr__ else statement to allow for custom id entries 
						
					 
					
						2021-03-02 23:46:02 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							87d6008dfc 
							
						 
					 
					
						
						
							
							Fix for  #1870  (png was missing in supported picture formats for comic viewer)  
						
						 
						
						
						
					 
					
						2021-02-27 09:23:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b9c0c8d2dc 
							
						 
					 
					
						
						
							
							Update bootstrap table to 1.18.2  
						
						 
						
						
						
					 
					
						2021-02-20 20:03:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							81c30d5fd5 
							
						 
					 
					
						
						
							
							Add missing files from bootstrap editable  
						
						 
						
						... 
						
						
						
						Added user-table single-select header for locale and default-language 
						
					 
					
						2021-02-20 19:55:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0aa33d88a5 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						
						
					 
					
						2021-02-20 14:19:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e64a504bb1 
							
						 
					 
					
						
						
							
							Working Locale and default language selection in user table edit  
						
						 
						
						
						
					 
					
						2021-02-20 14:18:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								jvoisin 
							
						 
					 
					
						
						
						
						
							
						
						
							bc876a159e 
							
						 
					 
					
						
						
							
							Declare variables before using them  
						
						 
						
						... 
						
						
						
						It should fix the following stacktrace:
```
[2021-02-18 14:46:14,771] ERROR {cps:1891} Exception on / [GET]
Traceback (most recent call last):
  File "/opt/calibre/vendor/flask/app.py", line 2447, in wsgi_app
    response = self.full_dispatch_request()
  File "/opt/calibre/vendor/flask/app.py", line 1952, in full_dispatch_request
    rv = self.handle_user_exception(e)
  File "/opt/calibre/vendor/flask/app.py", line 1821, in handle_user_exception
    reraise(exc_type, exc_value, tb)
  File "/opt/calibre/vendor/flask/_compat.py", line 39, in reraise
    raise value
  File "/opt/calibre/vendor/flask/app.py", line 1950, in full_dispatch_request
    rv = self.dispatch_request()
  File "/opt/calibre/vendor/flask/app.py", line 1936, in dispatch_request
    return self.view_functions[rule.endpoint](**req.view_args)
  File "/opt/calibre/cps/usermanagement.py", line 38, in decorated_view
    return login_required(func)(*args, **kwargs)
  File "/opt/calibre/vendor/flask_login/utils.py", line 272, in decorated_view
    return func(*args, **kwargs)
  File "/opt/calibre/cps/web.py", line 719, in index
    return render_books_list("newest", sort_param, 1, page)
  File "/opt/calibre/cps/web.py", line 422, in render_books_list
    entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, order)
  File "/opt/calibre/cps/db.py", line 610, in fill_indexpage
    return self.fill_indexpage_with_archived_books(page, pagesize, database, db_filter, order, False, *join)
  File "/opt/calibre/cps/db.py", line 635, in fill_indexpage_with_archived_books
    #    book = self.order_authors(book)
UnboundLocalError: local variable 'entries' referenced before assignment
``` 
						
					 
					
						2021-02-18 17:02:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4aa1a838ed 
							
						 
					 
					
						
						
							
							Removed f-strings, making it compatible with python 3.5  
						
						 
						
						
						
					 
					
						2021-02-15 14:17:05 +01:00