Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							cfa309f0d1
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/services/SyncToken.py
#	cps/static/js/kthoom.js
#	cps/templates/readcbr.html 
						
					 | 
					
						2023-08-28 18:08:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							885d914f18
							
						
					 | 
					
						
						
							
							Update tornado to 6.2
						
						
						
						
						
						
						
						Remove unneeded imports from jsonschema for synctoken
Update optional requirements
Remove invalid direction arrows in comic reader 
						
					 | 
					
						2023-08-28 18:06:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b99427c84
							
						
					 | 
					
						
						
							
							Merged comic save position
						
						
						
						
						
					 | 
					
						2023-08-26 20:12:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							7bb4bc934c
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'caliblur/issues/caliblur2838'
						
						
						
						
						
					 | 
					
						2023-07-29 15:36:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							279f0569e4
							
						
					 | 
					
						
						
							
							Fix visibility for sending to reader without download permissions (fix for #2847)
						
						
						
						
						
					 | 
					
						2023-07-29 15:15:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							986eaf9f02
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'br/horus68-pt-translation'
						
						
						
						
						
					 | 
					
						2023-07-26 20:49:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ghighi Eftimie
							
						 
					 | 
					
						
						
						
						
							
						
						
							ee5cfa1f36
							
						
					 | 
					
						
						
							
							fix for #2838
						
						
						
						
						
					 | 
					
						2023-07-26 15:11:04 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								quarz12
							
						 
					 | 
					
						
						
						
						
							
						
						
							39638d3c9c
							
						
					 | 
					
						
						
							
							updated epub.min.js to version 0.3.93
						
						
						
						
						
					 | 
					
						2023-06-09 16:11:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							fad5929253
							
						
					 | 
					
						
						
							
							Bugfix getPath for logfile viewer
						
						
						
						
						
					 | 
					
						2023-04-16 13:08:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							9f28144779
							
						
					 | 
					
						
						
							
							Fix for #2756 (Home button in caliblur is leading to "/" instead of calibre-web home)
						
						
						
						
						
					 | 
					
						2023-04-16 09:43:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c8ffb3e7e
							
						
					 | 
					
						
						
							
							Bugfix path selection for reverse proxy
						
						
						
						
						
					 | 
					
						2023-03-26 14:31:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d26e6fc85
							
						
					 | 
					
						
						
							
							Bugfix get updater status
						
						
						
						
						
					 | 
					
						2023-03-26 14:19:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							321db4d712
							
						
					 | 
					
						
						
							
							Refactored send email by make use of ajax calls instead of posting the page
						
						
						
						
						
						
						
						Always use getPath instead of pathname 
						
					 | 
					
						2023-03-25 12:34:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c5db34a52
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html 
						
					 | 
					
						2023-02-27 18:54:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							76b0411c33
							
						
					 | 
					
						
						
							
							Bugfix failed tasks can no longer aborted
						
						
						
						
						
						
						
						Metdatabackup is done on startup if app mode is test 
						
					 | 
					
						2023-02-25 16:31:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GarcaMan
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4326c9495
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:GarckaMan/calibre-web into long_strip_cbrreader
						
						
						
						
						
					 | 
					
						2023-02-11 03:25:31 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							7a4e6fbdfb
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html 
						
					 | 
					
						2023-02-06 19:02:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							14d14637cd
							
						
					 | 
					
						
						
							
							Updated test status
						
						
						
						
						
						
						
						updated jzip for epub reader
Bugfix for opds login with ldap
updated requirementes 
						
					 | 
					
						2023-02-06 19:02:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b7a0f3662
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/opds.py
#	cps/server.py
#	cps/web.py 
						
					 | 
					
						2023-02-05 12:10:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c3b69c710
							
						
					 | 
					
						
						
							
							refactored login routines
						
						
						
						
						
					 | 
					
						2023-02-05 08:47:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9769a0975
							
						
					 | 
					
						
						
							
							Revert to latest syncronous jszip version to make comic reader work again
						
						
						
						
						
					 | 
					
						2023-02-01 18:46:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							508e2b4d0a
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/admin.py
#	cps/config_sql.py
#	cps/search.py
#	cps/templates/admin.html
#	cps/web.py
#	setup.cfg
#	test/Calibre-Web TestSummary_Linux.html 
						
					 | 
					
						2023-01-28 18:52:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d75f681247
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'no/Translate-to-norwegian'
						
						
						
						
						
					 | 
					
						2023-01-21 15:44:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8022b1bb36
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'english/master'
						
						
						
						
						
					 | 
					
						2023-01-21 15:19:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jvoisin
							
						 
					 | 
					
						
						
						
						
							
						
						
							4629eec774
							
						
					 | 
					
						
						
							
							Bump sortable.js
						
						
						
						
						
					 | 
					
						2022-12-27 00:18:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ca1281346
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'jszip/compress_dl'
						
						
						
						
						
					 | 
					
						2022-12-25 18:38:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jvoisin
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5e539bbcd
							
						
					 | 
					
						
						
							
							Bump jszip
						
						
						
						
						
					 | 
					
						2022-12-25 16:11:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jvoisin
							
						 
					 | 
					
						
						
						
						
							
						
						
							02ec853e3b
							
						
					 | 
					
						
						
							
							Remove a duplicate library
						
						
						
						
						
					 | 
					
						2022-12-25 16:09:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							567cb2e097
							
						
					 | 
					
						
						
							
							Inlcuded indonesian translation
						
						
						
						
						
					 | 
					
						2022-12-25 13:24:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							5ffb3e917f
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'caliblur/issue/2515'
						
						
						
						
						
					 | 
					
						2022-12-25 11:04:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							66e0a81d23
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'mp3_csrf/save-mp3-position'
						
						
						
						
						
					 | 
					
						2022-12-25 10:34:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d3af5bbd0
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'font_size/issue/487'
						
						
						
						
						
					 | 
					
						2022-12-25 10:29:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							3361c41c6d
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'caliblur/issues/caliBlur'
						
						
						
						
						
					 | 
					
						2022-12-25 09:49:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jvoisin
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d023ce741
							
						
					 | 
					
						
						
							
							Bump jquery's version from 3.6.0 to 3.6.3
						
						
						
						
						
					 | 
					
						2022-12-22 23:38:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ghighi Eftimie
							
						 
					 | 
					
						
						
						
						
							
						
						
							9409b9db9c
							
						
					 | 
					
						
						
							
							fixes for 946, 2284 caliblur
						
						
						
						
						
					 | 
					
						2022-10-21 21:53:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ghighi Eftimie
							
						 
					 | 
					
						
						
						
						
							
						
						
							a992aafc13
							
						
					 | 
					
						
						
							
							fixes #2515
						
						
						
						
						
					 | 
					
						2022-10-21 15:08:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Olivier
							
						 
					 | 
					
						
						
						
						
							
						
						
							adfbd447ed
							
						
					 | 
					
						
						
							
							mp3 player was missing the csrf_token
						
						
						
						
						
					 | 
					
						2022-10-11 19:50:23 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							edc9703716
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'vi/add-translation'
						
						
						
						
						
					 | 
					
						2022-10-02 11:45:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							0f67e57be4
							
						
					 | 
					
						
						
							
							Merge branch 'master'
						
						
						
						
						
					 | 
					
						2022-09-20 19:12:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							071d19b8b3
							
						
					 | 
					
						
						
							
							Fix for #2537 (Impossible to set Denied Column Value from user table)
						
						
						
						
						
					 | 
					
						2022-09-20 19:10:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							c10708ed07
							
						
					 | 
					
						
						
							
							Backup metadata 4th step
						
						
						
						
						
					 | 
					
						2022-09-19 22:39:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a133901e4
							
						
					 | 
					
						
						
							
							Fix: ignore special files originating from Apple devices
						
						
						
						
						
					 | 
					
						2022-09-06 18:06:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							7750ebde0f
							
						
					 | 
					
						
						
							
							Update pdf Reader
						
						
						
						
						
					 | 
					
						2022-09-05 19:42:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							9de474e665
							
						
					 | 
					
						
						
							
							Add galician language to available translations (#2510)
						
						
						
						
						
					 | 
					
						2022-08-27 10:03:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								viljasenville
							
						 
					 | 
					
						
						
						
						
							
						
						
							46e5305f23
							
						
					 | 
					
						
						
							
							Comic reader: ignore special files originating from Apple devices
						
						
						
						
						
					 | 
					
						2022-07-27 11:17:20 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ef8c35fb7
							
						
					 | 
					
						
						
							
							Bugfies password validation from testrun
						
						
						
						
						
					 | 
					
						2022-06-16 14:16:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							04326af2da
							
						
					 | 
					
						
						
							
							password validation working
						
						
						
						
						
					 | 
					
						2022-06-16 11:15:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6a31e5db8
							
						
					 | 
					
						
						
							
							config verify password working
						
						
						
						
						
					 | 
					
						2022-06-16 10:44:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							73d48e4ac1
							
						
					 | 
					
						
						
							
							Frontend for password strength
						
						
						
						
						
					 | 
					
						2022-06-16 08:33:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f44d42f834
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'opds/bugfix_2419'
						
						
						
						
						
						
						
						Bugfix send emails 
						
					 | 
					
						2022-06-06 09:00:09 +02:00 | 
					
					
						
						
							
							
							
						
					 |