Commit Graph

4272 Commits

Author SHA1 Message Date
Resin Neublem
cfa57a70dc Remembers user's meta filtering choices
There is a lot of logic that overwrites the user's choices of meta filtering on every search.

That's a little too clever. Especially if the user is looking for different variations of a certain meta.

If a user wants to include the other meta buttons they can re-add them after filtering.

closes: https://github.com/pyfa-org/Pyfa/issues/818
2016-11-20 16:28:18 -05:00
blitzman
2281fae615 Merge branch 'EosCodeCleanup-V2' of https://github.com/Ebag333/Pyfa into Ebag333-EosCodeCleanup-V2
Conflicts:
	eos/effects/mininginfomultiplier.py
2016-11-20 13:59:14 -05:00
Ryan Holmes
1192a0658a Merge pull request #806 from Ebag333/GitIgnore
Ignore temp files
2016-11-20 13:55:18 -05:00
blitzman
180166156a Revert mining change (#771) 2016-11-20 02:51:15 -05:00
Ryan Holmes
cf361593a4 Merge pull request #771 from Ebag333/MiningCrystalBonus
Applied Mining Crystal Bonus to modules
2016-11-20 02:00:02 -05:00
Ebag333
c0210895e9 Ignore temp files
These don't exist for long, but could catch them in a commit if you
clicked commit too quickly.
2016-11-09 07:44:24 -08:00
blitzman
6849478226 Change hyphens in fitting tooltip to unicode dashes 2016-11-06 21:51:33 -05:00
Indiction
a0ef1a3d9b change to ternary operators (less ugly) 2016-11-06 20:37:24 +01:00
Indiction
ba47420577 Bugfix: Unable to handle ships without traits (Citadels) 2016-11-06 18:47:56 +01:00
Indiction
806f17545f Moved HTML remover into ShipItem and FitItem function 2016-11-06 16:36:12 +01:00
Indiction
f0f5b4c04c Tooltip to Ships and Fittings 2016-11-06 16:14:49 +01:00
Ebag333
ad76104033 Revert "Create variables before they are referenced. "
1dc15936ed

This is a problem for us.  See #794 for more details.
2016-11-04 14:18:18 -07:00
Ryan Holmes
c6e481efcf Merge pull request #791 from IndictionEve/OpenFittingsInNewPage
open fittings in new page by default
2016-11-04 12:48:23 -04:00
Ryan Holmes
2ad0c00c17 Merge pull request #792 from ppfeufer/patch-1
fixed link to development repository
2016-11-04 12:43:19 -04:00
Peter Pfeufer
26ab7d5e6f fixed link to development repository 2016-11-04 07:18:35 +01:00
Ebag333
832e7e6637 Revert moving projectionInfo out
Need to handle this better. :/
2016-11-03 22:15:40 -07:00
Ryan Holmes
8c7972ed78 Merge pull request #784 from Ebag333/Gitignore
Include more standard exceptions to gitignore
2016-11-03 15:01:23 -04:00
Ryan Holmes
05bbc14965 Merge pull request #789 from Ebag333/BurstJammerStrengthFix
Add Burst Jammer to effects modified by Scorpion hull bonus
2016-11-03 14:59:21 -04:00
Ryan Holmes
e7feee6878 Merge pull request #759 from minlexx/feature/proxy_auth
Add login/password for proxy authorization in network settings
2016-11-03 14:58:08 -04:00
Indiction
791ddcb9a1 load fitting in selected page if ctrl-key pressed and option active 2016-10-30 01:05:22 +02:00
Indiction
12d5a21982 Option to open fittings in a new page by default 2016-10-30 00:43:23 +02:00
Ebag333
e7c79e58b4 Use in instead of or, because that makes sense 2016-10-26 10:09:43 -07:00
Ebag333
0dbdbf7cfe Add Burst Jammer to effects modified by Scorpion hull bonus 2016-10-26 08:42:49 -07:00
Ebag333
f39ca66dbf Include more standard exceptions to gitignore 2016-10-23 13:20:45 -07:00
Ryan Holmes
8d80494b8d Merge pull request #783 from Ebag333/ExportHiddenAttribs
Implement new method for exporting values
2016-10-23 14:40:38 -04:00
Ebag333
058768baab Implement new method for finding values
Original method would only export values that were attached directly to
the ship.  New method starts from the modified dict, which will export
values without attribute IDs or original values.
2016-10-23 10:44:59 -07:00
Ryan Holmes
4e1f0f9cc6 Merge pull request #779 from Ebag333/ExportButton
Add button for exports
2016-10-21 22:29:40 -04:00
Ebag333
2b1abfc9b2 No longer refresh GUI. They can click the refresh button themselves, lazy jerks. 2016-10-21 19:28:54 -07:00
Ebag333
595c139ca8 Add button for exports 2016-10-21 10:53:47 -07:00
Ebag333
928246a8ca Even more PEP8 fixes!
Also, create a variable so we can't reference it and have it not exist.
Because that would be bad.
2016-10-19 14:26:46 -07:00
Ebag333
fd3e0bbebf Formatting and spacing 2016-10-19 14:14:34 -07:00
Ebag333
2a0a572b76 PEP8 formatting! \o/ 2016-10-19 14:03:31 -07:00
Ebag333
a314cd7cfd Revert adding the __init___ 2016-10-19 13:33:25 -07:00
Ebag333
cd28375019 Put some imports back. Prooooobably not needed but vOv 2016-10-19 13:32:57 -07:00
Ebag333
7cf4134a73 SQLAlchemy doesns't like is, requires ==
Oops.
2016-10-19 13:32:35 -07:00
Ebag333
44c76f0b98 Even more PEP8 cleanup 2016-10-19 12:29:33 -07:00
Ebag333
69a122a271 more PEP8 cleanup 2016-10-19 12:26:03 -07:00
Ebag333
0c0eb327f7 lots of PEP8 cleanup 2016-10-19 12:25:31 -07:00
Ebag333
74ce79ba8f Add inspection exception to ignore reassignment of self 2016-10-19 12:11:30 -07:00
Ebag333
1dc15936ed Create variables before they are referenced.
Resolves attribute reference validation errors in pyCharm
2016-10-19 12:08:35 -07:00
Ebag333
126fa7be29 remove trailing semicolon 2016-10-19 11:51:12 -07:00
Ebag333
d61251e9b3 Reformatting eos (root) 2016-10-19 11:46:26 -07:00
Ebag333
f9f53a13c0 Reformatting eos.saveddata 2016-10-19 11:42:45 -07:00
Ebag333
b4360d44f1 Reformatting eos.graph 2016-10-19 11:38:43 -07:00
Ebag333
574d575cad Reformatting eos.db 2016-10-19 11:37:28 -07:00
Ebag333
5e10339c20 Reformatting eos.db.saveddata 2016-10-19 11:33:29 -07:00
Ebag333
feb83cf737 Revert "Revert "Reformatting eos.db.gamedata""
This reverts commit 0ff4aec400.
2016-10-19 11:26:40 -07:00
Ebag333
0ff4aec400 Revert "Reformatting eos.db.gamedata"
This reverts commit e2944f6be7.
2016-10-19 11:24:03 -07:00
Ebag333
e2944f6be7 Reformatting eos.db.gamedata 2016-10-19 11:19:24 -07:00
Ebag333
3e842f30f1 Reformatting all effect files for readability and better PEP8 compliance 2016-10-19 11:16:32 -07:00