Commit Graph

6474 Commits

Author SHA1 Message Date
Ryan Holmes
ec3822a6da Develop dialog and keep SSO server running as long as dialog remains active (#1859) 2019-03-02 11:00:28 -05:00
Ryan Holmes
65dff8dcf7 Scroll the window back to 0, 0 when children are removed (#1843) 2019-02-28 21:41:59 -05:00
Ryan Holmes
75d5b48df8 Merge branch 'master' of https://github.com/pyfa-org/Pyfa 2019-02-27 11:28:46 -05:00
Ryan Holmes
8c8e7825e9 fix typo 2019-02-27 11:28:38 -05:00
DarkPhoenix
f68ee81634 Change stats window size for gtk 2019-02-25 09:26:35 +03:00
blitzmann
1fcd95d36f Merge branch 'WatchMeCalculate-issue-1845' 2019-02-24 17:59:12 -05:00
blitzmann
4dc70dad3b Apply CTRL+Backspace fix for fitting Notes text box 2019-02-24 17:58:55 -05:00
blitzmann
e0a54c14e2 Merge branch 'issue-1845' of git://github.com/WatchMeCalculate/Pyfa into WatchMeCalculate-issue-1845 2019-02-24 17:49:42 -05:00
DarkPhoenix
5d0900337f Change how we split lines during fit import, also re-use split lines where needed to avoid format-specific linebreak bugs 2019-02-22 11:24:43 +03:00
Jonah Jolley
a5a9dc0877 Adding support for ctrl+backspace in searchbars 2019-02-21 18:18:01 -07:00
Anton Vorobyov
0dfe6707a7 Merge pull request #1856 from WatchMeCalculate/issue-1835
Mac Osx clipboard can store items with \r, ensure we split on newline or carriage return
2019-02-21 14:23:44 +03:00
Anton Vorobyov
0471cda64e Merge pull request #1847 from pyfa-org/fit_export_options
Multibuy export options
2019-02-21 12:28:20 +03:00
DarkPhoenix
b2bcdf0a46 Replace old export option format with new one when needed 2019-02-21 12:16:36 +03:00
DarkPhoenix
cf9d2082ef Fix codacy issues 2019-02-21 10:44:37 +03:00
DarkPhoenix
032b1589ad Merge branch 'master' into fit_export_options 2019-02-21 10:39:50 +03:00
Jonah Jolley
410c87ed89 Mac Osx clipboard can store items with \r, ensure we split on newline or carriage return 2019-02-20 21:08:58 -07:00
DarkPhoenix
fbce3536da Fix battery cap resistance sliders 2019-02-21 01:54:41 +03:00
DarkPhoenix
509849fbf5 Fix EHE issue 2019-02-19 13:12:18 +03:00
DarkPhoenix
55f2ebf4a4 Merge branch 'master' into fit_export_options 2019-02-18 13:10:00 +03:00
Ryan Holmes
e96a836ad0 fix travis file 2019-02-17 19:08:33 -05:00
Ryan Holmes
2a224e8882 Merge pull request #1853 from blitzmann/CIUpdates
CI updates
2019-02-17 16:19:16 -05:00
Ryan Holmes
0a00d86c6d Merge branch 'master' into CIUpdates 2019-02-17 16:18:01 -05:00
Ryan Holmes
c3d1eaef2a Merge pull request #1851 from MaruMaruOO/master
Adds Mutadaptive Remote Armor Repairers to EFS exports.
2019-02-17 16:16:17 -05:00
Ryan Holmes
93f23b549b Merge branch 'master' into master 2019-02-17 16:16:09 -05:00
Ryan Holmes
b3d0554df6 Merge remote-tracking branch 'origin/master' into blitzmann_CIUpdates
# Conflicts:
#	dist_assets/mac/pyfa.spec
2019-02-17 15:52:57 -05:00
blitzmann
dba54e3ec8 test 2019-02-17 15:27:08 -05:00
DarkPhoenix
09421db28e Update effects after database update 2019-02-17 01:05:09 +03:00
DarkPhoenix
941edd6715 Update database 2019-02-16 22:39:08 +03:00
DarkPhoenix
fdac5309ac Modify db generation script to find same/better replacements for all items 2019-02-16 22:26:42 +03:00
DarkPhoenix
449c7d6aa2 Add two more columns to gamedata to hold info about better items 2019-02-16 14:06:23 +03:00
MaruMaruOO
b60b190b81 Merge branch 'master' of https://github.com/pyfa-org/Pyfa 2019-02-14 01:24:07 -05:00
MaruMaruOO
3cb8313669 Add Mutadaptive Remote Armor Repairers to EFS export. 2019-02-14 01:23:59 -05:00
DarkPhoenix
ba29376464 Merge branch 'master' into fit_export_options 2019-02-13 18:52:10 +03:00
DarkPhoenix
436113dedc Set price object status on successful fetches 2019-02-13 18:51:44 +03:00
DarkPhoenix
9dc0ec67d4 Merge branch 'master' into fit_export_options 2019-02-13 18:19:03 +03:00
DarkPhoenix
194ebb96a7 Add ruler between base item info and mutation stats 2019-02-13 18:18:38 +03:00
DarkPhoenix
fc04a32913 Add info about base item to mutations tab 2019-02-13 18:14:46 +03:00
DarkPhoenix
deee6fd6ab Make GTK window even bigger by default, and hide description type if there's no description for the item 2019-02-13 17:31:45 +03:00
DarkPhoenix
a4fae73a1e Make "fill with module" context menu entry disablable via preferences 2019-02-13 17:12:21 +03:00
DarkPhoenix
7bad3bc376 Show 'market group' context menu for mutated items as well 2019-02-13 17:07:06 +03:00
DarkPhoenix
7dd1c63898 Return 0 price even if price has not been fetched 2019-02-13 16:19:01 +03:00
DarkPhoenix
c8eea45454 Merge branch 'master' into fit_export_options 2019-02-13 15:57:06 +03:00
DarkPhoenix
3ed949395e Flush prices rather than commit, it takes much less time and still satisfies our needs 2019-02-13 15:56:15 +03:00
DarkPhoenix
6ebc90b8aa Remove flush as it's part of commit according to sqlalchemy docs 2019-02-13 15:30:08 +03:00
DarkPhoenix
7769179104 Merge branch 'master' into fit_export_options 2019-02-13 14:03:56 +03:00
DarkPhoenix
cbd1a34c68 Round cpu/pg like EVE does
To work around some fits where pyfa shows that items do not fit when they actually do
2019-02-13 13:14:18 +03:00
DarkPhoenix
e0c389a643 Do not show (!) for fetches which will always fail (e.g. abyssal mods). Also restore commit as it was a threat synchornization mechanism 2019-02-13 13:07:54 +03:00
DarkPhoenix
6a27ae7525 Merge branch 'master' into fit_export_options 2019-02-13 00:56:05 +03:00
DarkPhoenix
591dcffa43 Do not try to fetch price for items which contain no market group according to CCP data 2019-02-13 00:54:56 +03:00
DarkPhoenix
b0317ea560 Fix mistype 2019-02-12 19:07:59 +03:00