blitzman
|
b164b86eda
|
Fix context menu order
|
2017-02-16 00:18:09 -05:00 |
|
Ebag333
|
eb97a1c11c
|
Add tooltip and also a minimal version of the view (for future state).
|
2017-02-15 19:11:32 -08:00 |
|
Ebag333
|
13996d7770
|
Stupid change list making me miss files.
|
2017-02-15 18:50:35 -08:00 |
|
Ebag333
|
6e04707457
|
Commit *ALL* the files.
|
2017-02-15 18:25:11 -08:00 |
|
Ebag333
|
25b17a221c
|
Update to current version
|
2017-02-15 18:23:14 -08: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
|
93e7b4f5cf
|
Cherry pick d033e4a8d919664d3ae210098291e38df71d3256
|
2017-02-15 17:23:53 -08: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 |
|
blitzman
|
c406102995
|
remove redundant inits
|
2017-02-14 20:30:34 -05:00 |
|
blitzman
|
0dc3eda99f
|
Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development
|
2017-02-13 23:27:40 -05:00 |
|
blitzman
|
2dca9fc3f3
|
Fix stuff in system pricing feature
|
2017-02-13 22:27:03 -05:00 |
|
blitzman
|
97cdd751b8
|
Fix up the CREST server thread to make it a bit more robust, as well as fixing issue in which thread may never die
|
2017-02-13 21:56:12 -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
|
be9eaa0859
|
Fix timer, make logging less annoying when at Info or higher level. Only show command bonus logspam if there is any.
|
2017-02-13 13:25:42 -08:00 |
|
Ebag333
|
35e330f574
|
Improve handling for exceptions, output more information so we can find and fix problems.
|
2017-02-12 13:09:26 -08:00 |
|
Ebag333
|
e7a5cb4b1d
|
Don't show both messages if we don't have the zip files
|
2017-02-12 12:21:57 -08:00 |
|
blitzman
|
c9c29da803
|
Avoid fit recalc when setting state has no effect
|
2017-02-11 23:55:19 -05:00 |
|
blitzman
|
2527fe2e1e
|
Fix the fix for the crash in OS X
|
2017-02-11 22:20:32 -05:00 |
|
blitzman
|
a4de0f2b5b
|
Fix crash in OS X
|
2017-02-11 22:10:53 -05:00 |
|
blitzman
|
401d0d58d5
|
Merge branch 'development'
|
2017-02-11 21:42:48 -05:00 |
|
Ebag333
|
441b3f1646
|
Handle print() messages when not frozen and in debug. We only want to exclude handling stacktraces, so the IDE gets clickable line numbers.
|
2017-02-11 11:59:49 -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 |
|
Ryan Holmes
|
beed414429
|
Merge pull request #984 from Ebag333/FixToxIssues
Tox fixes, and catching a few things lost in the merge.
|
2017-02-11 13:01:33 -05:00 |
|
Ryan Holmes
|
99b2fdefcc
|
Merge pull request #985 from Ebag333/Travis_Icon
Add Travis Icon
|
2017-02-11 12:59:21 -05:00 |
|
Ebag333
|
9ec6a829c2
|
Revert the revert of the revert.....or something.
|
2017-02-11 09:47:23 -08:00 |
|
Ebag333
|
913f70b24d
|
Fix copy/pasta
|
2017-02-11 09:41:26 -08:00 |
|
Ebag333
|
5a4d68684e
|
Add Travis Icon
|
2017-02-11 09:38:10 -08:00 |
|
Ebag333
|
096842de44
|
Tox fixes, and catching a few things lost in the merge.
|
2017-02-11 09:23:23 -08:00 |
|
blitzman
|
81e5b33bc9
|
Few tweaks for price system selection
|
2017-02-11 11:36:53 -05:00 |
|
blitzman
|
5c91f29efb
|
Merge branch 'price-system-selection' of git://github.com/petosorus/Pyfa into petosorus-price-system-selection
Conflicts:
gui/builtinPreferenceViews/pyfaGeneralPreferences.py
gui/builtinStatsViews/priceViewFull.py
service/fit.py
service/price.py
|
2017-02-11 11:36:35 -05:00 |
|
blitzman
|
bfcb73f344
|
Fixes for #952
|
2017-02-11 11:12:10 -05:00 |
|
blitzman
|
a2ca5eb8a4
|
fix oops
|
2017-02-11 11:01:39 -05:00 |
|
blitzman
|
f34e564ccd
|
Merge branch 'MatPlotLib' of https://github.com/Ebag333/Pyfa into Ebag333-MatPlotLib
Conflicts:
gui/graphFrame.py
|
2017-02-11 10:53:24 -05:00 |
|
blitzman
|
0cba428c81
|
Merge branch 'master' of https://github.com/pyfa-org/Pyfa
|
2017-02-11 10:48:11 -05:00 |
|
blitzman
|
423a433e16
|
Merge branch 'SorryNotSorryBlitzmann' into development
|
2017-02-11 10:47:22 -05:00 |
|
blitzman
|
bdee8f662c
|
Merge remote-tracking branch 'ebag/SorryNotSorryBlitzmann' into SorryNotSorryBlitzmann
|
2017-02-11 10:46:59 -05:00 |
|
blitzman
|
62bb550afd
|
Add shortcut indication for fitting search tooltip
|
2017-02-11 10:15:01 -05:00 |
|
Ebag333
|
3562577521
|
Tox fix, and catch an extra shadowing
|
2017-02-10 12:06:23 -08:00 |
|
Ebag333
|
8c7682c6d4
|
Little more OCD on cleaning up imports.
|
2017-02-10 12:02:23 -08:00 |
|
Ebag333
|
2b45a16872
|
Refactor most of the shadowing from outer scopes. This is a super simple change, just changing the variable used inside (mostly) lambdas.
|
2017-02-10 11:50:04 -08:00 |
|
Ebag333
|
73cc17ce72
|
Clean up some more import statements
|
2017-02-10 11:29:52 -08:00 |
|