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

298 Commits

Author SHA1 Message Date
blitzman
b18bb200a9 Merge branch 'development' into MorePreferences 2017-03-26 13:52:59 -04:00
blitzman
c4293bba6b bump dev 2017-03-23 00:36:20 -04:00
blitzman
4a6c0db4fa Bump to stable point release 2017-03-20 21:05:09 -04:00
blitzman
20ac2ad847 bump dev 2017-03-15 20:19:05 -04:00
blitzman
3b5fc7e13c Bump stable 2017-03-15 20:10:08 -04:00
blitzman
9befaf7c91 Test implementation of eos settings 2017-03-05 02:01:10 -05:00
Ebag333
d67573f83a Add more functionality to preferences window. 2017-02-27 12:05:38 -08:00
blitzman
1c273210e9 tox fixes 2017-02-26 00:44:37 -05:00
blitzman
6eddfd2694 Merge branch 'development' into LogBook_v2 
Conflicts:
	gui/bitmapLoader.py
 2017-02-25 19:03:56 -05:00
blitzman
cd516f80bb bump dev 2017-02-25 19:01:57 -05:00
blitzman
1ae5f64696 Here we go again! 2017-02-25 18:50:20 -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
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
4ba4a753cb Implement and error message if config fails 2017-02-25 17:12:09 -05:00
blitzman
6ab936ef09 lol jk 2017-02-25 14:41:40 -05:00
blitzman
083c5d1722 Bump stable 2017-02-25 13:23:21 -05:00
blitzman
6e643d7579 Encode the SSL paths for frozen environments (to fix #548) 2017-02-23 23:53:57 -05:00
blitzman
b583589849 Remove unicode path fixes for now to better test original problems 2017-02-19 01:01:12 -05:00
blitzman
3925386109 bump dev 2017-02-18 18:14:03 -05:00
blitzman
e51ca85e26 Bump stable 2017-02-16 23:16:02 -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
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
1d69ed7584 Merge branch 'test_import' into development 
Conflicts:
	gui/builtinContextMenus/amount.py
	gui/characterEditor.py
	gui/itemStats.py
 2017-01-27 20:39:54 -05:00
blitzman
43e864e47b Fix issue in which -s flag was not being honored 2017-01-27 20:36:19 -05: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
bef17e53c6 Recreating wheels 2016-12-19 00:11:55 -08:00
Ebag333
d4b6099d6e Handle unicode, utf8, and windows-1252 
(cherry picked from commit 0d4f24a)
 2016-12-18 14:11:55 -08:00
blitzman
3396056dae bump dev 2016-12-18 09:19:47 -05:00
blitzman
366d6c8971 bump stable 2016-12-18 08:00:19 -05:00
Ebag333
4fb07cc1d0 Bunch of pep8 and inspection cleanup 2016-12-15 12:43:19 -08:00
blitzman
0d44cbf74a clean up path stuff 
(cherry picked from commit d3e360b)
 2016-12-14 12:24:35 -08:00
blitzman
9df87f61cd bump dev 
(cherry picked from commit 2b3e646)
 2016-12-14 12:22:17 -08:00
blitzman
4186e19c65 bump stable 
(cherry picked from commit e0e7478)
 2016-12-14 12:22:10 -08:00
blitzman
9ecfc475e3 Bump dev, fix for #874 
(cherry picked from commit b375d3c)
 2016-12-14 12:13:55 -08:00
blitzman
84dc93ac54 bump release 
(cherry picked from commit f160aed)
 2016-12-14 12:13:02 -08:00
Ebag333
08b5abc7ad Handle unicode, utf8, and windows-1252 
(cherry picked from commit 0d4f24a)
 2016-12-14 10:38:56 -08:00
a-tal
b4dd65cf3e dont use built-in function format as a var name 
(cherry picked from commit 74dd6cf)
 2016-12-13 20:19:27 -08:00
a-tal
d3b6bc1c93 so many pep8 fixes 
(cherry picked from commit bee125d)
 2016-12-13 20:16:44 -08:00
blitzman
2b3e646213 bump dev 2016-12-11 14:18:48 -05:00
blitzman
e0e7478857 bump stable 2016-12-10 19:43:34 -05:00
blitzman
b375d3cb6c Bump dev, fix for #874 2016-12-03 18:28:48 -05:00
blitzman
f160aede3e bump release 2016-12-02 18:25:31 -05:00
blitzman
e30040c9fd Bump pre-release 2016-11-22 20:53:57 -05:00
blitzman
13b452223d bump dev 2016-10-02 22:02:50 -04:00
blitzman
c64838f7f5 Update effect headers and bump stable 2016-09-28 00:20:30 -04:00
blitzman
b5574ca535 bump dev 2016-09-25 22:04:54 -04:00
blitzman
d1c18d9642 Bump stable 2016-09-06 23:51:25 -04:00
blitzman
a074199219 Bump stable 2016-09-01 22:20:51 -04:00
blitzman
f98f6a120b Bump dev, fix issue with applying fleet boosts 2016-08-28 19:35:55 -04:00