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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							e64a504bb1 
							
						 
					 
					
						
						
							
							Working Locale and default language selection in user table edit  
						
						 
						
						
						
					 
					
						2021-02-20 14:18:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a3a11bdf3f 
							
						 
					 
					
						
						
							
							Changed checkbox states are saved on server  
						
						 
						
						
						
					 
					
						2021-02-14 17:49:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0992bafe30 
							
						 
					 
					
						
						
							
							Bulk User management  
						
						 
						
						
						
					 
					
						2021-02-13 13:17:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							251a77c8b4 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Development  
						
						 
						
						... 
						
						
						
						Improved packaging support 
						
					 
					
						2021-02-07 08:54:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							127bfba135 
							
						 
					 
					
						
						
							
							fix wrong path in get_update_status js function  
						
						 
						
						
						
					 
					
						2021-02-01 19:00:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1e5af21000 
							
						 
					 
					
						
						
							
							Fix   #1843  (get path to script via html file and known js file instead of randomly picking last one)  
						
						 
						
						
						
					 
					
						2021-01-31 19:01:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							33a0a4c173 
							
						 
					 
					
						
						
							
							Changed function for getting path in js file  
						
						 
						
						
						
					 
					
						2021-01-31 18:55:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							eeb7974e05 
							
						 
					 
					
						
						
							
							User table:  
						
						 
						
						... 
						
						
						
						Added button for single user edit
