Commit Graph

4879 Commits

Author SHA1 Message Date
blitzman
2ce6592048 Merge branch 'development' 2017-03-15 20:01:01 -04:00
blitzman
8b124f3194 Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development 2017-03-15 00:03:01 -04:00
blitzman
588ac62b6f fix for #1039 2017-03-15 00:02:48 -04:00
Ryan Holmes
63001d83b9 Merge pull request #1037 from Ebag333/Fix_Outgoing_Minimal_View
Fix outgoingMinimal view
2017-03-15 00:00:43 -04:00
blitzman
1112415f93 update eve database 2017-03-14 19:40:44 -04:00
blitzman
4633a1c136 some clean up 2017-03-14 19:22:18 -04:00
Ebag333
8991e1dbad Fix the view. Not sure why it broke (it was working at one point). 2017-03-13 20:09:37 -07:00
blitzman
d5f6f7b37c Disable "minimal" selection for remote reps pane (doesn't work) 2017-03-13 21:49:31 -04:00
blitzman
4ffec21cd3 Add real icons for the new pref pages 2017-03-13 21:46:56 -04:00
blitzman
a4d07a4611 Revert "Merge pull request #1008 from Ebag333/local_tests"
This reverts commit 91b1b1dfc2, reversing
changes made to 53937d1723.
2017-03-11 20:02:10 -05:00
Ryan Holmes
91b1b1dfc2 Merge pull request #1008 from Ebag333/local_tests
Locale Testing
2017-03-11 19:34:53 -05:00
Ryan Holmes
53937d1723 Merge pull request #1023 from Ebag333/EosLoggingCleanup
Quick Eos cleanup and logging fix
2017-03-11 19:33:58 -05:00
Ryan Holmes
ad973dd51a Merge pull request #1034 from Ebag333/SpellingIsHurd
Spelling Is Hurd
2017-03-09 10:40:59 -05:00
Ebag333
9da485da55 Cleaning up tox errors that crept in by the pep8 gremlins. 2017-03-08 21:02:57 -08:00
Ebag333
da922601cd You say Potatoe, I say tomahtie 2017-03-08 20:59:53 -08:00
Ryan Holmes
58977810f9 Merge pull request #1030 from Will-W/new_tab
Add option to open fit in new tab
2017-03-06 21:14:51 -05:00
Will Wykeham
05facc6961 Remove semicolon caused by too much C programming 2017-03-06 14:03:27 +00:00
Will Wykeham
f8db54136e Add option to open fit in new tab
Works from context menu and on middle click - like a browser
2017-03-06 13:52:56 +00:00
Ryan Holmes
ce972ceddd Merge pull request #1029 from bjjerry/development
Fix for first low slot drag and drop
2017-03-06 00:09:23 -05:00
JJ Berry
9ad61c1e23 Need to enter if block in case of modPosition 0 as it refers to the first low slot 2017-03-05 18:54:17 -08:00
blitzman
1c4128b9a1 Change probe size cap to 1.08 (previous testing done apparently showed 1.1 - 1.12, however most people refer to 1.08 as the cap. 2017-03-05 17:01:00 -05:00
blitzman
2c4a2f7dd9 Fix probe size not updating #1026 2017-03-05 16:38:00 -05:00
blitzman
9befaf7c91 Test implementation of eos settings 2017-03-05 02:01:10 -05:00
Ryan Holmes
ab34b31219 Merge pull request #1022 from Ebag333/MoreLogging
Add additional logging to services
2017-03-01 00:44:43 -05:00
Ebag333
b9b56f5e73 kill another hidden import. 2017-02-28 19:23:01 -08:00
Ebag333
d28312f13b Slightly correction to the effective reload time for cycle time. 2017-02-28 18:57:12 -08:00
Ebag333
9134464a39 Fixes case that would generate a exception on the first fit calc (would trigger logging dumps for users). Also clean up a bunch of unnecessary try/exceptions, and some logging improvements 2017-02-28 11:28:41 -08:00
Ebag333
ff5d40dcd3 Add additional logging to services 2017-02-28 10:32:03 -08:00
Ryan Holmes
c97a388fc4 Merge pull request #1018 from Ebag333/Merge_New_Pane
Changes required to implement the remote reps pane
2017-02-26 23:48:27 -05:00
Ebag333
370b58d500 Changes required to implement the remote reps pane 2017-02-26 12:42:39 -08:00
Ryan Holmes
dbffdedc92 Merge pull request #996 from Ebag333/PreferencesPaneV2
Preferences Pane V4
2017-02-26 15:14:05 -05:00
Ebag333
712b1811b3 Tox fixes 2017-02-26 11:30:23 -08:00
Ebag333
f2fa598ed7 Merge branch 'PreferencesPaneV2' of https://github.com/Ebag333/Pyfa into PreferencesPaneV2 2017-02-26 11:29:52 -08:00
blitzman
5283c50f84 Merge branch 'master' into development
Conflicts:
	config.py
	gui/utils/exportHtml.py
2017-02-26 14:28:46 -05:00
Ebag333
ee7dbd5208 Tox fixes 2017-02-26 11:28:18 -08:00
blitzman
821298b6d0 tox 2017-02-26 14:26:32 -05:00
Ebag333
dc6cde86c9 Merge branch 'development' into PreferencesPaneV2 2017-02-26 11:22:10 -08:00
blitzman
1826122381 Clean up some syntax (use isinstance) and tox stuff 2017-02-26 14:17:46 -05:00
Ebag333
fbf35edae2 Fix capitalization and set up some logging to help catch errors. 2017-02-26 11:09:56 -08:00
Ryan Holmes
70934e05e1 Merge pull request #943 from Ebag333/More_Variations
Add variations for: drones, fighters, boosters, and implants
2017-02-26 13:33:13 -05:00
blitzman
b235dddbe0 Clean up to the sorting of implants and bosoters 2017-02-26 13:31:56 -05:00
blitzman
fc45cef834 Change order of RR pane 2017-02-26 12:56:31 -05: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
Ryan Holmes
3209459e6d Merge pull request #995 from Ebag333/Remote_Repair_Pane_v2
Remote Repair Pane v2
2017-02-26 12:51:13 -05:00
blitzman
0bc0cb7f82 wx tweaks 2017-02-26 12:27:14 -05:00