Ryan Holmes
6344f7a975
Merge branch 'master' into bug/char_fixes
2017-05-14 22:56:34 -04:00
Ryan Holmes
da33a372cb
Set all strings to be unicode when referencing fit.name. This won't catch all conversion errors, but it should catch most. ( #1168 )
2017-05-14 20:52:06 -04:00
blitzmann
79445225de
fix issue with market shortcuts if not active items are present
2017-05-14 02:21:23 -04:00
blitzmann
e2de1565bf
Forgot to add notes to the import fit list. Caused break. Very bad.
2017-05-09 20:59:11 -04:00
blitzmann
3de63c5ca5
flake8 fixes
2017-05-08 21:32:13 -04:00
blitzmann
6b22bd189a
Merge remote-tracking branch 'jeffy/fix_unread_description' into dev, see #1099
...
Conflicts:
eos/config.py
gui/notesView.py
service/settings.py
2017-05-08 00:44:29 -04:00
blitzmann
83a7a854bb
Merge branch 'feature/recent' into dev
...
Conflicts:
eos/db/saveddata/character.py
eos/db/saveddata/fit.py
Implements #983 but utilizing sqlalchemy events to update the fit modified date whenever something is added/changed.
2017-05-07 20:48:41 -04:00
blitzmann
1604ea1f2c
Fix many bugs related to GUI not receiving a correct timestamp, as well as extending feature out to all other fit entities.
2017-05-07 02:02:54 -04:00
blitzmann
1222567a4f
Merge branch 'feature/allow-restrictions' into dev.
...
Allows user to turn off most fitting restrictions (#1117 )
2017-05-06 12:11:00 -04:00
blitzmann
32f417ce5a
Created first iteration of "Recent Fits" view, in which a nav button is interacted with to show a list of the 100 most recently modified fits. Ship Broswer is littered with ToggleRecentShips() to reset the icon when not in "recent" mode. This should probably be fixed at some point.
...
Removed the FIT_CHANGED binding from FitItem - this was causing very odd issues when the object was destroyed (navigating to another "stage") such as the Fit Changed event for that fit no longer firing (or at least seemingly so)
To fix this, simply look at the active fit during FitItem.Refresh()
Also creates a new query to get a list of items from the DB, although it's not used (was gonna use it, decided against it, but didn't want to delete the code - could prove handy later)
2017-04-26 18:51:39 -04:00
blitzmann
c0f74cd0a3
Fix old issue with trying to open previous fits that don't exist.
2017-04-23 23:40:51 -04:00
blitzmann
e94b4a1c18
Fix old issue with trying to open previous fits that don't exist.
2017-04-21 23:43:40 -04:00
blitzmann
988861af1f
Add option to ignore fitting restrictions on a per-fit basis
2017-04-18 23:57:34 -04:00
jeffy-g
e9e8ef964c
refactoring some code and added docstring
...
added stopwatch.py(modify from utils.timer.py) for test
2017-04-05 21:18:30 +09:00
jeffy-g
8fd424814a
edit...
2017-04-03 02:00:10 +09:00
jeffy-g
4d8c3eadbc
pep8
2017-04-03 01:50:26 +09:00
jeffy-g
c560d17bdd
Improved processing status notification for import and export
2017-04-03 01:34:07 +09:00
Ebag333
f70d250995
Cleanup code. Use slightly faster comparison (is instead of isinstance). Rename OVERRIDES variable to eliminate confusion.
2017-03-13 10:11:15 -07: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
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
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
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
af44d878d1
tweak
2017-02-10 00:57:53 -05:00
Ebag333
579a13da44
Tox fixes
2017-02-09 00:59:22 -08:00
Ebag333
7865219164
Add a ton of default values
2017-02-09 00:56:33 -08:00
Ebag333
11d7f9d029
Make modules static if they do not use self.
2017-02-09 00:04:41 -08:00
Ebag333
72633825cf
Formatting and layout changes
2017-02-08 23:32:51 -08:00
Ebag333
32944f4c9c
More import fixes
2017-02-08 22:47:02 -08:00
Ebag333
6e524de320
Disable import inspections for wxPython, because it's not installed traditionally and we can't include it in requirements.txt
2017-02-08 20:15:24 -08:00
Ebag333
3e916e42f2
pyCharm inspection fixes. Mostly variable refernce issues
2017-02-08 17:55:20 -08:00
Ebag333
e5fb90f017
Fix commit message. LOTS of fixes for flake8.
2017-02-08 14:22:56 -08:00
Ebag333
e18deb5eeb
Roll up #967 and #974
...
Takes the import fixes and cleanup out of those and rolls it into this
one
2017-02-08 13:12:54 -08:00
Ebag333
7a521c655f
Wrap dlg.Destroy() in a Try/Except
...
Conflicts:
gui/mainFrame.py
2017-02-08 00:15:02 -05:00
blitzman
31d74730c5
Add matplotlib version to about window
2017-02-07 19:44:59 -05:00
Ryan Holmes
dfc5627031
Remove circular import mainFrame <> mainMenuBar
2017-02-07 09:37:20 -05:00
blitzman
5d46fe7e4d
Merge branch 'master' into development
...
Conflicts:
gui/builtinContextMenus/amount.py
gui/builtinStatsViews/priceViewFull.py
service/fit.py
service/prefetch.py
2017-01-29 15:02:22 -05:00
blitzman
a76eef01de
name all ze threads
2017-01-28 17:46:59 -05:00
blitzman
6b3d3ecd93
More import fixes for osx deprecated
2017-01-27 22:25:22 -05:00
Ebag333
a853ed9960
Remove test variable
2017-01-25 18:17:05 -08:00
Ebag333
323a7060ec
Fix import
2017-01-25 17:53:04 -08:00
blitzman
c34d86ba80
Fix XML exports
2017-01-25 20:12:30 -05:00
Ebag333
8095b4852b
Clean up another broken reference. Fix broken XML export.
2017-01-24 21:34:24 -08:00
Ebag333
cc3274f245
Add comment to note special snowflakes needs
2017-01-24 18:21:09 -08:00
Ebag333
fbde9ce7bf
Fix passing the fit into exportXML
2017-01-24 18:13:57 -08:00
blitzman
85131e6166
oh god this isn't gonna work
...
Merge branch 'ebag_importchanges' into test_import
Conflicts:
config.py
eos/db/saveddata/queries.py
eos/effects/chargebonuswarfarecharge.py
eos/effects/elitebonuscommandshipinformationhiddencs3.py
eos/effects/elitebonuslogisticremotearmorrepairoptimalfalloff1.py
eos/effects/energydestabilizationnew.py
eos/effects/iceharvestingdroneoperationdurationbonus.py
eos/effects/miningforemanstrengthbonus.py
eos/effects/modulebonuswarfarelinkarmor.py
eos/effects/modulebonuswarfarelinkinfo.py
eos/effects/modulebonuswarfarelinkmining.py
eos/effects/modulebonuswarfarelinkshield.py
eos/effects/modulebonuswarfarelinkskirmish.py
eos/effects/moduletitaneffectgenerator.py
eos/effects/remotehullrepair.py
eos/effects/rolebonusremotearmorrepairoptimalfalloff.py
eos/effects/shipbonusforceauxiliarya4warfarelinksbonus.py
eos/effects/shipmodesmallmissiledamagepostdiv.py
eos/effects/structureenergyneutralizerfalloff.py
eos/effects/structuremoduleeffectstasiswebifier.py
eos/effects/structurerigmaxtargets.py
eos/effects/subsystembonusamarrdefensiveinformationwarfarehidden.py
eos/effects/subsystembonuscaldaridefensiveinformationwarfarehidden.py
eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py
eos/effects/techtwocommandburstbonus.py
eos/saveddata/fighter.py
eos/saveddata/fit.py
eos/saveddata/module.py
eve.db
gui/bitmapLoader.py
gui/builtinContextMenus/itemStats.py
gui/builtinStatsViews/miningyieldViewFull.py
gui/builtinViewColumns/misc.py
gui/builtinViews/__init__.py
gui/builtinViews/fittingView.py
gui/contextMenu.py
gui/graphFrame.py
gui/itemStats.py
gui/mainFrame.py
gui/marketBrowser.py
service/__init__.py
service/character.py
service/fit.py
service/port.py
service/prefetch.py
service/pycrest/eve.py
service/settings.py
2017-01-23 21:06:12 -05:00
Ebag333
d7c71f5d47
fix some, missed import references.
2016-12-15 16:17:10 -08:00
Ebag333
c858fc2859
Remove an inline import. Fix a reference that is missing.
2016-12-15 15:39:19 -08:00
Ebag333
f76f44e9f3
Fix port references, imports, and add some logging
2016-12-15 15:20:29 -08:00
