Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe21d15194
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'cn/fix/bootstrap-table-locale'
						
						
						
						
						
						
						
						# Conflicts:
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-af.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ar.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-bg.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ca.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-cs.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-da.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-de.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-el.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-es.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-et.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-eu.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fa.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fi.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-fr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-he.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-hu.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-id.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-it.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ja.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ka.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ko.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-nl.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pl.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-pt_BR.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ro.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-ru.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sk.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-sv.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-tr.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-uk.min.js
#	cps/static/js/libs/bootstrap-table/locale/bootstrap-table-zh_Hans_CN.min.js 
						
					 | 
					
						2021-10-16 11:48:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							56a9c62421
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'cn/chinese/master'
						
						
						
						
						
						
						
						# Conflicts:
#	cps/templates/search_form.html 
						
					 | 
					
						2021-10-16 11:41:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							50d703e2d8
							
						
					 | 
					
						
						
							
							Chunked reading status on kobo sync
						
						
						
						
						
						
						
						Bugfix loading text on shelf delete
Bugfix sort books list according to selection without selection 
						
					 | 
					
						2021-10-16 11:28:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							bad4c01474
							
						
					 | 
					
						
						
							
							Fix stored css bug in all typeahead functions (update typeahead -> bugfix typeahead)
						
						
						
						
						
					 | 
					
						2021-10-10 18:02:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							25f608d109
							
						
					 | 
					
						
						
							
							Bugfixes from testrun (load images from gdrive)
						
						
						
						
						
						
						
						Fix locale for new users 
						
					 | 
					
						2021-10-09 09:37:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							aca5324914
							
						
					 | 
					
						
						
							
							Bugfix arrange shelf
						
						
						
						
						
						
						
						Bugfix remote login
Bugfix perform Update 
						
					 | 
					
						2021-10-06 22:06:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d8f9e2feb2
							
						
					 | 
					
						
						
							
							Bugfixes for user import with default locale and default language
						
						
						
						
						
						
						
						Bugfixes from testrun 
						
					 | 
					
						2021-10-06 18:41:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							50919d4721
							
						
					 | 
					
						
						
							
							Added handling for missing flask-wtf dependency
						
						
						
						
						
						
						
						Added CSRF protection (via flask-wtf)
Moved upload function to js file
Fixed error page in case of csrf failure 
						
					 | 
					
						2021-10-04 19:23:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c15e10ac0
							
						
					 | 
					
						
						
							
							Improved csrf protection for remote login
						
						
						
						
						
					 | 
					
						2021-10-03 09:58:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							52be2ad4a2
							
						
					 | 
					
						
						
							
							Improved DJVU Reader
						
						
						
						
						
					 | 
					
						2021-10-03 09:32:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							43fdef5e53
							
						
					 | 
					
						
						
							
							Improved textreader
						
						
						
						
						
					 | 
					
						2021-10-03 09:31:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b82d03c12c
							
						
					 | 
					
						
						
							
							Removed js from search_form, tasks
						
						
						
						
						
						
						
						Added translation of bootstrap-select in user table 
						
					 | 
					
						2021-10-03 08:01:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e064a3ec2b
							
						
					 | 
					
						
						
							
							Removed unnecessary spaces in book convert texts
						
						
						
						
						
					 | 
					
						2021-10-02 07:53:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xlivevil
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							deb91996a8
							
						
					 | 
					
						
						
							
							fix:bootstrap-table locale
						
						
						
						
						
						
						
						Add data-locale in table tag
