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

4737 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ebag333
c24798ad2f Clean up last reference and finish nuking floatfloor. One less method! (ouch my test!) 2017-02-24 17:07:05 -08:00
Ebag333
3411eca1e7 Fix a couple pep8 issues, and clean up other folks pep8 misses. :) 2017-02-24 16:34:32 -08:00
Ebag333
43073069c7 Fix merge conflict. 2017-02-24 16:25:31 -08:00
Ebag333
db330ad035 Merge remote-tracking branch 'origin/Remote_Repair_Pane_v2' into Remote_Repair_Pane_v2 
# Conflicts:
#	eos/saveddata/fit.py
 2017-02-24 16:15:39 -08:00
Ebag333
b3c7273681 implement a suggestion or six from @blitzmann. Fix a bunch of low level bugs (unlikely to have been noticed since we don't really expose those stats). Add some properties instead of referencing the attribute directly. 2017-02-24 16:10:54 -08:00
blitzman
3892ac5996 Change functionality of remote rep calculations to be more efficient. 
* Implement a property per attribute
* Use None as our cleared value (signifies that it really hasn't been calculated, not just that the calc was 0)
 2017-02-24 18:33:42 -05:00
Ebag333
5ca882d3ea implement a suggestion from @blitzmann 2017-02-24 13:06:02 -08:00
Ebag333
eb97a1c11c Add tooltip and also a minimal version of the view (for future state). 2017-02-15 19:11:32 -08:00
Ebag333
13996d7770 Stupid change list making me miss files. 2017-02-15 18:50:35 -08:00
Ebag333
6e04707457 Commit *ALL* the files. 2017-02-15 18:25:11 -08:00
Ebag333
25b17a221c Update to current version 2017-02-15 18:23:14 -08:00
Ebag333
93e7b4f5cf Cherry pick d033e4a8d919664d3ae210098291e38df71d3256 2017-02-15 17:23:53 -08:00
blitzman
0dc3eda99f Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development 2017-02-13 23:27:40 -05:00
blitzman
2dca9fc3f3 Fix stuff in system pricing feature 2017-02-13 22:27:03 -05:00
blitzman
97cdd751b8 Fix up the CREST server thread to make it a bit more robust, as well as fixing issue in which thread may never die 2017-02-13 21:56:12 -05:00
blitzman
c9c29da803 Avoid fit recalc when setting state has no effect 2017-02-11 23:55:19 -05:00
blitzman
2527fe2e1e Fix the fix for the crash in OS X 2017-02-11 22:20:32 -05:00
blitzman
a4de0f2b5b Fix crash in OS X 2017-02-11 22:10:53 -05:00
blitzman
401d0d58d5 Merge branch 'development' 2017-02-11 21:42:48 -05:00
Ryan Holmes
beed414429 Merge pull request #984 from Ebag333/FixToxIssues 
Tox fixes, and catching a few things lost in the merge.
 2017-02-11 13:01:33 -05:00
Ryan Holmes
99b2fdefcc Merge pull request #985 from Ebag333/Travis_Icon 
Add Travis Icon
 2017-02-11 12:59:21 -05:00
Ebag333
9ec6a829c2 Revert the revert of the revert.....or something. 2017-02-11 09:47:23 -08:00
Ebag333
913f70b24d Fix copy/pasta 2017-02-11 09:41:26 -08:00
Ebag333
5a4d68684e Add Travis Icon 2017-02-11 09:38:10 -08:00
Ebag333
096842de44 Tox fixes, and catching a few things lost in the merge. 2017-02-11 09:23:23 -08:00
blitzman
81e5b33bc9 Few tweaks for price system selection 2017-02-11 11:36:53 -05:00
blitzman
5c91f29efb Merge branch 'price-system-selection' of git://github.com/petosorus/Pyfa into petosorus-price-system-selection 
Conflicts:
	gui/builtinPreferenceViews/pyfaGeneralPreferences.py
	gui/builtinStatsViews/priceViewFull.py
	service/fit.py
	service/price.py
 2017-02-11 11:36:35 -05:00
blitzman
bfcb73f344 Fixes for #952 2017-02-11 11:12:10 -05:00
blitzman
a2ca5eb8a4 fix oops 2017-02-11 11:01:39 -05:00
blitzman
f34e564ccd Merge branch 'MatPlotLib' of https://github.com/Ebag333/Pyfa into Ebag333-MatPlotLib 
Conflicts:
	gui/graphFrame.py
 2017-02-11 10:53:24 -05:00
blitzman
0cba428c81 Merge branch 'master' of https://github.com/pyfa-org/Pyfa 2017-02-11 10:48:11 -05:00
blitzman
423a433e16 Merge branch 'SorryNotSorryBlitzmann' into development 2017-02-11 10:47:22 -05:00
blitzman
bdee8f662c Merge remote-tracking branch 'ebag/SorryNotSorryBlitzmann' into SorryNotSorryBlitzmann 2017-02-11 10:46:59 -05:00
blitzman
62bb550afd Add shortcut indication for fitting search tooltip 2017-02-11 10:15:01 -05:00
Ebag333
3562577521 Tox fix, and catch an extra shadowing 2017-02-10 12:06:23 -08:00
Ebag333
8c7682c6d4 Little more OCD on cleaning up imports. 2017-02-10 12:02:23 -08:00
Ebag333
2b45a16872 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
Ebag333
73cc17ce72 Clean up some more import statements 2017-02-10 11:29:52 -08:00
Ebag333
07a2020303 Don't try and import an old version and then fail back to the 2.7 version. Just do the 2.7 version. :) 2017-02-10 11:22:06 -08:00
Ebag333
0fc45ead6e Catch missing import 2017-02-10 11:16:51 -08:00
Ebag333
6b37e2c973 More clean handling of possibly missing attributes. Thanks @blitzmann! 2017-02-10 10:09:11 -08:00
Ebag333
cdabd83afe Remove old init 2017-02-10 07:19:33 -08:00
Ebag333
f610f525ba Use getattr directly, insead of doing a check then setting it (yay for defaults) 2017-02-10 06:44:40 -08:00
Ebag333
514f927a56 Revert removing call. This class likely needs to be callable. 2017-02-10 05:50:32 -08:00
Ebag333
3c641606da Revert until we actually get a Linux developer. 2017-02-10 05:41:06 -08:00
blitzman
af44d878d1 tweak 2017-02-10 00:57:53 -05:00
blitzman
72ebafe925 Remove redundant init 2017-02-10 00:37:45 -05:00
blitzman
134365c764 Reverts commit de87c9, and instead uses the mod variable to access the method needed. 
Conflicts:
	service/fit.py
 2017-02-10 00:29:40 -05:00
petosorus
b6871c72ca Merge remote-tracking branch 'origin/price-system-selection' into price-system-selection 
# Conflicts:
#	gui/builtinStatsViews/priceViewFull.py
 2017-02-09 23:33:14 +01:00
petosorus
aaece725aa Saving price system preference 2017-02-09 23:26:31 +01:00