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
							
						 
					 | 
					
						
						
						
						
							
						
						
							369d5059c3
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'br/patch-2'
						
						
						
						
						
					 | 
					
						2021-10-16 11:43:27 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e5d9d7657
							
						
					 | 
					
						
						
							
							Bugfix toggle readstatus in modal dialog
						
						
						
						
						
					 | 
					
						2021-10-15 19:26:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							1be7dfcdca
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
					 | 
					
						2021-10-15 18:57:18 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							d02eb842c7
							
						
					 | 
					
						
						
							
							Update testresults
						
						
						
						
						
					 | 
					
						2021-10-12 18:40:04 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd53d57516
							
						
					 | 
					
						
						
							
							Fix for remote login
						
						
						
						
						
					 | 
					
						2021-10-10 10:26:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							ac54899415
							
						
					 | 
					
						
						
							
							Bugfixes kobo sync
						
						
						
						
						
					 | 
					
						2021-10-10 10:23:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							abe46e1862
							
						
					 | 
					
						
						
							
							Show checkbox from boolean custom columns on details page with caliblur theme
						
						
						
						
						
					 | 
					
						2021-10-09 15:01:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							3be47d6e57
							
						
					 | 
					
						
						
							
							edit_books prepared for kobo sync
						
						
						
						
						
					 | 
					
						2021-10-09 14:57:23 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed26d34961
							
						
					 | 
					
						
						
							
							Code cleaning (remove python2)
						
						
						
						
						
					 | 
					
						2021-10-04 19:23:24 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							5edde53fed
							
						
					 | 
					
						
						
							
							Improved sync for kobo with additional table
						
						
						
						
						
					 | 
					
						2021-10-03 09:58:45 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							b699796236
							
						
					 | 
					
						
						
							
							Improved CSRF protection
						
						
						
						
						
					 | 
					
						2021-10-03 08:03:14 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							b8eb557761
							
						
					 | 
					
						
						
							
							Corrected translation german -> Anzeigesprache
						
						
						
						
						
					 | 
					
						2021-10-03 08:00:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba40c6693e
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'filepicker/fix-filemodal'
						
						
						
						
						
					 | 
					
						2021-10-02 08:32:44 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							3f6a466ca7
							
						
					 | 
					
						
						
							
							Further language support fixes (displaying "non locale" languages translated)
						
						
						
						
						
					 | 
					
						2021-09-29 19:00:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							861277460d
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
					 | 
					
						2021-09-28 18:50:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fernando Mesquita
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							83babf88fc
							
						
					 | 
					
						
						
							
							msgid "Read Books"  --> msgstr "Livros Lidos"
						
						
						
						
						
					 | 
					
						2021-09-28 12:03:07 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							58735caff3
							
						
					 | 
					
						
						
							
							Enhancements for displaying languages on non english locale
						
						
						
						
						
					 | 
					
						2021-09-26 17:04:53 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xlivevil
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							bf5de95fdc
							
						
					 | 
					
						
						
							
							Update Simplified Chinese translation
						
						
						
						
						
					 | 
					
						2021-09-25 22:08:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							2e25e797dd
							
						
					 | 
					
						
						
							
							Fix #2002 (Added missing default locale and default language view upon importing ldap user)
						
						
						
						
						
					 | 
					
						2021-09-25 14:08:49 +02: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							623a92ebec
							
						
					 | 
					
						
						
							
							Version Bump
						
						
						
						
						
						
						
						Merge branch 'Develop' 
						
					 | 
					
						2021-09-25 10:49:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							2edcd16119
							
						
					 | 
					
						
						
							
							Update version to 0.6.13 for release
						
						
						
						
						
					 | 
					
						2021-09-25 08:34:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							af202bd6d1
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'pt_br/patch-1'
						
						
						
						
						
					 | 
					
						2021-09-25 08:25:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d5a332a84e
							
						
					 | 
					
						
						
							
							Update test results
						
						
						
						
						
					 | 
					
						2021-09-25 08:23:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fernando Mesquita
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d6884164a5
							
						
					 | 
					
						
						
							
							Update messages.po
						
						
						
						
						
						
						
						Read = Leia > Lido 
						
					 | 
					
						2021-09-25 01:07:31 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							356a4f588e
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'nl/master'
						
						
						
						
						
					 | 
					
						2021-09-22 20:43:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							241b31458d
							
						
					 | 
					
						
						
							
							Added ancient and modern Greek translation to greek language
						
						
						
						
						
					 | 
					
						2021-09-22 20:34:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							efb04ddd8f
							
						
					 | 
					
						
						
							
							Fix #2061 (Defective utf-16 txt files)
						
						
						
						
						
					 | 
					
						2021-09-22 19:58:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anatolii Fetisov
							
						 
					 | 
					
						
						
						
						
							
						
						
							781ca7a3f3
							
						
					 | 
					
						
						
							
							Fix filemodal file selection dialog
						
						
						
						
						
					 | 
					
						2021-09-18 09:49:28 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jeroen Hellingman
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							6f6d8df431
							
						
					 | 
					
						
						
							
							Update messages.po
						
						
						
						
						
						
						
						Review of Dutch translations (native speaker); improving consistency in vocabulary still needed. 
						
					 | 
					
						2021-09-02 11:25:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8dc1e9bfa4
							
						
					 | 
					
						
						
							
							Updated test result
						
						
						
						
						
					 | 
					
						2021-08-31 08:33:09 +02:00 | 
					
					
						
						
							
							
							
						
					 |