blitzman
cb77987129
Fix an exception caused by too few variables for string formatting
2017-03-26 23:51:05 -04:00
Ryan Holmes
a67c28a4c9
Merge branch 'development' into feature/commandmenu
2017-03-26 14:43:12 -04:00
blitzman
d928df9c69
Move useStaticAdaptiveArmorHardener to the EOSSettings. Not moving force reload for now
2017-03-26 14:28:13 -04:00
blitzman
b18bb200a9
Merge branch 'development' into MorePreferences
2017-03-26 13:52:59 -04:00
blitzman
024edc500f
Fix settings provider
2017-03-26 13:35:46 -04:00
Ryan Holmes
df587892a3
Merge branch 'development' into feature/commandmenu
2017-03-26 12:27:52 -04:00
Ryan Holmes
1ffcdc92f2
Merge pull request #1031 from Ebag333/tooltip_capacitor_neut_resistance
...
Tooltip for capacitor neut resistance
2017-03-26 12:16:41 -04:00
Ryan Holmes
bd043c2358
Fix for #1061 ( #1068 )
...
Squash commit that does the following:
* Enable Council Diplo Shuttle
* Disables a test that was preventing Travis from returning success (need to look into this more later)
2017-03-26 12:15:07 -04:00
Ebag333
5d5c95fb2c
Example tests for services! General cleanup.
...
(cherry picked from commit 9f41bb4)
2017-03-24 11:15:39 -07:00
Ebag333
13305d9ee1
Use correct formula. \o/
...
(cherry picked from commit b20b6c1)
2017-03-24 11:15:37 -07:00
blitzman
6c1d949cef
Proof of concept for gathering fits based on modules that are fit
2017-03-23 00:38:23 -04:00
blitzman
0a1008f64f
Merge branch 'master' into development
2017-03-23 00:35:28 -04:00
Ebag333
301e874cd4
Add a ton of logging to the fitting service
2017-03-17 16:05:09 -07:00
Ryan Holmes
58142664cc
Merge pull request #1051 from Ebag333/Fix_PR943
...
Fix bad merge of #943
2017-03-16 18:58:09 -04:00
Ebag333
e3c2220a1c
Fix matplotlib importing
2017-03-16 14:09:10 -07:00
Ebag333
1c59a27902
Fix typo and missing setting
...
(cherry picked from commit c122047)
2017-03-16 08:40:18 -07:00
Ebag333
99f939026f
Refactor some logic in modifiedAttributeDict
2017-03-09 12:14:23 -08:00
Ebag333
9da485da55
Cleaning up tox errors that crept in by the pep8 gremlins.
2017-03-08 21:02:57 -08:00
Ebag333
8322307ae0
Add tooltip for neut resist. Add handling missing attributes in getting modified value (return default, not exception). Tox fixes to clean up a little.
2017-03-07 09:45:34 -08:00
blitzman
9befaf7c91
Test implementation of eos settings
2017-03-05 02:01:10 -05:00
Ebag333
ff5d40dcd3
Add additional logging to services
2017-02-28 10:32:03 -08:00
Ebag333
9a284bc740
Add preference to disable ship browser tooltip popup.
2017-02-27 14:33:18 -08:00
Ebag333
d67573f83a
Add more functionality to preferences window.
2017-02-27 12:05:38 -08:00
Ebag333
370b58d500
Changes required to implement the remote reps pane
2017-02-26 12:42:39 -08: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
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
5aa5732606
Initial rollup of #868
2017-02-26 09:54:57 -08:00
blitzmann
767cb46d40
Merge branch 'development' into More_Variations
...
Conflicts:
gui/builtinContextMenus/metaSwap.py
2017-02-26 02:24:38 -05:00
blitzman
1c273210e9
tox fixes
2017-02-26 00:44:37 -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
b583589849
Remove unicode path fixes for now to better test original problems
2017-02-19 01:01:12 -05:00
blitzman
c3144088ca
Fix CREST login ( #998 ). Also flesh out a two-step process:
...
Step 1: get a page that lets the user know we're processing request. Do whatever we need to do with the hash (in the case of implicit mode), and then refresh to step 2
Step 2: process response, and return error / success message.
2017-02-18 21:59:18 -05:00
blitzman
4ba11d832a
Tox fixes, because it's a thing we do now
2017-02-16 23:12:25 -05:00
blitzman
bcd045ae4e
tweak
2017-02-15 21:01:36 -05:00
blitzman
3f46db55b6
Merge remote-tracking branch 'ebag/ActiveDroneStacking'
2017-02-15 21:01:28 -05:00
Ebag333
a865028420
Remove litter.
2017-02-15 15:42:46 -08:00
Ebag333
489637ec67
Handle this at a lower level.
2017-02-15 09:20:22 -08:00
blitzman
0cc279b351
pass the damn tox
2017-02-14 23:06:33 -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
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
Ebag333
159472f82c
Tox fixes, and convert all logging string replacement to a standard style.
2017-02-13 13:38:21 -08:00
Ebag333
be9eaa0859
Fix timer, make logging less annoying when at Info or higher level. Only show command bonus logspam if there is any.
2017-02-13 13:25:42 -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
blitzman
c9c29da803
Avoid fit recalc when setting state has no effect
2017-02-11 23:55:19 -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
096842de44
Tox fixes, and catching a few things lost in the merge.
2017-02-11 09:23:23 -08: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
