Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							66283c542f
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'dutch/master'
						
						
						
						
						
					 | 
					
						2019-06-22 19:29:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							cc8a431532
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'socket/unix-socket' into Develop
						
						
						
						
						
					 | 
					
						2019-06-21 09:46:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c7aeb2f2c
							
						
					 | 
					
						
						
							
							Change GDrive
						
						
						
						
						
					 | 
					
						2019-06-20 20:12:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzie Isaacs
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c1d5f77fe8
							
						
					 | 
					
						
						
							
							Wiki link fixed
						
						
						
						
						
					 | 
					
						2019-06-20 10:38:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Pavel
							
						 
					 | 
					
						
						
						
						
							
						
						
							e254565901
							
						
					 | 
					
						
						
							
							support binding the http server to a unix socket file instead of TCP socket
						
						
						
						
						
					 | 
					
						2019-06-18 08:57:37 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Heimen Stoffels
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d9f69ca264
							
						
					 | 
					
						
						
							
							Updated Dutch translation
						
						
						
						
						
					 | 
					
						2019-06-17 22:38:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							cd546eb6d4
							
						
					 | 
					
						
						
							
							Update comic reader js
						
						
						
						
						
					 | 
					
						2019-06-17 19:48:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f40fc5aa75
							
						
					 | 
					
						
						
							
							Update LDAP
						
						
						
						
						
					 | 
					
						2019-06-16 08:59:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b74d51f21
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'ldap/master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/server.py
#	cps/templates/config_edit.html
#	cps/ub.py
#	cps/updater.py
#	cps/web.py
#	optional-requirements-ldap.txt
#	setup.cfg 
						
					 | 
					
						2019-06-16 08:20:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d45b1b8ea5
							
						
					 | 
					
						
						
							
							Fix #937
						
						
						
						
						
						
						
						logviewerintegrated
Code cosmetics 
						
					 | 
					
						2019-06-15 21:18:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e67d707867
							
						
					 | 
					
						
						
							
							Fix for #588
						
						
						
						
						
						
						
						Merge remote-tracking branch 'linuxserver/master' 
						
					 | 
					
						2019-06-15 11:58:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Krakinou
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							4437d7376d
							
						
					 | 
					
						
						
							
							Merge pull request #2 from Krakinou/flaskldap
						
						
						
						
						
						
						
						Solve typo 
						
					 | 
					
						2019-06-14 22:56:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Krakinou
							
						 
					 | 
					
						
						
						
						
							
						
						
							304db0d20e
							
						
					 | 
					
						
						
							
							Solve typo
						
						
						
						
						
					 | 
					
						2019-06-14 22:55:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							3f5c6c1fa5
							
						
					 | 
					
						
						
							
							Fix #937
						
						
						
						
						
					 | 
					
						2019-06-13 20:01:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							26949970d8
							
						
					 | 
					
						
						
							
							Revert logging functions
						
						
						
						
						
						
						
						Fix access logger for tornado 
						
					 | 
					
						2019-06-11 20:07:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5e3ed26b9
							
						
					 | 
					
						
						
							
							Fix for #935
						
						
						
						
						
					 | 
					
						2019-06-10 19:31:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							8e4539cf8e
							
						
					 | 
					
						
						
							
							Prevent delete of last admin user
						
						
						
						
						
					 | 
					
						2019-06-10 19:26:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							c81d4edb7d
							
						
					 | 
					
						
						
							
							Fix for #923
						
						
						
						
						
					 | 
					
						2019-06-10 16:38:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							546ed65e1d
							
						
					 | 
					
						
						
							
							Update logging
						
						
						
						
						
						
						
						Fix sort order author
Fixes sorting view
Moved version info
added feature limit listening to single ipaddress 
						
					 | 
					
						2019-06-10 14:15:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							14b6202eec
							
						
					 | 
					
						
						
							
							Code cosmetics
						
						
						
						
						
						
						
						Fixes func in helper,web
