10 Commits

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	2019-06-16 08:20:01 +02:00
Ozzieisaacs	d45b1b8ea5	Fix #937 ... logviewerintegrated Code cosmetics	2019-06-15 21:18:13 +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	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
Luke Murphy	b3a286c0b5	Add initial setuptools integration	2019-05-31 11:54:05 +02:00