10 Commits (a836df9a5a8b85360f7d0696dd8b6f997ac0cb3c)

Author	SHA1	Message	Date
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	6 years ago
Ozzieisaacs	d45b1b8ea5	Fix #937 ... logviewerintegrated Code cosmetics	6 years ago
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	6 years ago
Ozzieisaacs	b4e0d039ef	Revert setup.cfg file	6 years ago
Ozzieisaacs	bb0d5c5538	Working for pip and "normal" start for python3 and python2	6 years ago
Ozzieisaacs	f5b335e8e9	Update setup	6 years ago
Ozzieisaacs	67bd5d41aa	Update Version info	6 years ago
Ozzieisaacs	1879dcb24a	Merge remote-tracking branch 'setup/feature/setuptools-integration' into Develop	6 years ago
Ozzieisaacs	87ca05f129	Merge remote-tracking branch 'setup/feature/setuptools-integration'	6 years ago
Luke Murphy	b3a286c0b5	Add initial setuptools integration	6 years ago