blitzmann
ce01c66b3e
Better manage price object juggling in Item.price property. The previous way was creating new price objects when an object already existed in the database which could lead to Integrity issues.
2017-04-10 20:48:58 -04:00
blitzmann
1260900668
Merge branch 'pricing_v2' into development
2017-04-10 20:46:57 -04:00
Ryan Holmes
82f6d26a88
Merge pull request #1109 from Ebag333/eos_fit_cleanup
...
Some quick cleanup of logging and shtuff
2017-04-09 23:25:11 -04:00
Ebag333
d1e8f5cf5c
Placeholder test ( #1113 )
...
* Placeholder test
* pep8
2017-04-09 22:44:28 -04:00
Ryan Holmes
82edaf05d3
Merge pull request #1116 from pyfa-org/eos_cleanup
...
Eos cleanup
2017-04-09 22:43:29 -04:00
blitzmann
fadc514592
Add back the booster side effect stuff
2017-04-09 22:38:31 -04:00
Ryan Holmes
addff1118c
Extend "Open Fit In Context Menu" option for command fits. ( #1104 )
2017-04-05 19:26:12 -04:00
Ebag333
6a1d106fea
Appveyor ( #1101 )
...
Appveyor setup
2017-04-05 16:18:03 -07:00
Ryan Holmes
07f88cc4d1
Add Create and Modify fields for most database tables ( #1073 )
...
* Add created/modified fields to relevant tables.
* Add migration for created and modified fields
* Seriously tox?
2017-04-05 18:54:57 -04:00
Ebag333
802e2afcc0
General cleanup of Eos. Reformats a bunch of files and cleans up unused code or code that's been commented out
2017-04-05 15:47:19 -07:00
Ebag333
ee09b41e08
Use rlock instead of lock
2017-04-05 14:56:22 -07:00
Ebag333
994bd72409
Rework pricing.
2017-04-05 14:40:27 -07:00
Ebag333
01eaba6697
First pass
2017-04-05 11:44:36 -07:00
Ebag333
c1b74f481a
Tox
2017-04-05 00:44:02 -07:00
Ebag333
df510c40f4
Some quick cleanup of logging and shtuff
2017-04-05 00:17:13 -07:00
Ryan Holmes
9d029b46b1
Respect command fit state ( #1100 )
...
* Respect command fit state in calculations
* Utilize `getCommandInfo` instead (we do it this way for projections. Consistency, fuck yeah!)
2017-04-02 23:20:31 -05:00
Ebag333
d2af4f7d9c
Locale Tests ( #1079 )
...
* Locale tests redo
* Add helper
* Remove line break if found.
* Fix imports
* Remove copy that snuck in
* Install language packs
* Change language pack install
* fix china language pack
* Fix tests that I accidentially broke
* Add debug print
* Don't try and parse Travis cache dirs
* Fix counting
2017-04-02 15:53:14 -07:00
Ryan Holmes
3dd539b4f0
Improve some efficiencies with the variations context menu: Do not recalc twice when switching items. ( #1095 )
2017-04-02 16:46:25 -05:00
Ebag333
1daafd15e6
Tests ( #1086 )
...
* First step in more tests
(cherry picked from commit b9af117)
* Formatting
(cherry picked from commit 5f037e6)
* Booster test fixes
* Switch to wx3.0
* try coda
* Test output
* Tweak travis
* try reduced virtualenv
* Tweak travis
* Reduce test to a single one.
* Formatting
2017-04-02 10:26:11 -07:00
Ryan Holmes
92722d491f
Remove functionality related to auto HTML export ( #1088 )
2017-04-02 11:46:17 -05:00
Ryan Holmes
f9ec79c8eb
Merge pull request #1093 from pyfa-org/master
...
Bring dev up to date with master
2017-04-01 23:14:26 -05:00
Ryan Holmes
112ab91e34
Fix for #1091 ( #1092 )
2017-04-01 23:09:32 -05:00
Ryan Holmes
59b0ac127f
Merge pull request #1071 from blitzmann/issue-686
...
Switch units in recharge pane based on effective HP toggle (requested by #686 )
2017-04-01 22:31:38 -05:00
Ryan Holmes
e03b3227d4
Fix for #1081 ( #1085 )
...
* Break project application code out of main item iteration, and apply it after command boosts have been applied to the fit. Fix for #1081
* Make tox happy
2017-04-01 22:23:50 -05:00
Ryan Holmes
f08a66924c
Re-introduce Command Fit State ( #1074 )
...
Reintroduce command view state
Squashes `blitzmann/command-fit-state`:
* Reintroduces command view state, allowing users to toggle command fits on and off.
* Remove type() function call and use __class__ instead
2017-04-01 22:04:44 -05:00
Ryan Holmes
878d9d7148
Merge pull request #1072 from blitzmann/fix-string-variables
...
Fix an exception caused by too few variables for string formatting
2017-03-27 00:04:42 -04:00
blitzman
cb77987129
Fix an exception caused by too few variables for string formatting
2017-03-26 23:51:05 -04:00
blitzman
37ec3d41d9
Switch the units of recharge rates based on EHP / HP
2017-03-26 16:19:14 -04:00
Ryan Holmes
6ececbb81a
Merge pull request #1063 from blitzmann/feature/commandmenu
...
Command Fit Menu
2017-03-26 14:56:50 -04:00
Ryan Holmes
a67c28a4c9
Merge branch 'development' into feature/commandmenu
2017-03-26 14:43:12 -04:00
Ryan Holmes
c3a0176c88
Merge pull request #1021 from Ebag333/MorePreferences
...
Add more functionality to preferences window.
2017-03-26 14:42:49 -04:00
blitzman
e7de57fc7a
tox fixes
2017-03-26 14:39:45 -04:00
blitzman
d928df9c69
Move useStaticAdaptiveArmorHardener to the EOSSettings. Not moving force reload for now
2017-03-26 14:28:13 -04:00
blitzman
b18bb200a9
Merge branch 'development' into MorePreferences
2017-03-26 13:52:59 -04:00
Ryan Holmes
225011f2c1
Merge pull request #1070 from blitzmann/fixforsettings
...
Fix settings provider
2017-03-26 13:47:41 -04:00
blitzman
024edc500f
Fix settings provider
2017-03-26 13:35:46 -04:00
Ryan Holmes
42d59d21a6
Merge pull request #1042 from Ebag333/HandleBadHandleres
...
Effect Handlers Import - Less Spam
2017-03-26 12:38:47 -04:00
Ryan Holmes
4795571629
Merge branch 'development' into HandleBadHandleres
2017-03-26 12:33:58 -04:00
Ryan Holmes
df587892a3
Merge branch 'development' into feature/commandmenu
2017-03-26 12:27:52 -04:00
Ryan Holmes
1ffcdc92f2
Merge pull request #1031 from Ebag333/tooltip_capacitor_neut_resistance
...
Tooltip for capacitor neut resistance
2017-03-26 12:16:41 -04:00
Ryan Holmes
bd043c2358
Fix for #1061 ( #1068 )
...
Squash commit that does the following:
* Enable Council Diplo Shuttle
* Disables a test that was preventing Travis from returning success (need to look into this more later)
2017-03-26 12:15:07 -04:00
blitzman
fd745c5f62
Tox fix.
2017-03-25 01:02:20 -04:00
Ryan Holmes
41628ca17f
Merge pull request #1065 from Ebag333/pytests
...
pytests
2017-03-25 00:41:02 -04:00
Ebag333
21fbbf154d
Try fake wx module
2017-03-24 18:00:51 -07:00
Ebag333
66c4aefc1e
Add comment
2017-03-24 17:27:17 -07:00
Ebag333
5d5c95fb2c
Example tests for services! General cleanup.
...
(cherry picked from commit 9f41bb4)
2017-03-24 11:15:39 -07:00
Ebag333
13305d9ee1
Use correct formula. \o/
...
(cherry picked from commit b20b6c1)
2017-03-24 11:15:37 -07:00
Ebag333
4a9638767d
use math
...
(cherry picked from commit 4b75f57)
2017-03-24 11:15:34 -07:00
Ebag333
55cd0d5000
Clean up test structure a bit
...
(cherry picked from commit 320e05b)
2017-03-24 11:15:32 -07:00
Ebag333
1da15cfde3
Add right number of levels to remove.
...
(cherry picked from commit 1d0a682)
2017-03-24 11:15:30 -07:00