Fixes for pdf reader
fixes for calling from another folder
renamed to calibreweb for importing in python caller script 
						
					 | 
					
						2019-06-08 13:45:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							50973ffb72
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'constants/Develop-logging-cleanup' into Develop
						
						
						
						
						
					 | 
					
						2019-06-08 06:52:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Krakinou
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							9a5ab97d78
							
						
					 | 
					
						
						
							
							Merge branch 'master' into master
						
						
						
						
						
					 | 
					
						2019-06-08 01:41:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Krakinou
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							6190e64956
							
						
					 | 
					
						
						
							
							Merge pull request #1 from Krakinou/flaskldap
						
						
						
						
						
						
						
						Flaskldap integration 
						
					 | 
					
						2019-06-08 01:03:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Krakinou
							
						 
					 | 
					
						
						
						
						
							
						
						
							79286c9384
							
						
					 | 
					
						
						
							
							encode password
						
						
						
						
						
					 | 
					
						2019-06-08 00:54:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Pavel
							
						 
					 | 
					
						
						
						
						
							
						
						
							b89ab9ff10
							
						
					 | 
					
						
						
							
							logging clean-up
						
						
						
						
						
						
						
						- moved most constants to separate file
- sorted and cleaned-up imports
- moved logging setup to separate file 
						
					 | 
					
						2019-06-06 18:10:22 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Krakinou
							
						 
					 | 
					
						
						
						
						
							
						
						
							97d12b94f6
							
						
					 | 
					
						
						
							
							Correct settings update
						
						
						
						
						
					 | 
					
						2019-06-04 00:47:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Krakinou
							
						 
					 | 
					
						
						
						
						
							
						
						
							e4d801bbaf
							
						
					 | 
					
						
						
							
							initial flask_simpleldap implementation
						
						
						
						
						
					 | 
					
						2019-06-02 22:07:22 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f736a15c12
							
						
					 | 
					
						
						
							
							Fix for restart of newer versions of tornado during update
						
						
						
						
						
						
						
						Fix for updater with Beta Versions 
						
					 | 
					
						2019-06-02 18:47:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							a02f949d23
							
						
					 | 
					
						
						
							
							Fix for updater with beta releases
						
						
						
						
						
					 | 
					
						2019-06-02 18:09:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							b4e0d039ef
							
						
					 | 
					
						
						
							
							Revert setup.cfg file
						
						
						
						
						
					 | 
					
						2019-06-02 09:35:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							bb0d5c5538
							
						
					 | 
					
						
						
							
							Working for pip and "normal" start for python3 and python2
						
						
						
						
						
					 | 
					
						2019-06-02 09:33:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5b335e8e9
							
						
					 | 
					
						
						
							
							Update setup
						
						
						
						
						
					 | 
					
						2019-06-01 09:51:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							67bd5d41aa
							
						
					 | 
					
						
						
							
							Update Version info
						
						
						
						
						
					 | 
					
						2019-05-31 20:06:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							1879dcb24a
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'setup/feature/setuptools-integration' into Develop
						
						
						
						
						
					 | 
					
						2019-05-31 19:48:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							87ca05f129
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'setup/feature/setuptools-integration'
						
						
						
						
						
					 | 
					
						2019-05-31 16:24:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							6662a58cb0
							
						
					 | 
					
						
						
							
							Update translationfiles
						
						
						
						
						
					 | 
					
						2019-05-31 15:48:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luke Murphy
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b3a286c0b5
							
						
					 | 
					
						
						
							
							Add initial setuptools integration
						
						
						
						
						
					 | 
					
						2019-05-31 11:54:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							4fecce0a0d
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Develop
						
						
						
						
						
						
						
						# Conflicts:
