blitzman
|
06baa10cdc
|
Fix for #991
|
2017-02-14 20:33:27 -05: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
|
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 |
|
Ebag333
|
9ec6a829c2
|
Revert the revert of the revert.....or something.
|
2017-02-11 09:47:23 -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
|
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
|
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
|
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 |
|
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 |
|
Ebag333
|
228425fdb9
|
Cast to int so we can compare
|
2017-02-09 14:07:37 -08:00 |
|
Ebag333
|
9775d1064e
|
Move import code down into class init
|
2017-02-09 13:27:54 -08:00 |
|
Ebag333
|
64070a0798
|
Revert commit 7865219164 This causes too much grief as we are getting a lot of default values from the database. These *SHOULD* be defined, but will have to be done later.
|
2017-02-09 09:36:16 -08:00 |
|
petosorus
|
bfa772609a
|
Transfer of the price dropbox in the preferences pane.
Moving of the modules list compiling from priceview to price service.
|
2017-02-09 18:27:26 +01:00 |
|
petosorus
|
d15acf89ba
|
refresh modules price view
|
2017-02-09 18:27:26 +01:00 |
|
petosorus
|
d25673b8fe
|
Price listing price panel
|
2017-02-09 18:27:26 +01:00 |
|
Ebag333
|
dd9924a7a7
|
Fix issues where we assume something can exist when it may not.
|
2017-02-09 07:22:09 -08:00 |
|
Ebag333
|
0f00b7237a
|
Another classic class conversion
|
2017-02-09 01:02:55 -08:00 |
|
Ebag333
|
579a13da44
|
Tox fixes
|
2017-02-09 00:59:22 -08:00 |
|
Ebag333
|
7865219164
|
Add a ton of default values
|
2017-02-09 00:56:33 -08:00 |
|
Ebag333
|
f2c84692a9
|
Clean up a bunch of unused variables
|
2017-02-09 00:22:14 -08:00 |
|
Ebag333
|
f61aeb8285
|
Fix bug where the toggle button the compare pane didn't do anything. (Need to check toggleView because you can hit both first and second if otherwise.)
|
2017-02-09 00:18:19 -08:00 |
|
Ebag333
|
11d7f9d029
|
Make modules static if they do not use self.
|
2017-02-09 00:04:41 -08:00 |
|
Ebag333
|
72633825cf
|
Formatting and layout changes
|
2017-02-08 23:32:51 -08:00 |
|
Ebag333
|
9a137bb158
|
Convert old style classes to new
|
2017-02-08 23:06:39 -08:00 |
|
Ebag333
|
32944f4c9c
|
More import fixes
|
2017-02-08 22:47:02 -08:00 |
|
Ebag333
|
23c6f2add5
|
We have two of the exact same backported file. Get rid of one. Also, handle the except if we can't import so we don't get stacktraces. (Currently the three functions affected are not used.)
|
2017-02-08 22:42:19 -08:00 |
|
Ebag333
|
e535f050c1
|
Disable inspection of writing to some wx properties. These do seem to get written, so it is likely pyCharm doesn't understand wx
|
2017-02-08 22:32:12 -08:00 |
|
Ebag333
|
7a2feb9152
|
Fix a bunch of calls to functions that pass the wrong type of parameter, the wrong number, etc.
|
2017-02-08 22:20:56 -08:00 |
|
Ebag333
|
6e524de320
|
Disable import inspections for wxPython, because it's not installed traditionally and we can't include it in requirements.txt
|
2017-02-08 20:15:24 -08:00 |
|
Ebag333
|
3e916e42f2
|
pyCharm inspection fixes. Mostly variable refernce issues
|
2017-02-08 17:55:20 -08:00 |
|
Ebag333
|
e5fb90f017
|
Fix commit message. LOTS of fixes for flake8.
|
2017-02-08 14:22:56 -08:00 |
|
Ebag333
|
e18deb5eeb
|
Roll up #967 and #974
Takes the import fixes and cleanup out of those and rolls it into this
one
|
2017-02-08 13:12:54 -08:00 |
|