Ryan Holmes
|
dfc5627031
|
Remove circular import mainFrame <> mainMenuBar
|
2017-02-07 09:37:20 -05:00 |
|
blitzman
|
542542f48d
|
import changes to graphframe
|
2017-02-07 00:33:15 -05:00 |
|
blitzman
|
5fda29e651
|
Merge branch 'master' of https://github.com/pyfa-org/Pyfa into development
|
2017-02-07 00:32:52 -05:00 |
|
blitzman
|
c25a07c95b
|
Stuff
|
2017-02-07 00:32:45 -05:00 |
|
Ryan Holmes
|
41ae8de99b
|
Merge pull request #970 from Ebag333/ToxFixes
Tox fixes
|
2017-02-05 22:24:55 -05:00 |
|
Ebag333
|
808f070df4
|
Redisable dynamic import test until eos.types is gone
|
2017-02-05 16:28:16 -08:00 |
|
Ebag333
|
e4cd66be5c
|
Add root to python paths
|
2017-02-05 16:21:07 -08:00 |
|
Ebag333
|
a638e991af
|
Disable test
|
2017-02-05 16:05:56 -08:00 |
|
Ebag333
|
d67dbaa0ae
|
.gitattributes fixing line endings
|
2017-02-05 15:39:23 -08:00 |
|
Ebag333
|
be66ff1eec
|
Tox fixes
|
2017-02-05 15:39:07 -08:00 |
|
Ryan Holmes
|
603a8acdfc
|
Update ISSUE_TEMPLATE.md
|
2017-02-05 17:57:18 -05:00 |
|
blitzman
|
86393d728f
|
I can't get these files out of "modified". Just commit them to get them out of the way.
|
2017-02-05 17:56:36 -05:00 |
|
blitzman
|
e564e051a3
|
tweaks to issue template
|
2017-02-05 17:55:54 -05:00 |
|
blitzman
|
2ade7dc632
|
Add issue template
|
2017-02-05 17:45:35 -05:00 |
|
blitzman
|
a938845aa2
|
Remove weird file... I have no idea what this is...
|
2017-02-05 17:16:23 -05:00 |
|
blitzman
|
ba2205867e
|
Test line endings with pyfa.py (see #964)
|
2017-02-05 17:12:45 -05:00 |
|
blitzman
|
d7ec04f995
|
test change to .gitattributes to specifically tell pyfa.py to save with LF line endings
|
2017-02-05 17:08:11 -05:00 |
|
blitzman
|
91baabd1b3
|
update database
|
2017-02-05 17:00:10 -05:00 |
|
blitzman
|
c3fdabd3a2
|
Merge branch 'development'
|
2017-02-05 16:52:27 -05:00 |
|
blitzman
|
3d8c76209d
|
update database from master
|
2017-01-29 19:52:56 -05:00 |
|
blitzman
|
c2038a6cf2
|
Change from UPDATE to DELETE for null damage pattern and target resist names
|
2017-01-29 19:04:57 -05:00 |
|
blitzman
|
082ac233ad
|
Merge branch 'MissingDamageTargetProfileNames' of https://github.com/Ebag333/Pyfa into development
Conflicts:
service/prefetch.py
|
2017-01-29 15:04:56 -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
|
6049c9837c
|
Remove prefetch thread (unneeded and consumes resources?)
|
2017-01-28 23:35:42 -05:00 |
|
blitzman
|
a76eef01de
|
name all ze threads
|
2017-01-28 17:46:59 -05:00 |
|
blitzman
|
b3eb4f35cd
|
Max out cargo amount to sys.maxint (#958)
|
2017-01-28 13:31:03 -05:00 |
|
blitzman
|
6b6dacf94c
|
Fix traceback when trying to cancel an amount dialog with nothing in the field
|
2017-01-28 13:30:14 -05:00 |
|
blitzman
|
f010f2fef2
|
Don't loop through all amounts of cargo and drones just to get the price. (#958)
|
2017-01-28 13:15:25 -05:00 |
|
blitzman
|
a952f80ea4
|
min version for sqlalchemy
|
2017-01-28 01:29:08 -05:00 |
|
blitzman
|
6d34ae2960
|
fix
|
2017-01-27 23:35:19 -05:00 |
|
blitzman
|
d17ff000c7
|
Add migration for alpha clone character update
|
2017-01-27 23:12:08 -05:00 |
|
blitzman
|
6b3d3ecd93
|
More import fixes for osx deprecated
|
2017-01-27 22:25:22 -05:00 |
|
blitzman
|
32dc28f48d
|
Move CREST import inside a conditional
|
2017-01-27 22:17:07 -05:00 |
|
blitzman
|
a210724312
|
Fix conversion imports for osx deprecated... :(
|
2017-01-27 22:06:52 -05: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
|
fb538027f7
|
Fix issues with paths and linux / os x
|
2017-01-27 20:30:11 -05:00 |
|
blitzman
|
cbf7f7d320
|
Merge branch 'master' into development
|
2017-01-27 19:39:10 -05:00 |
|
blitzmann
|
4111d670a7
|
Fix possible issue with floats coming through (see #729)
|
2017-01-26 23:52:18 -05:00 |
|
blitzmann
|
397084a9ff
|
Disable rename and delete button for restricted character on character editor spawn (fix for #930)
|
2017-01-26 21:33:13 -05:00 |
|
blitzmann
|
968d633d46
|
Merge branch 'feature/alphaclones' into development
|
2017-01-26 19:53:27 -05:00 |
|
blitzmann
|
96c3363edc
|
Merge branch 'master' into feature/alphaclones
Conflicts:
eve.db
|
2017-01-26 19:39:13 -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 |
|
Ebag333
|
d0fa2510e5
|
Merge branch 'test_import' of https://github.com/Ebag333/Pyfa into test_import
|
2017-01-25 17:40:00 -08:00 |
|
Ebag333
|
8d57f641f7
|
Remove comments about conversion
|
2017-01-25 17:39:54 -08:00 |
|
blitzman
|
055957567f
|
Fix fit import
|
2017-01-25 20:28:57 -05:00 |
|
blitzman
|
5aff3f007e
|
Fix crest export
|
2017-01-25 20:22:07 -05:00 |
|
blitzman
|
c34d86ba80
|
Fix XML exports
|
2017-01-25 20:12:30 -05:00 |
|
Ebag333
|
2038f36254
|
Remove calls to null pattern name cleanup
|
2017-01-25 13:52:00 -08:00 |
|