Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2eec329bdf 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/user_edit.html
#	optional-requirements.txt 
						
					 
					
						2020-01-26 19:29:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Simon Latapie 
							
						 
					 
					
						
						
						
						
							
						
						
							69fa7d0091 
							
						 
					 
					
						
						
							
							new user: disable kobo token on new user page  
						
						 
						
						... 
						
						
						
						kobo token generator function is related to a user id, which is not
present on new user page.
Disable the Kobo token part when creating a new user. 
						
					 
					
						2020-01-25 22:41:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cd9bb56db5 
							
						 
					 
					
						
						
							
							Cleanup Kobo integration  
						
						 
						
						
						
					 
					
						2020-01-20 06:14:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ce66c752c4 
							
						 
					 
					
						
						
							
							Updated czech translation  
						
						 
						
						... 
						
						
						
						removed language selection for guest user 
						
					 
					
						2020-01-14 18:21:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							79a9ef4859 
							
						 
					 
					
						
						
							
							Make Kobo optional  
						
						 
						
						... 
						
						
						
						move jsonschema dependency to optional-requirements.txt
Added version of jsonschema to about section
Added additional column to RemoteAuthToken table
Update configuration of Kobo sync protocol 
						
					 
					
						2020-01-12 13:42:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							661ed17d23 
							
						 
					 
					
						
						
							
							Handle stream output in logviewer  
						
						 
						
						... 
						
						
						
						Add migration of global matrue content settings to user based settings
Fix Caliblur Theme (Publisherslist)
Allow/deny list/edit/add/delete of tags and custom columns
Colored table background for tags restriction 
						
					 
					
						2020-01-07 20:26:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cabad83418 
							
						 
					 
					
						
						
							
							moved language selection back, default value for restriction columns  
						
						 
						
						... 
						
						
						
						Merge branch 'master' into Develop
# Conflicts:
#	cps/editbooks.py 
						
					 
					
						2020-01-05 16:20:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c60277f4d3 
							
						 
					 
					
						
						
							
							Capitalize language selection in User settings  
						
						 
						
						... 
						
						
						
						Remove sql statement from log.debug statement upon creation of new column in settings database 
						
					 
					
						2020-01-05 14:07:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							48495f0d66 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/helper.py
#	cps/templates/user_edit.html
#	cps/web.py 
						
					 
					
						2020-01-04 07:57:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							32e818af6a 
							
						 
					 
					
						
						
							
							Fix   #1124  
						
						 
						
						
						
					 
					
						2020-01-02 16:09:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							d9adb4fc94 
							
						 
					 
					
						
						
							
							Improvements for limit tags  
						
						 
						
						
						
					 
					
						2020-01-01 17:30:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							513ac6cfb4 
							
						 
					 
					
						
						
							
							Fix for  #768  (If email server is configured, admins can send user passwords, also domains can be denied from registration)  
						
						 
						
						... 
						
						
						
						Fixes from tests
Fix response opds with read/unread
changed db_reconnect
Changed output for error 500 (now including error message)
Fix in task queue after 20 messages 
						
					 
					
						2020-01-01 17:29:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1da4efec86 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2019-12-31 10:52:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1c18a788f4 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'tags_restrict/master' into Develop  
						
						 
						
						
						
					 
					
						2019-12-30 15:15:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							5887f0fe6b 
							
						 
					 
					
						
						
							
							Fix for  #768  (If email server is configured, admins can send user passwords, also domains can be denied from registration)  
						
						 
						
						
						
					 
					
						2019-12-29 13:54:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							01381488f4 
							
						 
					 
					
						
						
							
							Fixes from tests  
						
						 
						
						
						
					 
					
						2019-12-28 16:18:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f705889c23 
							
						 
					 
					
						
						
							
							Inital Kobo  
						
						 
						
						
						
					 
					
						2019-12-17 20:28:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a4416c202d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'rename/develop'  
						
						 
						
						
						
					 
					
						2019-11-16 08:01:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								zelazna 
							
						 
					 
					
						
						
						
						
							
						
						
							3764c33a3a 
							
						 
					 
					
						
						
							
							Add the posibility to change the username  
						
						 
						
						
						
					 
					
						2019-10-01 15:36:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							38f3c2d5b9 
							
						 
					 
					
						
						
							
							Reenabled multiple oauth provider  
						
						 
						
						... 
						
						
						
						deleted duplicate download counting function 
						
					 
					
						2019-07-21 09:45:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4708347c16 
							
						 
					 
					
						
						
							
							Merge branch 'Develop'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	MANIFEST.in
#	README.md
#	cps/helper.py
#	cps/static/js/archive/archive.js
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt 
						
					 
					
						2019-07-13 20:54:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								tomjmul 
							
						 
					 
					
						
						
						
						
							
						
						
							8e8486497f 
							
						 
					 
					
						
						
							
							Restirct a user to a set of tags  
						
						 
						
						
						
					 
					
						2019-03-19 13:53:41 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6fc4b318e8 
							
						 
					 
					
						
						
							
							cover folders beautified  
						
						 
						
						
						
					 
					
						2019-02-03 20:29:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e8ce88095e 
							
						 
					 
					
						
						
							
							Fix viewing Publisher settings for other users  
						
						 
						
						... 
						
						
						
						Fix Visiblilty of read/unread category 
						
					 
					
						2019-01-26 19:06:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							36030b559c 
							
						 
					 
					
						
						
							
							Choosing Theme is now a global setting  
						
						 
						
						
						
					 
					
						2019-01-11 08:36:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Virgil Grigoras 
							
						 
					 
					
						
						
						
						
							
						
						
							5129bc3601 
							
						 
					 
					
						
						
							
							Add entry for publishers to the left menu (+ setting for showing / hiding) + separate publisher page  
						
						 
						
						
						
					 
					
						2018-09-30 18:30:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c36b1ed58a 
							
						 
					 
					
						
						
							
							Added additional ids and classes for easier testing  
						
						 
						
						
						
					 
					
						2018-09-29 15:44:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ba7c734657 
							
						 
					 
					
						
						
							
							Fixes from testing:  
						
						 
						
						... 
						
						
						
						Certificate files are rejected if not both files are provided