Added delete-trash-icon (not working)
Roles are displayed correct per user
Guest user is not visible if anonymous browsing is disabled 
						
					 
					
						2021-01-31 14:54:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f45ea1a31c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						
						
					 
					
						2021-01-31 13:21:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a866dbaa80 
							
						 
					 
					
						
						
							
							Fix mimetype in comic reader  
						
						 
						
						
						
					 
					
						2021-01-31 11:21:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							62447d6b89 
							
						 
					 
					
						
						
							
							Basic User edit in tables  
						
						 
						
						
						
					 
					
						2021-01-31 10:17:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b07a97c17e 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'webp/comic-webp' into master  
						
						 
						
						
						
					 
					
						2021-01-30 14:56:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							41e7d65e2a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'caliblur/master' into master  
						
						 
						
						
						
					 
					
						2021-01-30 14:54:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e6799e7a04 
							
						 
					 
					
						
						
							
							Improved detection of invalid email addresses ( #1831 ) upon registering  
						
						 
						
						
						
					 
					
						2021-01-27 19:18:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0f83f9992c 
							
						 
					 
					
						
						
							
							Added swipe support for epub reader ( fixes   #925 )  
						
						 
						
						... 
						
						
						
						Cleaned reader js include files 
						
					 
					
						2021-01-24 14:19:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d2ad78eb40 
							
						 
					 
					
						
						
							
							Added swipe support for comic reader and txt reader ( #925 )  
						
						 
						
						... 
						
						
						
						Bugfix for txt file not present on serving file 
						
					 
					
						2021-01-24 11:28:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mmonkey 
							
						 
					 
					
						
						
						
						
							
						
						
							bc8bdfe385 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into master  
						
						 
						
						
						
					 
					
						2021-01-02 20:21:15 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							682c3b834f 
							
						 
					 
					
						
						
							
							Revert unrar5 experiment  
						
						 
						
						
						
					 
					
						2021-01-02 15:32:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b100d198e8 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						Remove relate to referrer for tag/custom column allow / deny dialog 
						
					 
					
						2020-12-31 15:12:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7849f2fb4b 
							
						 
					 
					
						
						
							
							Remove relate to referrer for tag/custom column allow / deny dialog  
						
						 
						
						
						
					 
					
						2020-12-31 15:08:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d33b0587cb 
							
						 
					 
					
						
						
							
							Advanced search tags are now multiselects ( #1240 )  
						
						 
						
						
						
					 
					
						2020-12-28 13:44:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7e0ed537b7 
							
						 
					 
					
						
						
							
							irst steps Advanced search with mulitselects  
						
						 
						
						
						
					 
					
						2020-12-27 19:12:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1a83bddf8c 
							
						 
					 
					
						
						
							
							Merge bubble read status  
						
						 
						
						
						
					 
					
						2020-12-27 13:53:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							27dcbcd7e1 
							
						 
					 
					
						
						
							
							paged and orderable shelfs  
						
						 
						
						... 
						
						
						
						Fix for non writable settings db with non configured calibre-web 
						
					 
					
						2020-12-27 10:24:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f6538b6110 
							
						 
					 
					
						
						
							
							New delete user button  
						
						 
						
						... 
						
						
						
						refactored confirm dialogs 
						
					 
					
						2020-12-21 19:50:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9a20faf640 
							
						 
					 
					
						
						
							
							Revert accidentally deleted lines in caliblur! theme  
						
						 
						
						
						
					 
					
						2020-12-17 19:10:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								andylizi 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							123493ee59 
							
						 
					 
					
						
						
							
							Fix   #1255  (support webp in comic viewer)  
						
						 
						
						
						
					 
					
						2020-12-17 23:54:06 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								mmonkey 
							
						 
					 
					
						
						
						
						
							
						
						
							2d498dd138 
							
						 
					 
					
						
						
							
							Preserve publisher links, and fix formatting in custom columns for CaliBlur theme.  
						
						 
						
						
						
					 
					
						2020-12-16 00:58:45 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d64009e23e 
							
						 
					 
					
						
						
							
							preparation for filtered and ordered shelfs  
						
						 
						
						
						
					 
					
						2020-12-13 13:54:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fd8b642d64 
							
						 
					 
					
						
						
							
							Code cosmetics css  
						
						 
						
						... 
						
						
						
						Code cosmetics js
Fixes for links with remote_login 
						
					 
					
						2020-12-13 09:53:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9130aceb5a 
							
						 
					 
					
						
						
							
							Changed admin page  
						
						 
						
						
						
					 
					
						2020-12-11 20:55:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b8336c03c3 
							
						 
					 
					
						
						
							
							Changed admin page  
						
						 
						
						
						
					 
					
						2020-12-11 20:54:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d3986ca14a 
							
						 
					 
					
						
						
							
							Server side file browser  
						
						 
						
						
						
					 
					
						2020-12-11 08:37:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2508c1abb2 
							
						 
					 
					
						
						
							
							Started implement server side filechooser  
						
						 
						
						
						
					 
					
						2020-12-10 14:41:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cb1ebc1cd0 
							
						 
					 
					
						
						
							
							Drag 'n drop for files  
						
						 
						
						
						
					 
					
						2020-12-01 13:52:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							eed2f0a430 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'comic/master' into master  
						
						 
						
						
						
					 
					
						2020-11-22 08:45:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							31fe8cd263 
							
						 
					 
					
						
						
							
							Improvement for  #1721  (shrinked generic cover)  
						
						 
						
						
						
					 
					
						2020-11-22 08:28:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							42c13ae135 
							
						 
					 
					
						
						
							
							Fix for  #1718  (fetch of metadata from google without cover leads to exception)  
						
						 
						
						
						
					 
					
						2020-11-20 20:35:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Markus Gruber 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f2c52fd278 
							
						 
					 
					
						
						
							
							Update jszip to 3.5.0. Update epub.js to 0.3.88.  
						
						 
						
						... 
						
						
						
						Fixes several problems when viewing EPUBs in a browser, for example when jumping to a certain chapter in the table of contents does not work. 
						
					 
					
						2020-11-09 15:47:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							87d60308f2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'caliblur/issue/caliblur-981' into master  
						
						 
						
						
						
					 
					
						2020-11-08 19:29:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e99dd3310c 
							
						 
					 
					
						
						
							
							Exchanged douban apikey  
						
						 
						
						
						
					 
					
						2020-11-07 12:18:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								cbartondock 
							
						 
					 
					
						
						
						
						
							
						
						
							bc52f90ed4 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master'  
						
						 
						
						
						
					 
					
						2020-11-02 11:36:45 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ff88e68904 
							
						 
					 
					
						
						
							
							Add missing locale files  
						
						 
						
						
						
					 
					
						2020-10-31 19:58:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							37a80b935d 
							
						 
					 
					
						
						
							
							Added greek translation  
						
						 
						
						
						
					 
					
						2020-10-31 19:20:00 +01:00