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

..

db

Merge branch 'development' into LogBook_v2

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

effects

Merge branch 'development' into LogBook_v2

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

graph

Improve handling for exceptions, output more information so we can find and fix problems.

2017-02-12 13:09:26 -08:00

saveddata

Merge branch 'development' into LogBook_v2

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

__init__.py

Roll up #967 and #974

2017-02-08 13:12:54 -08:00

capSim.py

Reformatting eos (root)

2016-10-19 11:46:26 -07:00

config.py

Remove an inline import. Fix a reference that is missing.

2016-12-15 15:39:19 -08:00

effectHandlerHelpers.py

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

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

enum.py

Convert old style classes to new

2017-02-08 23:06:39 -08:00

eqBase.py

Tox fixes

2017-02-09 00:59:22 -08:00

gamedata.py

Merge branch 'development' into LogBook_v2

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

lgpl.txt

Set files to 644 besides pyfa.py and scripts

2014-07-30 21:23:27 -04:00

mathUtils.py

Fix floorfloat, and pep8 fixes for tests

2017-02-21 07:38:32 -08:00

modifiedAttributeDict.py

Refactor most of the shadowing from outer scopes. This is a super simple change, just changing the variable used inside (mostly) lambdas.

2017-02-10 11:50:04 -08:00