dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity
6,015 Commits 3 Branches 5 Tags
b4e765abfa828ea4e85cb62166bf1b01854be833
Commit Graph

111 Commits

Author SHA1 Message Date
MaruMaruOO
2f7a3e0287 Have imported fits always use implants if present 2018-07-17 22:35:09 -04:00
MaruMaruOO
910fe99e44 Bug fix to set implantLocation when importing from clipboard 2018-07-16 08:43:41 -04:00
blitzmann
b097818f1b Do not allow import of unpublished items (temporary measure to prevent abyssal items) 2018-05-29 21:01:55 -04:00
blitzmann
eeb700c75d Get back into tox's good graces 2018-05-15 01:41:32 -04:00
Ryan Holmes
3ec01a20c2 Bunch of renaming to bring variables up to speed 2018-03-16 18:15:48 -04:00
Ryan Holmes
8a10f0a766 sCrest > sEsi 2018-03-16 18:06:33 -04:00
blitzmann
bbdf1ee6cc More tweaks / error handling for esi 2018-03-11 15:31:41 -04:00
blitzmann
5560ef4d34 Merge branch 'test-3' into esi 
# Conflicts:
#	eos/saveddata/character.py
#	service/character.py
#	service/eveapi.py
#	service/pycrest/eve.py
 2018-03-10 15:32:21 -05:00
blitzmann
124bb027ab Use bs4.UnicodeDammit to handle different encodings for file imports (fits only for now, can look into expanding for other file import types) 2018-03-03 14:21:55 -05:00
blitzmann
d5ca14ca52 Remove encoding checks for eft import (#1459) 2018-03-03 00:50:56 -05:00
blitzmann
48a2963472 Merge branch 'issue/1433' into test-3 2018-02-24 23:40:26 -05:00
blitzmann
f245a02372 DNA export should respect Export Charges setting 2018-02-24 23:37:53 -05:00
blitzmann
201fb4e241 Remove all encoding bits from fit importing. Might not work 100% of the time, but as 2.0 gets introduced to the community, we'll get reports of possible problems. #1410 2018-02-23 00:00:53 -05:00
blitzmann
33eccaa374 Merge branch 'test-3' into esi 
# Conflicts:
#	requirements.txt
 2018-02-11 23:17:50 -05:00
blitzmann
5f0ce58c29 Merge branch 'master' into test-3 
# Conflicts:
#	gui/builtinShipBrowser/fitItem.py
#	service/port.py
 2018-02-11 21:29:17 -05:00
blitzmann
cb392e7e5f Rename a few things 2018-02-08 01:52:38 -05:00
blitzmann
dfba033190 Implement posting fit to EVE server 2018-02-08 01:50:52 -05:00
blitzmann
e025bff99b Get ESI fitting import working completely. Use a file cache for EsiApp to prevent long startup times (possibly cache for about a week or so, and start in background if it needs to be gotten again?) 2018-02-08 01:24:40 -05:00
burnsypet
b103f0df7e Include service modules in EFT export 
Change to service/port.py to include Slot.SERVICE in export
Also fixes a crash when attempting to export citadel with service
modules to CREST
 2018-01-26 13:53:07 +00:00
blitzmann
2936b88c3d code cleanup 2017-11-27 21:05:06 -05:00
blitzmann
dd3bc66896 Remove old py<2.6 OrderedDict compat module 2017-11-25 22:40:23 -05:00
blitzmann
3c405f51d8 Remove platform-specific CREST checks (add for mac-deprecated client) 2017-11-24 17:27:44 -05:00
blitzmann
b30b3fcbf1 Merge branch 'master' into test-3 
Conflicts:
	eos/gamedata.py
	eos/saveddata/booster.py
	eos/saveddata/character.py
	gui/builtinAdditionPanes/commandView.py
	gui/builtinContextMenus/commandFits.py
	gui/builtinMarketBrowser/itemView.py
	gui/builtinMarketBrowser/marketTree.py
	gui/builtinPreferenceViews/pyfaGeneralPreferences.py
	gui/builtinShipBrowser/categoryItem.py
	gui/builtinShipBrowser/fitItem.py
	gui/builtinShipBrowser/navigationPanel.py
	gui/builtinShipBrowser/raceSelector.py
	gui/builtinShipBrowser/shipItem.py
	gui/builtinStatsViews/priceViewFull.py
	gui/builtinViews/fittingView.py
	gui/characterEditor.py
	gui/characterSelection.py
	gui/chromeTabs.py
	gui/crestFittings.py
	gui/itemStats.py
	gui/mainFrame.py
	scripts/itemDiff.py
	service/price.py
 2017-11-23 11:19:05 -05:00
blitzmann
f5108c34db Do not kill the entire XML import if one fitting fails (#1231) 2017-07-09 19:08:46 -04:00
Ryan Holmes
828b18d0fd py2to3 automatic conversion. Woot! 2017-06-12 16:12:45 -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
dd09b3d951 Add fitting notes to the ship browser tooltips 2017-05-08 19:20:30 -04:00
blitzmann
f022c2474c Restrict fit notes export to 400 character for CREST and XML export 2017-05-08 19:02:30 -04:00
blitzmann
249956689a text tweaks 2017-05-08 18:26:44 -04:00
jeffy-g
4a964ab6be apply recent improvements 2017-04-10 03:05:44 +09:00
jeffy-g
d4d69522f5 edit source 2017-04-06 03:37:40 +09: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
9da485da55 Cleaning up tox errors that crept in by the pep8 gremlins. 2017-03-08 21:02:57 -08:00
Ebag333
ff5d40dcd3 Add additional logging to services 2017-02-28 10:32:03 -08: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
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
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
636474610b More of: Disable import inspections for wxPython, because it's not installed traditionally and we can't include it in requirements.txt 2017-02-08 20:16:58 -08:00
Ebag333
3e916e42f2 pyCharm inspection fixes. Mostly variable refernce issues 2017-02-08 17:55:20 -08:00
blitzman
f7d7b3fe5e Merge branch 'EosImportCleanup' of https://github.com/Ebag333/Pyfa into development 
Conflicts:
	eos/db/gamedata/metaData.py
	eos/db/gamedata/queries.py
	eos/db/saveddata/queries.py
	eos/saveddata/fleet.py
	eos/types.py
	eve.db
	gui/builtinContextMenus/amount.py
	gui/builtinViewColumns/ammo.py
	gui/builtinViewColumns/ammoIcon.py
	gui/builtinViewColumns/capacitorUse.py
	service/port.py
 2017-02-07 19:22:26 -05:00
Ebag333
be66ff1eec Tox fixes 2017-02-05 15:39:07 -08:00
blitzman
6b3d3ecd93 More import fixes for osx deprecated 2017-01-27 22:25:22 -05:00
blitzman
055957567f Fix fit import 2017-01-25 20:28:57 -05:00
Ebag333
8095b4852b Clean up another broken reference. Fix broken XML export. 2017-01-24 21:34:24 -08:00
blitzman
1b0cdeedce Fix lack of instance 2017-01-24 19:57:16 -05:00