Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c25afdc203 
							
						 
					 
					
						
						
							
							Chunked sync  
						
						 
						
						
						
					 
					
						2020-12-06 13:21:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							046a074c3a 
							
						 
					 
					
						
						
							
							Catch attribute error on ldap import user  
						
						 
						
						... 
						
						
						
						Fixes for Login with Windows AD 
						
					 
					
						2020-12-03 20:15:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7c96fac95c 
							
						 
					 
					
						
						
							
							Removed unnecessary parameters  
						
						 
						
						
						
					 
					
						2020-12-03 17:33:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							5930c6d5fb 
							
						 
					 
					
						
						
							
							remove parenthesis in LDAP Message  
						
						 
						
						
						
					 
					
						2020-12-03 14:22:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f620d4a9ca 
							
						 
					 
					
						
						
							
							Fix LDAP errors  
						
						 
						
						
						
					 
					
						2020-11-22 11:19:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e2be655d74 
							
						 
					 
					
						
						
							
							Update LDAP, fix Windows AD login ( #1697 )  
						
						 
						
						
						
					 
					
						2020-11-22 08:17:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9bd51c650b 
							
						 
					 
					
						
						
							
							Add config options for client certificate authentication  
						
						 
						
						
						
					 
					
						2020-11-20 19:47:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e8620a0986 
							
						 
					 
					
						
						
							
							Fix logging error on windows with invalid goodreads key/secret  
						
						 
						
						
						
					 
					
						2020-10-14 20:48:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e3f4f24c3e 
							
						 
					 
					
						
						
							
							Fixes for failed email and conversions with gdrive  
						
						 
						
						
						
					 
					
						2020-10-04 13:59:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							884270093b 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'worker/tasks' into Develop  
						
						 
						
						
						
					 
					
						2020-08-31 13:00:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							ef49e2b5b3 
							
						 
					 
					
						
						
							
							Revert daemon in favor of timeout  
						
						 
						
						
						
					 
					
						2020-08-30 13:49:45 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							9b9e29a3b6 
							
						 
					 
					
						
						
							
							Implement worker thread as a daemon  
						
						 
						
						
						
					 
					
						2020-08-30 13:29:42 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							1a9a436cbe 
							
						 
					 
					
						
						
							
							Fixed wrong translation string  
						
						 
						
						... 
						
						
						
						Removed unused variables from callback in server.py
Update Testresults 
						
					 
					
						2020-08-30 17:11:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								OzzieIsaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							62dd29d2f3 
							
						 
					 
					
						
						
							
							Renamed email to mail due to naming conflict in python2  
						
						 
						
						
						
					 
					
						2020-08-30 08:49:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							e7eb5b6ea6 
							
						 
					 
					
						
						
							
							Improvements to task processing  
						
						 
						
						... 
						
						
						
						* Moves clean up to separate function for organization
* moves the `self.dequeued.append(item)` immediately after `self.queue.get()` so that we don't wait for it to show up
(cherry picked from commit bc9372e88f0c8855694431f811702d7fb899a97e) 
						
					 
					
						2020-08-29 12:25:33 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							4cb82ea9bd 
							
						 
					 
					
						
						
							
							Revert testing condition that decreased number of tasks kept  
						
						 
						
						
						
					 
					
						2020-08-27 21:49:55 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							572ac4a17b 
							
						 
					 
					
						
						
							
							Fix for deleting old, completed tasks  
						
						 
						
						... 
						
						
						
						(cherry picked from commit e066d7a4b0f47d3327696a11795cdc923ff0f6f3) 
						
					 
					
						2020-08-27 21:46:20 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							508f49df18 
							
						 
					 
					
						
						
							
							Remove completed tasks and sort the tasks by date added when calling .tasks  
						
						 
						
						
						
					 
					
						2020-08-23 23:00:23 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							bec280c6b1 
							
						 
					 
					
						
						
							
							Add some error handling  
						
						 
						
						
						
					 
					
						2020-08-23 21:51:44 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							59d56d5c83 
							
						 
					 
					
						
						
							
							py27 support (I think) and some clean up  
						
						 
						
						
						
					 
					
						2020-08-23 21:21:55 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							2533c9c14e 
							
						 
					 
					
						
						
							
							Continue converting tasks - email and upload tasks  
						
						 
						
						
						
					 
					
						2020-08-22 22:44:28 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								blitzmann 
							
						 
					 
					
						
						
						
						
							
						
						
							f10f0dada6 
							
						 
					 
					
						
						
							
							First working PoC with a new task structure  
						
						 
						
						
						
					 
					
						2020-08-22 16:31:00 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzie Isaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							42a0639bb5 
							
						 
					 
					
						
						
							
							Fix   #1533  (Invalid LDAP Cert Path no longer crashes app)  
						
						 
						
						
						
					 
					
						2020-07-23 19:23:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							12263ff02f 
							
						 
					 
					
						
						
							
							Fix   #1423  (OverflowError thrown during sync on some Linux Systems if one of the timestamps is outside range 1970 to 2038)  
						
						 
						
						
						
					 
					
						2020-07-05 13:55:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							76f914cbc2 
							
						 
					 
					
						
						
							
							Fixed logging in SyncToken  
						
						 
						
						
						
					 
					
						2020-07-05 13:52:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							c1f5252b3f 
							
						 
					 
					
						
						
							
							Fix   #1509  (OSError thrown during sync on Windows if one of the timestamps is outside range 1970 to 2038)  
						
						 
						
						
						
					 
					
						2020-07-05 13:40:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							88d2c60ee8 
							
						 
					 
					
						
						
							
							Catch some errors related to non writable settings db  
						
						 
						
						
						
					 
					
						2020-06-27 13:22:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b852fb0e26 
							
						 
					 
					
						
						
							
							Merge branch 'Develop'  
						
						 
						
						
						
					 
					
						2020-05-25 21:30:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4368c182a0 
							
						 
					 
					
						
						
							
							Make goodreads compatible for betterreads dependency  
						
						 
						
						
						
					 
					
						2020-05-06 20:57:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							b4d7733e0a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/templates/list.html
#	cps/translations/cs/LC_MESSAGES/messages.po
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fi/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/hu/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.po
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	messages.pot 
						
					 
					
						2020-04-25 20:06:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							24c743d23d 
							
						 
					 
					
						
						
							
							Code cosmetics  
						
						 
						
						
						
					 
					
						2020-04-19 19:08:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							7bb5afa585 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'kobo/shelves' into Develop  
						
						 
						
						
						
					 
					
						2020-04-18 21:12:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							06fde4fcd0 
							
						 
					 
					
						
						
							
							Fix   #1311  (Enable LDAP Anonymous Login)  
						
						 
						
						
						
					 
					
						2020-04-18 11:48:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							81a329f1e7 
							
						 
					 
					
						
						
							
							Fix for  #1087  ( Caliblur! Theme button alignment)  
						
						 
						
						
						
					 
					
						2020-04-17 18:16:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							9e159ed5ab 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/config_sql.py
#	cps/ub.py
#	cps/web.py 
						
					 
					
						2020-04-16 20:12:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3fbaba6693 
							
						 
					 
					
						
						
							
							Fix   #1307  
						
						 
						
						
						
					 
					
						2020-04-14 18:28:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							4749eccfa5 
							
						 
					 
					
						
						
							
							Added fix for python2 regex  
						
						 
						
						... 
						
						
						
						Fix for python2 attributeError instead of TypeError on login with wrong openLDAP setting
Added default empty string on LDAPCertificate
Fix ldap as scheme for tls connection
Enabled add user on LDAP Authentication
LDAP config port is now number input
Added header for user import config
Added python ldap version to about section
Fix: It's no longer possible to login via fallback password as long as LDAP server is available
Fix: TypeError on bind is now catched and transformed to error message
Update Readme
Fixes for ldap 
						
					 
					
						2020-04-14 10:58:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Shavit 
							
						 
					 
					
						
						
						
						
							
						
						
							41a3623fcc 
							
						 
					 
					
						
						
							
							[Kobo] Add Shelf/Collection support.  
						
						 
						
						... 
						
						
						
						Implements the v1/library/tags set of endpoints to sync CalibreWeb
shelves with the Kobo device.
Drive-by: Refactors shelf.py to consolidate how user permissions are checked.
Drive-by: Fix issue with the sync endpoint that arrises when a book is
hard-deleted. 
						
					 
					
						2020-04-12 22:29:20 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8bee424cc0 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'ldap/master'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/admin.py
#	cps/templates/admin.html
#	cps/templates/config_edit.html
#	cps/web.py 
						
					 
					
						2020-04-05 17:31:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Shavit 
							
						 
					 
					
						
						
						
						
							
						
						
							de0e27c512 
							
						 
					 
					
						
						
							
							Fix   #1164  merge.  
						
						 
						
						
						
					 
					
						2020-03-12 20:09:26 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							09e7d76c6f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'kobo_book_delete' into Develop  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/kobo.py
#	cps/services/SyncToken.py
#	cps/templates/book_edit.html
#	cps/ub.py 
						
					 
					
						2020-03-12 20:43:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Shavit 
							
						 
					 
					
						
						
						
						
							
						
						
							8e1641dac9 
							
						 
					 
					
						
						
							
							Add support for syncing Kobo reading state.  
						
						 
						
						
						
					 
					
						2020-03-01 22:01:05 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							32a6beae65 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'fix/kobo'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/kobo.py 
						
					 
					
						2020-02-23 13:17:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Shavit 
							
						 
					 
					
						
						
						
						
							
						
						
							7d99e21d0d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'original/Develop' into kobo_book_delete  
						
						 
						
						
						
					 
					
						2020-02-17 14:49:42 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							e44494aad0 
							
						 
					 
					
						
						
							
							Kobo sync enable/disable working  
						
						 
						
						
						
					 
					
						2020-01-27 20:32:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Shavit 
							
						 
					 
					
						
						
						
						
							
						
						
							d30b44ee0f 
							
						 
					 
					
						
						
							
							Minor formatting changes per codacy review.  
						
						 
						
						
						
					 
					
						2020-01-26 01:12:52 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael Shavit 
							
						 
					 
					
						
						
						
						
							
						
						
							4547c328bc 
							
						 
					 
					
						
						
							
							Delete/Restore book from Kobo device upon (un)archiving of a book in the web UI.  
						
						 
						
						
						
					 
					
						2020-01-26 00:29:36 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							cd9bb56db5 
							
						 
					 
					
						
						
							
							Cleanup Kobo integration  
						
						 
						
						
						
					 
					
						2020-01-20 06:14:53 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ground7 
							
						 
					 
					
						
						
						
						
							
						
						
							54c4f40188 
							
						 
					 
					
						
						
							
							added LDAP import  
						
						 
						
						... 
						
						
						
						update defaults 
						
					 
					
						2019-12-27 23:12:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							23b3bfd967 
							
						 
					 
					
						
						
							
							Additional  fix   #1016  
						
						 
						
						
						
					 
					
						2019-08-20 19:12:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							f543d7f486 
							
						 
					 
					
						
						
							
							Fix   #1016  
						
						 
						
						
						
					 
					
						2019-08-20 18:32:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							3eae2e9c2c 
							
						 
					 
					
						
						
							
							Changed text for not found imports  
						
						 
						
						
						
					 
					
						2019-08-03 18:24:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							6261981656 
							
						 
					 
					
						
						
							
							Fix for  #991  
						
						 
						
						... 
						
						
						
						Removed additional psace before Advanced search (Pull request #996 )
Set startup message for not relevant imports to debug, to reduce confusion 
						
					 
					
						2019-08-03 12:56:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							26a7d9ef30 
							
						 
					 
					
						
						
							
							Merge branch 'Develop'  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	cps/__init__.py
#	cps/about.py
#	cps/admin.py
#	cps/cli.py
#	cps/config_sql.py
#	cps/constants.py
#	cps/converter.py
#	cps/db.py
#	cps/editbooks.py
#	cps/gdriveutils.py
#	cps/helper.py
#	cps/logger.py
#	cps/oauth.py
#	cps/server.py
#	cps/services/simpleldap.py
#	cps/ub.py
#	cps/web.py
#	cps/worker.py
#	optional-requirements.txt
#	setup.cfg
#	setup.py 
						
					 
					
						2019-07-17 19:07:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Pavel 
							
						 
					 
					
						
						
						
						
							
						
						
							99c6247baf 
							
						 
					 
					
						
						
							
							use the standard socket library to validate the ip address argument  
						
						 
						
						
						
					 
					
						2019-07-14 22:06:40 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							8bfcdffeb6 
							
						 
					 
					
						
						
							
							Fix feature support  
						
						 
						
						
						
					 
					
						2019-07-14 13:20:40 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ozzieisaacs 
							
						 
					 
					
						
						
						
						
							
						
						
							405a3909b0 
							
						 
					 
					
						
						
							
							Fix for opds with LDAP authentication  
						
						 
						
						
						
					 
					
						2019-07-13 17:51:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Pavel 
							
						 
					 
					
						
						
						
						
							
						
						
							006e596c72 
							
						 
					 
					
						
						
							
							Moved config class into separate file.  
						
						 
						
						... 
						
						
						
						Moved Goodreads and LDAP services into separate package. 
						
					 
					
						2019-07-07 16:05:51 +03:00