Add bootstrap-table-locale-all-min-js
Remove bootstrap-table locale dir 
						
					 | 
					
						2021-09-30 20:09:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd1fe6dde0
							
						
					 | 
					
						
						
							
							Fix #2085 (Misaligned shelf names after glyphicon)
						
						
						
						
						
					 | 
					
						2021-09-29 19:26:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xlivevil
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							1b8410e786
							
						
					 | 
					
						
						
							
							Update Simplified Chinese translation
						
						
						
						
						
					 | 
					
						2021-09-25 23:15:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xlivevil
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							fed9eff7b8
							
						
					 | 
					
						
						
							
							Fix the publishstart option in advsearch
						
						
						
						
						
					 | 
					
						2021-09-25 22:10:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							c1ac68e2ae
							
						
					 | 
					
						
						
							
							Fix #2053 (Hovering on cover, now shows tooltip also in Caliblur! Theme)
						
						
						
						
						
					 | 
					
						2021-09-25 14:01:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e3db2796c9
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	test/Calibre-Web TestSummary_Linux.html 
						
					 | 
					
						2021-08-30 20:18:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							86ef1d47e8
							
						
					 | 
					
						
						
							
							Bugfixes from testrun
						
						
						
						
						
					 | 
					
						2021-08-30 08:02:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d79d9ded2
							
						
					 | 
					
						
						
							
							Bugfix from tests (displaying of book languages in user list)
						
						
						
						
						
					 | 
					
						2021-08-29 11:31:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							1fa267ce1b
							
						
					 | 
					
						
						
							
							Final fix for escaping html special chars in tables
						
						
						
						
						
					 | 
					
						2021-08-28 15:47:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							3946ef8f0d
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps.py
#	cps/web.py 
						
					 | 
					
						2021-08-27 16:16:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							91e6d94c83
							
						
					 | 
					
						
						
							
							Improved displaying of username and task title in tasks
						
						
						
						
						
					 | 
					
						2021-08-27 14:27:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							32e27712f0
							
						
					 | 
					
						
						
							
							Added lxml to needed requirements
						
						
						
						
						
						
						
						Improved displaying of series title, book of series, comments and custom comments 
						
					 | 
					
						2021-08-27 09:43:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa9fdd2ada
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
					 | 
					
						2021-08-18 20:32:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							275e073c42
							
						
					 | 
					
						
						
							
							Fix #2085 (Missing spaces between glyphicon and text on sidebar)
						
						
						
						
						
					 | 
					
						2021-08-10 20:17:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xlivevil
							
						 
					 | 
					
						
						
						
						
							
						
						
							bce69b2dfc
							
						
					 | 
					
						
						
							
							Add pdf.js font file
						
						
						
						
						
					 | 
					
						2021-08-07 20:51:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xlivevil
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb97e39d9f
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/xlivevil/calibre-web
						
						
						
						
						
					 | 
					
						2021-08-05 21:39:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xlivevil
							
						 
					 | 
					
						
						
						
						
							
						
						
							913690df78
							
						
					 | 
					
						
						
							
							Fix #1913(set lazyload in pdf reader)
						
						
						
						
						
						
						
						Add favicon.ico in pdf reader 
						
					 | 
					
						2021-08-05 21:37:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e68a3f18fa
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
					 | 
					
						2021-08-01 20:23:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							1534827ad7
							
						
					 | 
					
						
						
							
							With merge button disabled it's no longer possible to open merge dialog
						
						
						
						
						
					 | 
					
						2021-08-01 20:23:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b36422bc05
							
						
					 | 
					
						
						
							
							Update list/grid button action (reverse proxy problem)
						
						
						
						
						
					 | 
					
						2021-08-01 20:06:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							41ca85268f
							
						
					 | 
					
						
						
							
							Update translation files
						
						
						
						
						
					 | 
					
						2021-08-01 17:27:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e9709f304
							
						
					 | 
					
						
						
							
							Make Book-No. of book-range to translatable text
						
						
						
						
						
					 | 
					
						2021-08-01 17:09:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							ceec1051d5
							
						
					 | 
					
						
						
							
							Added option to save books with no nenglish characters
						
						
						
						
						
						
						
						Imporvements on metadata search 
						
					 | 
					
						2021-08-01 13:50:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							53603f79bd
							
						
					 | 
					
						
						
							
							Get_meta button unfocused on return to edit books
						
						
						
						
						
					 | 
					
						2021-07-31 09:00:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							302679719d
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/admin.py
#	cps/converter.py
#	cps/subproc_wrapper.py
#	test/Calibre-Web TestSummary_Linux.html 
						
					 | 
					
						2021-07-30 16:33:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ec2bcd897
							
						
					 | 
					
						
						
							
							Fixes from testrun
						
						
						
						
						
					 | 
					
						2021-07-30 09:25:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5e39a7523
							
						
					 | 
					
						
						
							
							Fix divs in user edit page
						
						
						
						
						
					 | 
					
						2021-07-27 08:09:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c8bfc31e4
							
						
					 | 
					
						
						
							
							fix change name allowd as non admin
						
						
						
						
						
					 | 
					
						2021-07-23 19:34:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							616cc2018a
							
						
					 | 
					
						
						
							
							Fix show cover
						
						
						
						
						
						
						
						Update more debug output for kobo sync 
						
					 | 
					
						2021-07-12 14:58:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e69b1adccd
							
						
					 | 
					
						
						
							
							Fix #2053 (Add tooltip for complete title on hover over cover and title)
						
						
						
						
						
					 | 
					
						2021-07-12 14:17:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							aae81c3d24
							
						
					 | 
					
						
						
							
							Fix #2048 (Display book title in reader)
						
						
						
						
						
					 | 
					
						2021-07-11 12:52:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							ec7803fa76
							
						
					 | 
					
						
						
							
							Update python search Metadata
						
						
						
						
						
					 | 
					
						2021-07-10 07:38:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa2d3d2b36
							
						
					 | 
					
						
						
							
							Update python search Metadata
						
						
						
						
						
					 | 
					
						2021-07-07 21:24:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d5e9cdc5b7
							
						
					 | 
					
						
						
							
							Search Metadata improvements
						
						
						
						
						
					 | 
					
						2021-07-07 21:10:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							67836006c5
							
						
					 | 
					
						
						
							
							Successfull testrun
						
						
						
						
						
					 | 
					
						2021-06-19 14:44:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							1aca1b9fdd
							
						
					 | 
					
						
						
							
							Fixed duplicate ids in logviewer
						
						
						
						
						
					 | 
					
						2021-06-06 16:14:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							ced0bcfe33
							
						
					 | 
					
						
						
							
							Fix missing " in books table
						
						
						
						
						
					 | 
					
						2021-06-05 18:41:52 +02:00 | 
					
					
						
						
							
							
							
						
					 |