#	cps/helper.py
#	cps/static/js/archive/unrar.js
#	cps/templates/readcbr.html
#	cps/templates/readpdf.html
#	cps/translations/de/LC_MESSAGES/messages.mo
#	cps/translations/de/LC_MESSAGES/messages.po
#	cps/translations/es/LC_MESSAGES/messages.mo
#	cps/translations/es/LC_MESSAGES/messages.po
#	cps/translations/fr/LC_MESSAGES/messages.mo
#	cps/translations/fr/LC_MESSAGES/messages.po
#	cps/translations/it/LC_MESSAGES/messages.mo
#	cps/translations/it/LC_MESSAGES/messages.po
#	cps/translations/ja/LC_MESSAGES/messages.mo
#	cps/translations/ja/LC_MESSAGES/messages.po
#	cps/translations/km/LC_MESSAGES/messages.mo
#	cps/translations/km/LC_MESSAGES/messages.po
#	cps/translations/nl/LC_MESSAGES/messages.mo
#	cps/translations/nl/LC_MESSAGES/messages.po
#	cps/translations/pl/LC_MESSAGES/messages.mo
#	cps/translations/pl/LC_MESSAGES/messages.po
#	cps/translations/ru/LC_MESSAGES/messages.mo
#	cps/translations/ru/LC_MESSAGES/messages.po
#	cps/translations/sv/LC_MESSAGES/messages.mo
#	cps/translations/sv/LC_MESSAGES/messages.po
#	cps/translations/uk/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
#	cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
#	cps/web.py
#	messages.pot
#	optional-requirements.txt 
						
					 | 
					
						2019-05-31 11:17:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							26e45f1f57
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'comic-reader/master'
						
						
						
						
						
					 | 
					
						2019-05-31 08:43:51 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							df5d15d1a2
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'comicapi/master'
						
						
						
						
						
					 | 
					
						2019-05-30 10:43:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							ecedf92783
							
						
					 | 
					
						
						
							
							Update version
						
						
						
						
						
						
						
						Make custom columns visible (#904) 
						
					 | 
					
						2019-05-30 10:21:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							d106ada9ed
							
						
					 | 
					
						
						
							
							Changed version
						
						
						
						
						
						
						
						Update translation 
						
					 | 
					
						2019-05-30 09:07:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed91048a63
							
						
					 | 
					
						
						
							
							Fix for magic link with python 3
						
						
						
						
						
					 | 
					
						2019-05-26 11:31:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							f70c839014
							
						
					 | 
					
						
						
							
							Added additional permission viewer
						
						
						
						
						
					 | 
					
						2019-05-19 18:39:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							e6ff2f1d90
							
						
					 | 
					
						
						
							
							Fix file not found loading-icon.gif
						
						
						
						
						
					 | 
					
						2019-05-16 19:42:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								subdiox
							
						 
					 | 
					
						
						
						
						
							
						
						
							867aa2f0bd
							
						
					 | 
					
						
						
							
							Beautify bitjs
						
						
						
						
						
					 | 
					
						2019-05-14 04:28:06 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								subdiox
							
						 
					 | 
					
						
						
						
						
							
						
						
							7982ed877c
							
						
					 | 
					
						
						
							
							Downgrade bitjs to es5 branch
						
						
						
						
						
					 | 
					
						2019-05-13 14:53:25 +09:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							0c80f5c63a
							
						
					 | 
					
						
						
							
							Update Teststatus
						
						
						
						
						
					 | 
					
						2019-05-12 19:44:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ozzieisaacs
							
						 
					 | 
					
						
						
						
						
							
						
						
							1030e195a5
							
						
					 | 
					
						
						
							
							Fix #916
						
						
						
						
						
					 | 
					
						2019-05-11 13:03:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								subdiox
							
						 
					 | 
					
						
						
						
						
							
						
						
							c0d136ccd8
							
						
					 | 
					
						
						
							
							Fix slow loading
						
						
						
						
						
					 | 
					
						2019-05-10 08:16:03 +09:00 | 
					
					
						
						
							
							
							
						
					 |