Commit Graph

2743 Commits

Author SHA1 Message Date
Ebag333
ee7dbd5208 Tox fixes 2017-02-26 11:28:18 -08:00
Ebag333
fbf35edae2 Fix capitalization and set up some logging to help catch errors. 2017-02-26 11:09:56 -08:00
Ebag333
a43de00153 Tox fixes 2017-02-26 09:55:32 -08:00
Ebag333
949144ab25 Embiggen the preference pane window. Change text, and clean up some unused imports. 2017-02-26 09:54:58 -08:00
Ebag333
68e75025be Finish migrate from #868. Lots of tox/formatting/inspection fixes to the files touched. 2017-02-26 09:54:58 -08:00
Ebag333
77e5bebf13 Migrate files from #868 2017-02-26 09:54:57 -08:00
Ebag333
2a72d10bfc Commit file so we can migrate over from old PR 2017-02-26 09:54:57 -08:00
Ebag333
5aa5732606 Initial rollup of #868 2017-02-26 09:54:57 -08:00
blitzman
0bc0cb7f82 wx tweaks 2017-02-26 12:27:14 -05:00
Ebag333
915df1c731 Merge branch 'development' into PreferencesPaneV2 2017-02-26 08:53:56 -08:00
Ebag333
b63c5fa1ff Tox fixes 2017-02-26 08:50:13 -08:00
blitzman
1c273210e9 tox fixes 2017-02-26 00:44:37 -05:00
Ryan Holmes
db4e5e05a4 Merge pull request #1012 from Ebag333/PropertiesPane
Add Properties Pane
2017-02-26 00:17:38 -05:00
blitzman
94c098cce3 Fix path and graphFrame issue. I could have sworn these were already fixed during the previous merge... 2017-02-25 19:06:39 -05:00
blitzman
6eddfd2694 Merge branch 'development' into LogBook_v2
Conflicts:
	gui/bitmapLoader.py
2017-02-25 19:03:56 -05:00
blitzman
bf24e5f518 Fix for #1014 2017-02-25 18:47:03 -05:00
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
blitzman
5adfcbf343 Add links in the error dialog 2017-02-25 17:37:38 -05:00
blitzman
c0e0612e02 Merge branch 'errortest' 2017-02-25 17:12:19 -05:00
blitzman
4ba4a753cb Implement and error message if config fails 2017-02-25 17:12:09 -05:00
blitzman
3cbd154c8a Fix for #1013 2017-02-25 16:44:31 -05:00
Ebag333
baec24ef14 get rid of unused method 2017-02-24 21:28:23 -08:00
Ebag333
df7f0b20f5 Tox cleanup 2017-02-24 21:25:13 -08:00
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
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
blitzman
3f46db55b6 Merge remote-tracking branch 'ebag/ActiveDroneStacking' 2017-02-15 21:01:28 -05: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