Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e815147fb
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/kobo_sync_status.py
#	test/Calibre-Web TestSummary_Linux.html 
						
					 | 
					
						2021-12-19 10:29:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0399d04b7
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'bookmark_csrf/master'
						
						
						
						
						
					 | 
					
						2021-12-14 17:59:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b57fa25de
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'zh/master'
						
						
						
						
						
					 | 
					
						2021-12-14 17:52:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Laurin Neff
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4db9691cfc
							
						
					 | 
					
						
						
							
							Remove white border in full-screen cover preview
						
						
						
						
						
					 | 
					
						2021-12-13 19:36:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xlivevil
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a184f4e71a
							
						
					 | 
					
						
						
							
							Merge branch 'master' into master
						
						
						
						
						
					 | 
					
						2021-12-08 22:58:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							9d9acb058d
							
						
					 | 
					
						
						
							
							Add button to force full kobo sync
						
						
						
						
						
					 | 
					
						2021-12-06 21:02:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd5ab0ef53
							
						
					 | 
					
						
						
							
							Bugfix handle archive bit
						
						
						
						
						
					 | 
					
						2021-12-05 18:01:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d217676350
							
						
					 | 
					
						
						
							
							Upated testresult
						
						
						
						
						
						
						
						Bugfix book table 
						
					 | 
					
						2021-12-05 13:09:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd5711e651
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/web.py 
						
					 | 
					
						2021-12-04 20:56:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							bd01e840ca
							
						
					 | 
					
						
						
							
							Delete books in shelfs, downloaded books, kobo sync status, etc on database change (fixes #620)
						
						
						
						
						
					 | 
					
						2021-12-04 11:50:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jonathan Fenske
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							3f91313303
							
						
					 | 
					
						
						
							
							Update epub.js
						
						
						
						
						
						
						
						send the CSRF token when adding bookmarks 
						
					 | 
					
						2021-11-30 22:24:34 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xlivevil
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							67e3721530
							
						
					 | 
					
						
						
							
							fix(tinymce Simplified Chinese locale):rename zh_CN to zh_Hans_CN
						
						
						
						
						
					 | 
					
						2021-12-01 11:28:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							6deb527769
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
					 | 
					
						2021-11-21 09:14:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ad419dc8c
							
						
					 | 
					
						
						
							
							Fix upload of cover and book formats containing html characters
						
						
						
						
						
					 | 
					
						2021-11-20 13:40:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4fd4cf4355
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/static/css/style.css
#	cps/web.py 
						
					 | 
					
						2021-11-13 17:41:16 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							42cc13d1e2
							
						
					 | 
					
						
						
							
							Mark which functions are selected on list pages
						
						
						
						
						
					 | 
					
						2021-11-03 21:07:16 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e0ff0f9c2
							
						
					 | 
					
						
						
							
							Fix #2045 ("fetch metadata" update appends to the existing tags instead or replacing them)
						
						
						
						
						
					 | 
					
						2021-11-03 18:16:15 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							95371d0d7f
							
						
					 | 
					
						
						
							
							Fix shelf grid ordering for inverted order at page load
						
						
						
						
						
						
						
						Ordering buttons now visible on medium size screens 
						
					 | 
					
						2021-11-02 20:27:50 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							a5415e00d5
							
						
					 | 
					
						
						
							
							Fix grid to list in series view
						
						
						
						
						
						
						
						Fix sort asc, desc in author and series list 
						
					 | 
					
						2021-11-01 13:11:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b3b85bf692
							
						
					 | 
					
						
						
							
							Fix position read mark in standard theme
						
						
						
						
						
					 | 
					
						2021-10-31 16:33:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							a36c6da3ae
							
						
					 | 
					
						
						
							
							Fix position read mark in standard theme
						
						
						
						
						
					 | 
					
						2021-10-31 16:30:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e72c3b40d
							
						
					 | 
					
						
						
							
							Fix position read mark in standard theme
						
						
						
						
						
					 | 
					
						2021-10-31 16:18:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							a8317d900b
							
						
					 | 
					
						
						
							
							Bugfix for edit custom ratings in list edit mode
						
						
						
						
						
						
						
						Bugfix for deleting custom enum in list edit mode 
						
					 | 
					
						2021-10-30 15:50:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							3cfffa1487
							
						
					 | 
					
						
						
							
							Fix for iOS covers are not displayed during infinite scroll on standard theme
						
						
						
						
						
					 | 
					
						2021-10-25 20:06:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							382cd9458f
							
						
					 | 
					
						
						
							
							Fix for #2126 (iOS covers are not displayed during infinite scroll on standard theme)
						
						
						
						
						
					 | 
					
						2021-10-25 20:03:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							be7ac7e163
							
						
					 | 
					
						
						
							
							Update infinite scrolling javascript
						
						
						
						
						
					 | 
					
						2021-10-25 19:17:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a1a32f053
							
						
					 | 
					
						
						
							
							Update infinite scrolling javascript
						
						
						
						
						
					 | 
					
						2021-10-25 19:16:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6a2b8a9ef
							
						
					 | 
					
						
						
							
							Read and archive bit visible in book table
						
						
						
						
						
					 | 
					
						2021-10-24 21:32:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							cdd38350fe
							
						
					 | 
					
						
						
							
							Updated tinymce editor, enabled raw html edit
						
						
						
						
						
					 | 
					
						2021-10-24 17:14:50 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							516e76de4f
							
						
					 | 
					
						
						
							
							Updated tinymce editor, enabled raw html edit
						
						
						
						
						
					 | 
					
						2021-10-24 17:13:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe4db16a7e
							
						
					 | 
					
						
						
							
							html editor in books list
						
						
						
						
						
					 | 
					
						2021-10-21 20:13:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							7671a1d5c8
							
						
					 | 
					
						
						
							
							Fix errormessage after update
						
						
						
						
						
					 | 
					
						2021-10-17 15:36:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							00dc60da79
							
						
					 | 
					
						
						
							
							Added translation for traditional chinese
						
						
						
						
						
					 | 
					
						2021-10-17 15:02:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							666015e867
							
						
					 | 
					
						
						
							
							Fix datepicker localized month names
						
						
						
						
						
						
						
						Removed redundant parenthesis in kobo.py response 
						
					 | 
					
						2021-10-16 20:53:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							9d5e9b28ae
							
						
					 | 
					
						
						
							
							Enabled editing of "number" custom_columns in books list
						
						
						
						
						
					 | 
					
						2021-10-16 20:46:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							cea10d3945
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'comic_sort/comic_reader_sort'
						
						
						
						
						
					 | 
					
						2021-10-16 11:50:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e5d9d7657
							
						
					 | 
					
						
						
							
							Bugfix toggle readstatus in modal dialog
						
						
						
						
						
					 | 
					
						2021-10-15 19:26:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e58eb8dac1
							
						
					 | 
					
						
						
							
							Show checkbox from boolean custom columns on details page with caliblur theme
						
						
						
						
						
					 | 
					
						2021-10-15 18:57:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f3efef1f60
							
						
					 | 
					
						
						
							
							Fix stored css bug in all typeahead functions (update typeahead -> bugfix typeahead)
						
						
						
						
						
					 | 
					
						2021-10-11 19:56:54 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							aca5324914
							
						
					 | 
					
						
						
							
							Bugfix arrange shelf
						
						
						
						
						
						
						
						Bugfix remote login
Bugfix perform Update 
						
					 | 
					
						2021-10-06 22:06:33 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba40c6693e
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'filepicker/fix-filemodal'
						
						
						
						
						
					 | 
					
						2021-10-02 08:32:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GarcaMan
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6561456f7
							
						
					 | 
					
						
						
							
							New sort for Comic Reader
						
						
						
						
						
					 | 
					
						2021-10-01 05:47:52 +00: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatolii Fetisov
							
						 
					 | 
					
						
						
						
						
							
						
						
							781ca7a3f3
							
						
					 | 
					
						
						
							
							Fix filemodal file selection dialog
						
						
						
						
						
					 | 
					
						2021-09-18 09:49:28 +03:00 | 
					
					
						
						
							
							
							
						
					 |