blitzman
6eddfd2694
Merge branch 'development' into LogBook_v2
...
Conflicts:
gui/bitmapLoader.py
2017-02-25 19:03:56 -05:00
blitzman
cb15a3a1d6
Merge branch 'master' into development
2017-02-25 19:02:15 -05:00
blitzman
cd516f80bb
bump dev
2017-02-25 19:01:57 -05:00
blitzman
1d9b85c043
Merge branch 'master' into development
2017-02-25 19:01:28 -05:00
blitzman
1ae5f64696
Here we go again!
2017-02-25 18:50:20 -05:00
blitzman
bf24e5f518
Fix for #1014
2017-02-25 18:47:03 -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
6da806c9c5
Merge branch 'master' into development
2017-02-25 17:49:26 -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
5adfcbf343
Add links in the error dialog
2017-02-25 17:37:38 -05:00
blitzman
c0e0612e02
Merge branch 'errortest'
2017-02-25 17:12:19 -05:00
blitzman
4ba4a753cb
Implement and error message if config fails
2017-02-25 17:12:09 -05:00
blitzman
3cbd154c8a
Fix for #1013
2017-02-25 16:44:31 -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
Ryan Holmes
249841c0db
Update pyfa.spec
2017-02-24 16:55:22 -05:00
Ryan Holmes
8900674b72
Merge pull request #978 from Ebag333/OneClickBuilds
...
One Click Builds
2017-02-24 16:52:58 -05:00
Ebag333
516ff6f8e6
Fix .gitignore so it stops ignoring pyfa.spec. RUDE!
2017-02-24 12:14:39 -08:00
Ryan Holmes
dc9c481b80
Merge remote-tracking branch 'blitzmann/unicodetests'
2017-02-24 09:54:50 -05:00
blitzman
bada45ec69
Merge branch 'master' of https://github.com/pyfa-org/Pyfa
2017-02-24 00:11:30 -05:00
blitzman
ee407913c3
Fix for #1005
2017-02-24 00:11:24 -05:00
blitzman
6e643d7579
Encode the SSL paths for frozen environments (to fix #548 )
2017-02-23 23:53:57 -05:00
Ryan Holmes
b8c771f747
Merge pull request #1006 from Ebag333/Pyfa_tests
...
Tests for Pyfa
2017-02-21 11:04:50 -05:00
Ebag333
a07e1d8f3a
Test actual correct value, not the wrong value that was being generated by old hacky method.
2017-02-21 07:43:04 -08:00
Ebag333
565a78610e
Fix floorfloat, and pep8 fixes for tests
2017-02-21 07:38:32 -08:00
Ebag333
cdbf4cf5ec
Initial pass at tests
2017-02-20 16:35:53 -08:00
Ryan Holmes
ec5c7e5d0e
Update README.md
2017-02-20 00:43:58 -05:00
blitzman
b583589849
Remove unicode path fixes for now to better test original problems
2017-02-19 01:01:12 -05:00
blitzman
c3144088ca
Fix CREST login ( #998 ). Also flesh out a two-step process:
...
Step 1: get a page that lets the user know we're processing request. Do whatever we need to do with the hash (in the case of implicit mode), and then refresh to step 2
Step 2: process response, and return error / success message.
2017-02-18 21:59:18 -05:00
Ryan Holmes
7df3fe266e
Merge pull request #1002 from Ebag333/matplotlib_import_fix
...
Matplotlib Import Fix
2017-02-18 18:17:17 -05:00
blitzman
b351befa97
Fix for #1000
2017-02-18 18:14:21 -05:00
blitzman
3925386109
bump dev
2017-02-18 18:14:03 -05:00
Ebag333
cdf392e3e5
Change matplotlib to be imported at the top and not use the import hack. Slows down the startup times slightly, but much simpler.
2017-02-18 10:15:06 -08:00
blitzman
e51ca85e26
Bump stable
2017-02-16 23:16:02 -05:00
blitzman
4ba11d832a
Tox fixes, because it's a thing we do now
2017-02-16 23:12:25 -05:00
blitzman
66d78fed2c
Add indication in character name of alpha status
2017-02-16 23:09:27 -05:00
blitzman
6f733394f7
Fix ICS / Mining Boost skill bonus ( #892 )
2017-02-16 00:26:11 -05:00
blitzman
b164b86eda
Fix context menu order
2017-02-16 00:18:09 -05:00
blitzman
de50bbb16f
Update effect files
2017-02-15 21:14:40 -05:00
blitzman
e835cb7f8c
update database
2017-02-15 21:12:05 -05:00
blitzman
7fea0c9431
Add migration script for #728
2017-02-15 21:01:58 -05:00
blitzman
bcd045ae4e
tweak
2017-02-15 21:01:36 -05:00
blitzman
3f46db55b6
Merge remote-tracking branch 'ebag/ActiveDroneStacking'
2017-02-15 21:01:28 -05:00
Ebag333
a865028420
Remove litter.
2017-02-15 15:42:46 -08:00
Ebag333
489637ec67
Handle this at a lower level.
2017-02-15 09:20:22 -08:00
Ebag333
71ca7d153e
Check if we have active drones when merging, if we do make them all active to avoid getting weird scenarios (like deactivating stacks, or only activating parts of stacks). Fixes #728
2017-02-15 08:59:54 -08:00
blitzman
0a37834fd8
Disable the global module ammo picker for now
2017-02-14 23:20:23 -05:00
blitzman
0cc279b351
pass the damn tox
2017-02-14 23:06:33 -05:00
blitzman
06baa10cdc
Fix for #991
2017-02-14 20:33:27 -05:00
