Ebag333
|
e5e3133869
|
Catch exceptions if we get them from a property. Exceptions are bad, but not showing the window is worse.
|
2017-02-24 21:18:38 -08:00 |
|
Ebag333
|
ca6ef546e5
|
Add debug pane for item stats
|
2017-02-24 18:09:22 -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 |
|
Ryan Holmes
|
dc9c481b80
|
Merge remote-tracking branch 'blitzmann/unicodetests'
|
2017-02-24 09:54:50 -05:00 |
|
blitzman
|
ee407913c3
|
Fix for #1005
|
2017-02-24 00:11:24 -05:00 |
|
blitzman
|
b583589849
|
Remove unicode path fixes for now to better test original problems
|
2017-02-19 01:01:12 -05:00 |
|
Ryan Holmes
|
7df3fe266e
|
Merge pull request #1002 from Ebag333/matplotlib_import_fix
Matplotlib Import Fix
|
2017-02-18 18:17:17 -05:00 |
|
blitzman
|
b351befa97
|
Fix for #1000
|
2017-02-18 18:14:21 -05:00 |
|
Ebag333
|
cdf392e3e5
|
Change matplotlib to be imported at the top and not use the import hack. Slows down the startup times slightly, but much simpler.
|
2017-02-18 10:15:06 -08:00 |
|
blitzman
|
4ba11d832a
|
Tox fixes, because it's a thing we do now
|
2017-02-16 23:12:25 -05:00 |
|
Ebag333
|
e8101f9410
|
Embiggen the preference pane window. Change text, and clean up some unused imports.
|
2017-02-16 10:45:28 -08:00 |
|
Ebag333
|
56f1e9ed3a
|
Finish migrate from #868. Lots of tox/formatting/inspection fixes to the files touched.
|
2017-02-16 09:59:56 -08:00 |
|
Ebag333
|
fff67906d6
|
Migrate files from #868
|
2017-02-16 08:20:09 -08:00 |
|
Ebag333
|
343331c667
|
Commit file so we can migrate over from old PR
|
2017-02-16 08:16:08 -08:00 |
|
Ebag333
|
201d596c80
|
Initial rollup of #868
|
2017-02-16 07:38:43 -08:00 |
|
blitzman
|
b164b86eda
|
Fix context menu order
|
2017-02-16 00:18:09 -05: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 |
|
blitzman
|
3f46db55b6
|
Merge remote-tracking branch 'ebag/ActiveDroneStacking'
|
2017-02-15 21:01:28 -05:00 |
|
Ebag333
|
93e7b4f5cf
|
Cherry pick d033e4a8d919664d3ae210098291e38df71d3256
|
2017-02-15 17:23:53 -08:00 |
|
Ebag333
|
489637ec67
|
Handle this at a lower level.
|
2017-02-15 09:20:22 -08:00 |
|
Ebag333
|
71ca7d153e
|
Check if we have active drones when merging, if we do make them all active to avoid getting weird scenarios (like deactivating stacks, or only activating parts of stacks). Fixes #728
|
2017-02-15 08:59:54 -08:00 |
|
blitzman
|
0a37834fd8
|
Disable the global module ammo picker for now
|
2017-02-14 23:20:23 -05:00 |
|
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 |
|
Ebag333
|
159472f82c
|
Tox fixes, and convert all logging string replacement to a standard style.
|
2017-02-13 13:38:21 -08:00 |
|
Ebag333
|
35e330f574
|
Improve handling for exceptions, output more information so we can find and fix problems.
|
2017-02-12 13:09:26 -08:00 |
|
Ebag333
|
e7a5cb4b1d
|
Don't show both messages if we don't have the zip files
|
2017-02-12 12:21:57 -08: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
|
3b185e1bcb
|
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 |
|
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 |
|