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

..

conversions

Merge branch 'master' into test-3

2018-02-14 22:07:33 -05:00

marketSources

Fix update checker, migrate to requests package for all network stuff. The eveapi package is probably not going to work with caching and whatnot, but pyfa doesn't use it and XML API is EOL anyway

2018-03-04 18:08:34 -05:00

pycrest

Merge branch 'test-3' into esi

2018-03-10 15:32:21 -05:00

__init__.py

Make it run again

2016-12-02 03:13:54 -08:00

attribute.py

py2to3 automatic conversion. Woot!

2017-06-12 16:12:45 -04:00

character.py

Merge branch 'test-3' into esi

2018-03-10 15:32:21 -05:00

crudeTests.py

Fix energy warfare

2016-06-19 23:04:52 -04:00

damagePattern.py

Merge remote-tracking branch 'origin/master' into test-3

2018-02-24 02:03:29 -05:00

esi_security_proxy.py

Get logging into EVE working and SSO characters saving, along with client hashes being stored alongside characters.

2018-02-07 00:44:37 -05:00

esi.py

Make a callback for token refresh, not sure how I'm gonna handle this one yet

2018-02-12 21:43:23 -05:00

eveapi.py

Merge branch 'test-3' into esi

2018-03-10 15:32:21 -05:00

fit.py

Merge branch 'master' into test-3

2018-03-01 23:42:22 -05:00

implantSet.py

Make modules static if they do not use self.

2017-02-09 00:04:41 -08:00

market.py

Merge branch 'master' into test-3

2018-03-02 00:17:54 -05:00

network.py

Network: apply proxy settings for requests library call

2018-03-05 16:24:00 +03:00

port.py

Merge branch 'test-3' into esi

2018-03-10 15:32:21 -05:00

prefetch.py

Add additional logging to services

2017-02-28 10:32:03 -08:00

prereqsCheck.py

code cleanup

2017-11-27 21:05:06 -05:00

price.py

Merge branch 'master' into test-3

2017-12-10 22:36:15 -05:00

server.py

Get logging into EVE working and SSO characters saving, along with client hashes being stored alongside characters.

2018-02-07 00:44:37 -05:00

settings.py

code cleanup

2017-11-27 21:05:06 -05:00

targetResists.py

Do the same treatment to Target Resists as Damage Patterns

2018-02-24 02:01:23 -05:00

update.py

Fix update checker, migrate to requests package for all network stuff. The eveapi package is probably not going to work with caching and whatnot, but pyfa doesn't use it and XML API is EOL anyway

2018-03-04 18:08:34 -05:00