blitzman
fc45cef834
Change order of RR pane
2017-02-26 12:56:31 -05:00
Ryan Holmes
3209459e6d
Merge pull request #995 from Ebag333/Remote_Repair_Pane_v2
...
Remote Repair Pane v2
2017-02-26 12:51:13 -05:00
Ebag333
7eb193cbbb
Delete test, the method being tested no longer exists.
2017-02-26 08:52:27 -08:00
Ebag333
e4d0f2dc6f
Fix case where property gets reran multiple times.
2017-02-26 08:46:23 -08:00
blitzmann
c430a2d798
Merge branch 'development' into Remote_Repair_Pane_v2
...
Conflicts:
eos/mathUtils.py
service/crest.py
2017-02-26 01:40:53 -05:00
blitzman
1c273210e9
tox fixes
2017-02-26 00:44:37 -05:00
Ryan Holmes
db4e5e05a4
Merge pull request #1012 from Ebag333/PropertiesPane
...
Add Properties Pane
2017-02-26 00:17:38 -05:00
Ryan Holmes
c6483c4b98
Merge pull request #986 from Ebag333/LogBook_v2
...
Logbook V2
2017-02-25 23:59:30 -05:00
blitzman
94c098cce3
Fix path and graphFrame issue. I could have sworn these were already fixed during the previous merge...
2017-02-25 19:06:39 -05:00
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
Ebag333
baec24ef14
get rid of unused method
2017-02-24 21:28:23 -08:00
Ebag333
df7f0b20f5
Tox cleanup
2017-02-24 21:25:13 -08:00
Ebag333
e5e3133869
Catch exceptions if we get them from a property. Exceptions are bad, but not showing the window is worse.
2017-02-24 21:18:38 -08:00
Ebag333
ca6ef546e5
Add debug pane for item stats
2017-02-24 18:09:22 -08:00
Ebag333
c24798ad2f
Clean up last reference and finish nuking floatfloor. One less method! (ouch my test!)
2017-02-24 17:07:05 -08:00
Ebag333
3411eca1e7
Fix a couple pep8 issues, and clean up other folks pep8 misses. :)
2017-02-24 16:34:32 -08:00
Ebag333
43073069c7
Fix merge conflict.
2017-02-24 16:25:31 -08:00
Ebag333
db330ad035
Merge remote-tracking branch 'origin/Remote_Repair_Pane_v2' into Remote_Repair_Pane_v2
...
# Conflicts:
# eos/saveddata/fit.py
2017-02-24 16:15:39 -08:00
Ebag333
b3c7273681
implement a suggestion or six from @blitzmann. Fix a bunch of low level bugs (unlikely to have been noticed since we don't really expose those stats). Add some properties instead of referencing the attribute directly.
2017-02-24 16:10:54 -08:00
blitzman
3892ac5996
Change functionality of remote rep calculations to be more efficient.
...
* Implement a property per attribute
* Use None as our cleared value (signifies that it really hasn't been calculated, not just that the calc was 0)
2017-02-24 18:33:42 -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
5ca882d3ea
implement a suggestion from @blitzmann
2017-02-24 13:06:02 -08: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