Server shuts down controlled after pressing crtl+c
Logfile location is better checked
improvements for better testing (added ids and name in templates) 
						
					 
					
						2018-09-23 19:15:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4a95404e17 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'Convert_all/ebookconvert-any'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/web.py 
						
					 
					
						2018-08-31 15:00:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2453786174 
							
						 
					 
					
						
						
							
							Limit registering domains  
						
						 
						
						
						
					 
					
						2018-08-28 09:42:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cedc183987 
							
						 
					 
					
						
						
							
							Fix   #590 ,  #589 .  
						
						 
						
						... 
						
						
						
						Unified wording Calibre-Web
Replaced one table on admin page, deleted password column
Removed spaces on layout page
Removed uesless commit calls during db migration
Implementation of registering by email 
						
					 
					
						2018-08-27 22:08:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							671bf5cf8d 
							
						 
					 
					
						
						
							
							Integrated  #454  (css is loaded remote)  
						
						 
						
						
						
					 
					
						2018-04-02 10:09:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4346e947e3 
							
						 
					 
					
						
						
							
							Fix for  #447  
						
						 
						
						
						
					 
					
						2018-02-04 07:21:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ba54b9a357 
							
						 
					 
					
						
						
							
							Fix   #365  
						
						 
						
						
						
					 
					
						2017-11-12 14:06:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fd39cbaa6f 
							
						 
					 
					
						
						
							
							Fix   #363  
						
						 
						
						
						
					 
					
						2017-11-12 13:40:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								teflontoni 
							
						 
					 
					
						
						
						
						
							
						
						
							4527693fe3 
							
						 
					 
					
						
						
							
							Move "Show mature content" Checkbox  
						
						 
						
						... 
						
						
						
						In order to make the option safe and sane we move the corresponding checkbox to the settings that need administrator privileges. 
						
					 
					
						2017-09-08 15:47:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							aee8aad976 
							
						 
					 
					
						
						
							
							Add option to hide mature content from some users  
						
						 
						
						... 
						
						
						
						Uses a configurable list of tags to denote what is mature and hides those books from the user 
						
					 
					
						2017-08-08 10:38:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jonathan Rehm 
							
						 
					 
					
						
						
						
						
							
						
						
							66231c8737 
							
						 
					 
					
						
						
							
							Associate label with correct input ( #228 )  
						
						 
						
						
						
					 
					
						2017-07-10 19:26:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cd0d450829 
							
						 
					 
					
						
						
							
							Allow deleting books ( fixes   #119 )  
						
						 
						
						
						
					 
					
						2017-04-14 20:29:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7c6d527a55 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2017-04-02 10:05:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cbc807f3ff 
							
						 
					 
					
						
						
							
							Fix   #138  
						
						 
						
						
						
					 
					
						2017-03-19 20:29:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							d9c48a6203 
							
						 
					 
					
						
						
							
							Merge branch 'master' into develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/db.py
#	cps/web.py 
						
					 
					
						2017-02-26 19:49:49 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							679effbaef 
							
						 
					 
					
						
						
							
							Bugfix placement of "recent downloads in "edit user section"  
						
						 
						
						
						
					 
					
						2017-02-25 13:34:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							156a653c49 
							
						 
					 
					
						
						
							
							Make better usage of big screens in lists  
						
						 
						
						
						
					 
					
						2017-02-25 13:28:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jack Darlington 
							
						 
					 
					
						
						
						
						
							
						
						
							d29d079d15 
							
						 
					 
					
						
						
							
							Now shows read in website, and can be toggled by clicking, two extra options in sidebar (read/unread books)  
						
						 
						
						
						
					 
					
						2017-02-19 20:08:22 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							93b19165cf 
							
						 
					 
					
						
						
							
							Added polish in readme to supported UI languages  
						
						 
						
						... 
						
						
						
						Handling of missing tags in fb import
naming of path is more imitating calibre (replacement of special characters, "pinyining" of author names if unidecode is available )
Sorting of authors (similar to calibre for jr./sr./I..IV endings)
bugfix pathseparator on windows and linux during upload
bugfix os.rename for authordir
publishing date on detailview is formated according to slected locale
filename on downloading from web ui is now correct displayed
added ids to html for testing 
						
					 
					
						2017-02-15 18:09:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4e73b11735 
							
						 
					 
					
						
						
							
							Fix for simplified chinese language  
						
						 
						
						
						
					 
					
						2017-02-05 08:49:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							241c4cef8f 
							
						 
					 
					
						
						
							
							- added best rated section in normal view  
						
						 
						
						... 
						
						
						
						- added most downloaded section in opds view
- imporved fb2 upload, correct handling of missing elements
- author sort is set on editing and uploading files
- Encoding stuff on uploading files 
						
					 
					
						2017-02-04 14:28:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							176c7dce70 
							
						 
					 
					
						
						
							
							- Fix for  #100  
						
						 
						
						... 
						
						
						
						- Fix migration of shelf order
- fix show random books in detail view for authors and series 
						
					 
					
						2017-02-02 19:36:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2c615fdf05 
							
						 
					 
					
						
						
							
							Finalize graphical setup for calibre-web  
						
						 
						
						
						
					 
					
						2017-01-28 20:16:40 +01:00