dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity
4,652 Commits 3 Branches 5 Tags
a8fd7cf2e98b70a72b15304e5d3145955d7fd238
Commit Graph

4652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ebag333
a8fd7cf2e9 Matplotlib 2.0 support 2017-02-08 12:50:42 -08:00
Ryan Holmes
25182de365 Merge branch 'master' into development 
Conflicts:
	gui/builtinViewColumns/baseName.py
 2017-02-08 13:58:37 -05:00
Ryan Holmes
c90efb8d0a Fix emAmount > {type}Amount, some formatting tweaks 2017-02-08 09:41:59 -05:00
Ebag333
7a521c655f Wrap dlg.Destroy() in a Try/Except 
Conflicts:
	gui/mainFrame.py
 2017-02-08 00:15:02 -05:00
blitzman
8a9d2a032e Revert the try... except, see #960 2017-02-08 00:00:16 -05:00
Ryan Holmes
b1b3ff2637 Merge pull request #960 from Ebag333/Fueled_Booster_Misc_Column_Improvements 
Add extra info for misc column for fueled boosters (cap, shield, and armor)
 2017-02-07 23:59:07 -05:00
Ryan Holmes
752f9e77f5 Merge pull request #971 from Ebag333/ToxFixes2 
Some additional Tox tweaks
 2017-02-07 23:28:42 -05:00
blitzman
e52db0b2f5 Merge branch 'AncientDatabaseRepair' of https://github.com/Ebag333/Pyfa 
Conflicts:
	service/prefetch.py
 2017-02-07 23:26:06 -05:00
blitzman
ce9069af4a Fix projected fit view not showing projected fit count 2017-02-07 20:11:02 -05:00
blitzman
31d74730c5 Add matplotlib version to about window 2017-02-07 19:44:59 -05:00
blitzman
84867c6e67 fix oops 2017-02-07 19:22:31 -05:00
blitzman
f7d7b3fe5e Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development 
Conflicts:
	eos/db/gamedata/metaData.py
	eos/db/gamedata/queries.py
	eos/db/saveddata/queries.py
	eos/saveddata/fleet.py
	eos/types.py
	eve.db
	gui/builtinContextMenus/amount.py
	gui/builtinViewColumns/ammo.py
	gui/builtinViewColumns/ammoIcon.py
	gui/builtinViewColumns/capacitorUse.py
	service/port.py
 2017-02-07 19:22:26 -05:00
blitzman
f957c42e26 Merge branch 'development' 2017-02-07 19:08:10 -05:00
blitzman
ca311e5dec Line endings again 2017-02-07 19:07:22 -05:00
blitzman
3ccd4ad2ca Revert "Convert remaining files to CRLF" 
This reverts commit a8ab876053.
 2017-02-07 19:05:45 -05:00
blitzman
867fb30286 Merge remote-tracking branch 'origin/development' 2017-02-07 19:00:10 -05:00
Ryan Holmes
a8ab876053 Convert remaining files to CRLF 2017-02-07 11:01:40 -05:00
Ryan Holmes
dfc5627031 Remove circular import mainFrame <> mainMenuBar 2017-02-07 09:37:20 -05:00
blitzman
542542f48d import changes to graphframe 2017-02-07 00:33:15 -05:00
blitzman
5fda29e651 Merge branch 'master' of https://github.com/pyfa-org/Pyfa into development 2017-02-07 00:32:52 -05:00
blitzman
c25a07c95b Stuff 2017-02-07 00:32:45 -05:00
Ebag333
aafc850dbd Adhere to standards 2017-02-05 20:09:00 -08:00
Ryan Holmes
41ae8de99b Merge pull request #970 from Ebag333/ToxFixes 
Tox fixes
 2017-02-05 22:24:55 -05:00
Ebag333
808f070df4 Redisable dynamic import test until eos.types is gone 2017-02-05 16:28:16 -08:00
Ebag333
e4cd66be5c Add root to python paths 2017-02-05 16:21:07 -08:00
Ebag333
a638e991af Disable test 2017-02-05 16:05:56 -08:00
Ebag333
d67dbaa0ae .gitattributes fixing line endings 2017-02-05 15:39:23 -08:00
Ebag333
be66ff1eec Tox fixes 2017-02-05 15:39:07 -08:00
Ryan Holmes
603a8acdfc Update ISSUE_TEMPLATE.md 2017-02-05 17:57:18 -05:00
blitzman
86393d728f I can't get these files out of "modified". Just commit them to get them out of the way. 2017-02-05 17:56:36 -05:00
blitzman
e564e051a3 tweaks to issue template 2017-02-05 17:55:54 -05:00
blitzman
2ade7dc632 Add issue template 2017-02-05 17:45:35 -05:00
blitzman
a938845aa2 Remove weird file... I have no idea what this is... 2017-02-05 17:16:23 -05:00
blitzman
ba2205867e Test line endings with pyfa.py (see #964) 2017-02-05 17:12:45 -05:00
blitzman
d7ec04f995 test change to .gitattributes to specifically tell pyfa.py to save with LF line endings 2017-02-05 17:08:11 -05:00
blitzman
91baabd1b3 update database 2017-02-05 17:00:10 -05:00
blitzman
c3fdabd3a2 Merge branch 'development' 2017-02-05 16:52:27 -05:00
blitzman
3d8c76209d update database from master 2017-01-29 19:52:56 -05:00
blitzman
c2038a6cf2 Change from UPDATE to DELETE for null damage pattern and target resist names 2017-01-29 19:04:57 -05:00
blitzman
082ac233ad Merge branch 'MissingDamageTargetProfileNames' of https://github.com/Ebag333/Pyfa into development 
Conflicts:
	service/prefetch.py
 2017-01-29 15:04:56 -05:00
blitzman
5d46fe7e4d Merge branch 'master' into development 
Conflicts:
	gui/builtinContextMenus/amount.py
	gui/builtinStatsViews/priceViewFull.py
	service/fit.py
	service/prefetch.py
 2017-01-29 15:02:22 -05:00
Ebag333
32611e07c8 Fix syntax. Catch scenarios where none can be passed. 2017-01-29 10:12:16 -08:00
Ebag333
dd3316a1c2 Gets the multiplier bonus from the item rather than hard coding it to 3 2017-01-29 00:28:20 -08:00
Ebag333
1ebd54b282 Wrap getting attribute data in a try/except 
Useful for when we try to get an sub-attribute on an object where the
attribute doesn't exist. Now returns the default value.
 2017-01-29 00:27:45 -08:00
Ebag333
e524197a4d Revert "wrap getting attribute in at try/except" 
This reverts commit f111c49cc6.
 2017-01-29 00:25:55 -08:00
Ebag333
f111c49cc6 wrap getting attribute in at try/except 
Catches if there's an attribute error.  Useful when we try and get an
attribute when the object doesn't even have it.
 2017-01-29 00:25:42 -08:00
Ebag333
c567ee2c08 Clean up logic and generally make purdier 2017-01-29 00:16:32 -08:00
Ebag333
1a0ac7bb35 Allow default values to be passed in for modified attributes 2017-01-29 00:16:15 -08:00
Ebag333
34c69cf10f Some pep8 stuff 2017-01-28 21:56:03 -08:00
Ebag333
88125634d2 Add extra info for misc column for fueled boosters 2017-01-28 21:47:58 -08:00