blitzman 7115cd178c Merge branch 'development' into LogBook_v2 ...

Conflicts:
	config.py
	eos/saveddata/fit.py
	gui/bitmapLoader.py
	gui/graphFrame.py
	gui/utils/exportHtml.py
	pyfa.py
	service/crest.py
	service/price.py
	service/server.py

2017-02-25 18:21:07 -05:00

..

conversions

Fix conversion imports for osx deprecated... :(

2017-01-27 22:06:52 -05:00

pycrest

Merge branch 'development' into LogBook_v2

2017-02-25 18:21:07 -05:00

__init__.py

Make it run again

2016-12-02 03:13:54 -08:00

attribute.py

Make modules static if they do not use self.

2017-02-09 00:04:41 -08:00

character.py

Tox fixes, and convert all logging string replacement to a standard style.

2017-02-13 13:38:21 -08:00

crest.py

Merge branch 'development' into LogBook_v2

2017-02-25 18:21:07 -05:00

crudeTests.py

Fix energy warfare

2016-06-19 23:04:52 -04:00

damagePattern.py

Make modules static if they do not use self.

2017-02-09 00:04:41 -08:00

eveapi.py

Revert removing call. This class likely needs to be callable.

2017-02-10 05:50:32 -08:00

fit.py

Merge branch 'development' into LogBook_v2

2017-02-25 18:21:07 -05:00

implantSet.py

Make modules static if they do not use self.

2017-02-09 00:04:41 -08:00

market.py

Tox fixes, and convert all logging string replacement to a standard style.

2017-02-13 13:38:21 -08:00

network.py

Another classic class conversion

2017-02-09 01:02:55 -08:00

port.py

Tox fixes, and convert all logging string replacement to a standard style.

2017-02-13 13:38:21 -08:00

prefetch.py

Roll up all changes from #962 as the base has been massively changed by code cleanups. Rename our logging to a universal pyfalog to avoid shadowing either Logging or Logbook loggers

2017-02-11 11:51:53 -08:00

price.py

Merge branch 'development' into LogBook_v2

2017-02-25 18:21:07 -05:00

server.py

Merge branch 'development' into LogBook_v2

2017-02-25 18:21:07 -05:00

settings.py

Remove unicode path fixes for now to better test original problems

2017-02-19 01:01:12 -05:00

targetResists.py

Make modules static if they do not use self.

2017-02-09 00:04:41 -08:00

update.py

Roll up all changes from #962 as the base has been massively changed by code cleanups. Rename our logging to a universal pyfalog to avoid shadowing either Logging or Logbook loggers

2017-02-11 11:51:53 -08:00