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
|
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 |
|
Ebag333
|
915df1c731
|
Merge branch 'development' into PreferencesPaneV2
|
2017-02-26 08:53:56 -08:00 |
|
Ebag333
|
7eb193cbbb
|
Delete test, the method being tested no longer exists.
|
2017-02-26 08:52:27 -08:00 |
|
Ebag333
|
b63c5fa1ff
|
Tox fixes
|
2017-02-26 08:50:13 -08:00 |
|
Ebag333
|
e4d0f2dc6f
|
Fix case where property gets reran multiple times.
|
2017-02-26 08:46:23 -08:00 |
|
blitzmann
|
767cb46d40
|
Merge branch 'development' into More_Variations
Conflicts:
gui/builtinContextMenus/metaSwap.py
|
2017-02-26 02:24:38 -05:00 |
|
blitzmann
|
c430a2d798
|
Merge branch 'development' into Remote_Repair_Pane_v2
Conflicts:
eos/mathUtils.py
service/crest.py
|
2017-02-26 01:40:53 -05: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 |
|
Ryan Holmes
|
c6483c4b98
|
Merge pull request #986 from Ebag333/LogBook_v2
Logbook V2
|
2017-02-25 23:59:30 -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
|
cb15a3a1d6
|
Merge branch 'master' into development
|
2017-02-25 19:02:15 -05:00 |
|
blitzman
|
cd516f80bb
|
bump dev
|
2017-02-25 19:01:57 -05:00 |
|
blitzman
|
1d9b85c043
|
Merge branch 'master' into development
|
2017-02-25 19:01:28 -05:00 |
|
blitzman
|
1ae5f64696
|
Here we go again!
|
2017-02-25 18:50:20 -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
|
6da806c9c5
|
Merge branch 'master' into development
|
2017-02-25 17:49:26 -05:00 |
|
blitzman
|
4895d76bea
|
bump dev
|
2017-02-25 17:49:06 -05:00 |
|
blitzman
|
f527f9533e
|
Bump stable for real
|
2017-02-25 17:38:14 -05:00 |
|
blitzman
|
5adfcbf343
|
Add links in the error dialog
|
2017-02-25 17:37:38 -05:00 |
|