Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							fc4436f091 
							
						 
					 
					
						
						
							
							Update Translation  
						
						 
						
						
						
					 
					
						2020-02-23 20:07:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9fc0c3b3de 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'English_texts/master'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/config_edit.html
#	cps/templates/config_view_edit.html
#	cps/templates/layout.html
#	cps/templates/search_form.html
#	cps/templates/user_edit.html 
						
					 
					
						2020-02-23 13:27:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6893635251 
							
						 
					 
					
						
						
							
							Handle kobo auth request  
						
						 
						
						... 
						
						
						
						Handle access from localhost for kobo 
						
					 
					
						2020-02-18 20:36:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ba6b5f8fd1 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						
						
					 
					
						2020-02-17 18:42:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Josh O'Brien 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8f518993a4 
							
						 
					 
					
						
						
							
							Merge branch 'master' into master  
						
						 
						
						
						
					 
					
						2020-02-18 00:21:59 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							16cd57fe55 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'cover_layout/fix-pull-left-cover-layout'  
						
						 
						
						
						
					 
					
						2020-02-16 19:19:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e3ddc16657 
							
						 
					 
					
						
						
							
							Fix opds login not working anymore (due to kobo sync protocol)  
						
						 
						
						
						
					 
					
						2020-02-16 14:25:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							317e59df4b 
							
						 
					 
					
						
						
							
							Bugfixes from tests  
						
						 
						
						
						
					 
					
						2020-02-15 16:02:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							a9a6f5b97e 
							
						 
					 
					
						
						
							
							Renamed restrict -> deny  
						
						 
						
						
						
					 
					
						2020-02-15 10:21:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8b1444ebc2 
							
						 
					 
					
						
						
							
							Improved testability  
						
						 
						
						... 
						
						
						
						Less content exposed with restricted content
Tornado restart and stop working with systemd 
						
					 
					
						2020-02-15 09:08:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kyos 
							
						 
					 
					
						
						
						
						
							
						
						
							509071949a 
							
						 
					 
					
						
						
							
							Moved style to css file  
						
						 
						
						
						
					 
					
						2020-02-13 21:05:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							726595e117 
							
						 
					 
					
						
						
							
							Update for testability  
						
						 
						
						
						
					 
					
						2020-02-10 18:34:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kyos 
							
						 
					 
					
						
						
						
						
							
						
						
							1666e32aaf 
							
						 
					 
					
						
						
							
							Fixes cover layouts in user edit page  
						
						 
						
						
						
					 
					
						2020-02-09 22:31:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kyos 
							
						 
					 
					
						
						
						
						
							
						
						
							6a69bbe4b5 
							
						 
					 
					
						
						
							
							Fixes cover layouts in user edit page  
						
						 
						
						
						
					 
					
						2020-02-09 22:20:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							814ad87a42 
							
						 
					 
					
						
						
							
							Updated pdf viewer to 2.2.228 ( #1184 )  
						
						 
						
						
						
					 
					
						2020-02-09 17:02:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3e4b5e23fa 
							
						 
					 
					
						
						
							
							Updated pdf viewer to 2.2.228 ( #1184 )  
						
						 
						
						
						
					 
					
						2020-02-09 17:02:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ab24ed8088 
							
						 
					 
					
						
						
							
							Handle sorting of hidden books  #1123  
						
						 
						
						... 
						
						
						
						Prevent downloading of covers from hidden books 
						
					 
					
						2020-02-09 14:31:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							50ba2e329a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/shelf.py 
						
					 
					
						2020-02-09 07:00:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6698773d81 
							
						 
					 
					
						
						
							
							Improved testability  
						
						 
						
						
						
					 
					
						2020-02-08 11:33:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Josh O'Brien 
							
						 
					 
					
						
						
						
						
							
						
						
							9b49125776 
							
						 
					 
					
						
						
							
							English Language Updates  
						
						 
						
						... 
						
						
						
						Changes to provide consistency for English language. 
						
					 
					
						2020-02-03 14:22:00 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e44494aad0 
							
						 
					 
					
						
						
							
							Kobo sync enable/disable working  
						
						 
						
						
						
					 
					
						2020-01-27 20:32:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							2eec329bdf 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/user_edit.html
#	optional-requirements.txt 
						
					 
					
						2020-01-26 19:29:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0411d4a8c9 
							
						 
					 
					
						
						
							
							Added 2 new kobo settings: Enable Kobo Sync (currently not working) and proxy Requests to Kobo  
						
						 
						
						... 
						
						
						
						Added fix for kobo reader generating requests without right port number, causing url_for not working correct 
						
					 
					
						2020-01-26 16:52:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ad71d0a03f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'kobo_/develop/fix-new-user' into Develop  
						
						 
						
						
						
					 
					
						2020-01-26 14:43:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							0955c6d6fb 
							
						 
					 
					
						
						
							
							Update Kobo  
						
						 
						
						
						
					 
					
						2020-01-26 14:42:53 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							65105d9dbe 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'cc/develop/custom_float' into Develop  
						
						 
						
						
						
					 
					
						2020-01-15 17:58:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							ce66c752c4 
							
						 
					 
					
						
						
							
							Updated czech translation  
						
						 
						
						... 
						
						
						
						removed language selection for guest user 
						
					 
					
						2020-01-14 18:21:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1d7e52c198 
							
						 
					 
					
						
						
							
							Merge with develop:  
						
						 
						
						... 
						
						
						
						- No. of unread books correct calculated
- logviewer handles stream output correct
- Id for testablility in email server setup 
						
					 
					
						2020-01-13 18:37:29 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							8143c16c14 
							
						 
					 
					
						
						
							
							Added texts for allowed denied tags in configuration  
						
						 
						
						... 
						
						
						
						Removed domain only restriction (now it's also possible to allow/deny name parts of users email)
Fix no. of displayed books in unread books section, with applied restrictions 
						
					 
					
						2020-01-11 13:28:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							42435ab34a 
							
						 
					 
					
						
						
							
							Improved testablility  
						
						 
						
						
						
					 
					
						2020-01-08 19:52:05 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							6a07cfba65 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'proxy_login/1105-reverse-proxy-login'  
						
						 
						
						... 
						
						
						
						Fix for creation of bool config settings (before: new bool columns where always created with true as default) 
						
					 
					
						2020-01-05 13:38:51 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							bbe91f439a 
							
						 
					 
					
						
						
							
							Merge from master  
						
						 
						
						
						
					 
					
						2019-12-22 15:28:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b586a32843 
							
						 
					 
					
						
						
							
							Fix   #1115  (comic reader not working under iOS, maybe invalid issue)  
						
						 
						
						... 
						
						
						
						Improvement for #925  (Next/Prev buttons are bigger) 
						
					 
					
						2019-12-22 15:24:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							288944db2c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'kobo_sync/kobo' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps.py
#	cps/kobo.py
#	cps/kobo_auth.py
#	cps/ub.py 
						
					 
					
						2019-12-20 19:24:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Shavit 
							
						 
					 
					
						
						
						
						
							
						
						
							f84274f1c5 
							
						 
					 
					
						
						
							
							git add missing generate_kobo_auth_url.html  
						
						 
						
						
						
					 
					
						2019-12-20 01:08:15 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Shavit 
							
						 
					 
					
						
						
						
						
							
						
						
							207004beff 
							
						 
					 
					
						
						
							
							Remove config_server_url setting.  
						
						 
						
						
						
					 
					
						2019-12-20 01:02:49 -05:00