Ryan Holmes
|
82c5ae1fe9
|
some clean up
|
2019-03-09 20:43:40 -05:00 |
|
Ryan Holmes
|
5c2df66335
|
#1867 Fix for the image list crash on linux
|
2019-03-09 20:38:58 -05:00 |
|
blitzmann
|
c9b0322c9f
|
Merge branch 'tonycoz-colour-item-list'
|
2019-03-02 17:35:37 -05:00 |
|
blitzmann
|
114d72e23f
|
Fix bug for when updating preferences before loading anything into ItemView
|
2019-03-02 17:35:30 -05:00 |
|
blitzmann
|
f8e6474b39
|
Some slight tweaks to work done by @tonycoz for #1839
|
2019-03-02 17:21:46 -05:00 |
|
Ryan Holmes
|
8d0c2c18d2
|
Merge branch 'master' into colour-item-list
|
2019-03-02 15:27:54 -05:00 |
|
Ryan Holmes
|
dddec72f13
|
Merge pull request #1813 from pyfa-org/attrGroup
Attribute grouping
|
2019-03-02 15:25:11 -05:00 |
|
Ryan Holmes
|
9cfbaf3450
|
Merge branch 'req_updates' into origin_master
|
2019-03-02 14:53:48 -05:00 |
|
Ryan Holmes
|
9fc16cb287
|
more updates
|
2019-03-02 14:31:16 -05:00 |
|
Ryan Holmes
|
78836add28
|
update requirements
|
2019-03-02 14:21:13 -05:00 |
|
Ryan Holmes
|
f919e23360
|
There's some times when self.httpd doesn't exist for some reason. Too lazy to find out the cause
|
2019-03-02 11:43:21 -05:00 |
|
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 |
|
Tony Cook
|
9bdb4ea967
|
move the item slot colours to config and use it from there
|
2019-03-01 19:52:02 +11:00 |
|
Tony Cook
|
af17a4f1c9
|
make slot a property for item and use that for the item list bg
|
2019-03-01 19:51:30 +11:00 |
|
Tony Cook
|
2ea3394845
|
make the item list colour per slot if colorFitBySlot set
attempts to resolve #1839
|
2019-03-01 19:51:30 +11: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
|
bfaad631bc
|
Fix crash in linux for attribute groupings
|
2019-02-28 20:24:07 -05:00 |
|
blitzmann
|
96a5bf7ea9
|
update eve.db
|
2019-02-28 18:52:41 -05:00 |
|
blitzmann
|
e665161dc8
|
Merge remote-tracking branch 'origin/master' into attrGroup
# Conflicts:
# eve.db
|
2019-02-28 18:51:52 -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 |
|