Commit Graph

5164 Commits

Author SHA1 Message Date
blitzmann
5392aaa27e refresh command fits on boosted fits when the booster is deleted 2017-05-13 23:28:48 -04:00
Ryan Holmes
fee82d294b Bump dev and include fix for #1162 (#1163)
* Add some logging to try to figure out what happens with #1149

* Add some logging to try to figure out what happens with #1149, along with some other fixes

* bump dev

* Add remote hull repairers in the calculateSustainableTank() mappings
2017-05-13 22:36:03 -04:00
Ryan Holmes
9f5e14fe2d Bugfixes and bump point release (#1159)
* Add some logging to try to figure out what happens with #1149, along with some other fixes

* Bump point release
2017-05-11 20:53:37 -04:00
Ryan Holmes
b39ec4f9b3 Do not commit price objects to database from within thread (#1154)
* Remove database commit in price worker, essentially bringing it back to the previous functionality (pass thread list of price objects, it modifies, calls back for main thread to commit). There's probably a better way to handle this for the future creating a scoped session or something, but for now this works

* E303 too many blank lines (2)
2017-05-11 01:15:07 -04:00
Ryan Holmes
25bfb4ddb8 Fox for issue #1152 - unicode characters in entity names (#1153) 2017-05-10 22:36:10 -04:00
Ryan Holmes
de9b167242 Bump version and include fix for #1147 (#1150)
* bump dev

* Fix two issues with deleting fits (#1147)
2017-05-10 18:48:33 -04:00
Ryan Holmes
18d44979e4 Merge pull request #1143 from pyfa-org/release-1.29.0
Release 1.29.0
2017-05-09 21:05:42 -04:00
blitzmann
1eddad859a Bump for 1.29.0 release for realz
This reverts commit fc9408d062.
2017-05-09 20:59:35 -04:00
blitzmann
e2de1565bf Forgot to add notes to the import fit list. Caused break. Very bad. 2017-05-09 20:59:11 -04:00
blitzmann
fc9408d062 Revert "bump for 1.29.0 release"
This reverts commit 892ee13542.
2017-05-09 20:56:09 -04:00
Ryan Holmes
cb98618e5e Merge pull request #1142 from pyfa-org/release-1.29.0
Release 1.29.0
2017-05-09 20:54:41 -04:00
blitzmann
892ee13542 bump for 1.29.0 release 2017-05-09 20:49:05 -04:00
blitzmann
2595c59c73 Fix issue in which character editor did not display skill level update when changed from skill search results 2017-05-09 19:57:59 -04:00
blitzmann
93c26aa02f Merge branch 'jeffy-g-fix_unread_description' into release-1.29.0 2017-05-09 18:58:15 -04:00
blitzmann
a6a153b703 Update database, add missing renders, fix bug with not being able to add citadel modules, and fix bug associated with engineering complex properties (debug info, don't care about it) 2017-05-09 18:52:32 -04:00
blitzmann
38e6e7d5ed Add missing Dagon effect 2017-05-08 22:58:25 -04:00
blitzmann
4d8c9e0522 Fix floats in skill tree, and fix typo - apparently I can't spell dependents x_x 2017-05-08 22:49:37 -04:00
blitzmann
e75e2b7605 Bad isinstance() for skill search... I feel like I've fixed this 3 times now??? 2017-05-08 22:40:12 -04:00
blitzmann
0e81c985a3 Fix bad index for fit notes which causes exception on recent fits 2017-05-08 22:38:18 -04:00
blitzmann
21a071ea40 Add "remove" context menu to command fits 2017-05-08 22:34:03 -04:00
blitzmann
4f1e7697ed Fix issue in which "Open Fit" was showing on the command view, not the command fit, potentially causing an error 2017-05-08 22:29:50 -04:00
blitzmann
ccfd414cb3 Disable stopwatch in test (was failing due to import error) and fix bad requests version setting 2017-05-08 22:25:05 -04:00
blitzmann
3de63c5ca5 flake8 fixes 2017-05-08 21:32:13 -04:00
blitzmann
42e64a6223 Fix jsonToSql script and issue with character sec status setter 2017-05-08 21:24:29 -04:00
blitzmann
53f589284b Implement hard constraints for All 5/0 characters with respect to skills and sec status 2017-05-08 19:47:55 -04:00
blitzmann
aecbf8f86e Fix issue with drones causing exception during remote RR calcs 2017-05-08 19:41:34 -04:00
blitzmann
dd09b3d951 Add fitting notes to the ship browser tooltips 2017-05-08 19:20:30 -04:00
blitzmann
f022c2474c Restrict fit notes export to 400 character for CREST and XML export 2017-05-08 19:02:30 -04:00
blitzmann
249956689a text tweaks 2017-05-08 18:26:44 -04:00
blitzmann
6b22bd189a Merge remote-tracking branch 'jeffy/fix_unread_description' into dev, see #1099
Conflicts:
	eos/config.py
	gui/notesView.py
	service/settings.py
2017-05-08 00:44:29 -04:00
blitzmann
524bb43113 Merge branch 'fix_unread_description' of git://github.com/jeffy-g/Pyfa-dev into jeffy-g-fix_unread_description 2017-05-08 00:09:09 -04:00
blitzmann
83a7a854bb Merge branch 'feature/recent' into dev
Conflicts:
	eos/db/saveddata/character.py
	eos/db/saveddata/fit.py

Implements #983 but utilizing sqlalchemy events to update the fit modified date whenever something is added/changed.
2017-05-07 20:48:41 -04:00
blitzmann
0507a55731 Get resists working with more things, and fix bug in which we were still looking at an effect info (which doesn't exist anymore) 2017-05-07 19:59:25 -04:00
blitzmann
f1eb3f68d1 Change func.now() to datetime.datetime.now().
Apparently these are calculated differently (sqlite function is in utc, datetime is in local), and I couldn't figure out how to retrieve the tiome back into local. Since this is a single user application without a concern for time drift on the server, this should work just as well.
2017-05-07 11:35:26 -04:00
blitzmann
1604ea1f2c Fix many bugs related to GUI not receiving a correct timestamp, as well as extending feature out to all other fit entities. 2017-05-07 02:02:54 -04:00
blitzmann
4a9662c0f7 Merge branch 'feature/skill-filter' into dev
Conflicts:
	gui/characterEditor.py

This implements a long-requested feature to be able to search skills in the character editor
2017-05-06 13:25:20 -04:00
blitzmann
47a683c44c Merge branch 'feature/strictSkills' into dev
Conflicts:
	service/character.py

Implements strict skill requirement handling
2017-05-06 13:13:50 -04:00
blitzmann
d888982657 Merge branch 'bug/market-fit-none' into dev 2017-05-06 13:11:26 -04:00
blitzmann
184c46dbce Merge branch 'bug/unicode-skill-export' into dev 2017-05-06 13:11:07 -04:00
blitzmann
b2ae6913d7 Merge branch 'qol/self-projection' into dev 2017-05-06 13:10:48 -04:00
blitzmann
703d6dbc85 Merge branch 'feature/grant-needed-skills' into dev 2017-05-06 13:09:30 -04:00
blitzmann
2e6066e848 Merge branch 'feature/tabbed-fits' into dev 2017-05-06 13:08:52 -04:00
blitzmann
f751eff1cf Fix some styling issues on linux 2017-05-06 12:57:20 -04:00
blitzmann
d342e66db4 Merge branch 'feature/sec-status-change' into dev
Add ability to change characters sec status
2017-05-06 12:23:40 -04:00
blitzmann
1222567a4f Merge branch 'feature/allow-restrictions' into dev.
Allows user to turn off most fitting restrictions (#1117)
2017-05-06 12:11:00 -04:00
blitzmann
1f7858f853 Merge branch 'bug/resist-effects' (also includes current work on sisi branch).
This fixes the ewar resists (and possibly implements remote repair impedance, not tested)
2017-05-06 12:04:10 -04:00
blitzmann
283cb1e50c Add hard requirement for requests (for everything except mac-deprecated) 2017-05-04 21:48:30 -04:00
blitzmann
c2880c0175 Move queue and wait variables to __init__.
Turns out threading.start() returns before the thread actually starts, so there were situations in which we would start the thread and immediately try to use it before run() happened.
2017-05-04 19:27:54 -04:00
blitzmann
3d0a4b84d4 Add hard minimum requirement for logbook 0.10.0, remove requirements.txt loop as it isn't applicable for 95% of users, and Linux users are complaining about seeing console output all the time on dev 2017-05-03 20:53:10 -04:00
blitzmann
622efb624d Refactor how remote resistance works. We now check the resistance ID directly from the effect, and fall back to the remoteResistanceID attribute. See #1139 2017-05-02 22:19:58 -04:00