blitzmann
|
7956ca0409
|
Merge remote-tracking branch 'origin/master' into test-3
# Conflicts:
# config.py
|
2018-03-04 16:47:08 -05:00 |
|
Ryan Holmes
|
5b27d0559f
|
Merge pull request #1464 from pyfa-org/release/v1.35.2
Bump version
|
2018-03-04 16:44:28 -05:00 |
|
blitzmann
|
85157fdf85
|
Bump version
|
2018-03-04 16:44:00 -05:00 |
|
blitzmann
|
caf8e7f2d6
|
Test something on mac
|
2018-03-03 17:40:40 -05:00 |
|
blitzmann
|
124bb027ab
|
Use bs4.UnicodeDammit to handle different encodings for file imports (fits only for now, can look into expanding for other file import types)
|
2018-03-03 14:21:55 -05:00 |
|
blitzmann
|
d5ca14ca52
|
Remove encoding checks for eft import (#1459)
|
2018-03-03 00:50:56 -05:00 |
|
blitzmann
|
99982aa547
|
Merge branch 'master' into test-3
|
2018-03-02 00:17:54 -05:00 |
|
blitzmann
|
3f4493c0ea
|
Another fix for #1403
|
2018-03-02 00:17:33 -05:00 |
|
blitzmann
|
cdb604b29f
|
Merge remote-tracking branch 'origin/py3' into test-3
|
2018-03-01 23:42:29 -05:00 |
|
blitzmann
|
d3b8cebc8a
|
Merge branch 'master' into test-3
|
2018-03-01 23:42:22 -05:00 |
|
Ryan Holmes
|
7d245660bc
|
Merge pull request #1455 from pyfa-org/issue/1451
Don't fail when trying to project a module that can't be projected.
|
2018-03-01 23:41:50 -05:00 |
|
blitzmann
|
b1e40427a3
|
Tox
|
2018-03-01 23:41:39 -05:00 |
|
blitzmann
|
73925df24b
|
Don't fail when trying to project a module that can't be projected.
|
2018-03-01 23:24:00 -05:00 |
|
Ryan Holmes
|
04fbd3b548
|
Merge pull request #1454 from Neugeniko/py3
Resolves issue #1453 with xmlparser.ParseFile(file) wanting bytes.
|
2018-03-01 20:59:08 -05:00 |
|
Neugeniko
|
d9dd94d6c3
|
Update character.py
Resolves issue #1453 with xmlparser.ParseFile(file) wanting bytes.
|
2018-03-02 12:00:11 +11:00 |
|
blitzmann
|
963353a1dc
|
Merge branch 'master' into test-3
|
2018-03-01 00:40:40 -05:00 |
|
Ryan Holmes
|
3411dcfd91
|
Merge pull request #1446 from pyfa-org/issue/1445-master
Issue/1445 master
|
2018-03-01 00:30:24 -05:00 |
|
blitzmann
|
ae6434affb
|
Fix issue with importing EVE API XML
|
2018-03-01 00:30:08 -05:00 |
|
blitzmann
|
f773e0a935
|
fix misplaced parentheses
(cherry picked from commit 2a60216a92d39bb200c26bce8573484f54a80dc5)
|
2018-03-01 00:26:52 -05:00 |
|
blitzmann
|
7ab3ad9e08
|
Don't delete and recreate skills when updating char sheet. Instead, get each individual skill and change level.
(cherry picked from commit 55c79c1bafaa9a1b159b73a72c6480f7e8d6cb6b)
|
2018-03-01 00:26:47 -05:00 |
|
blitzmann
|
3f3a82ca6c
|
Merge branch 'py3' of https://github.com/pyfa-org/Pyfa into test-3
|
2018-02-28 22:02:22 -05:00 |
|
blitzmann
|
e902cc5780
|
Add event.skip() to fit rename textCtrl focus loss
|
2018-02-28 22:00:48 -05:00 |
|
Ryan Holmes
|
fcb6952119
|
Merge pull request #1444 from Neugeniko/py3
Ensure graph frame unbinds its event handlers.
|
2018-02-27 21:09:10 -05:00 |
|
Neugeniko
|
3eecd57979
|
Update graphFrame.py
|
2018-02-28 03:17:37 +11:00 |
|
blitzmann
|
6e73b9fefd
|
Tox
|
2018-02-27 00:52:15 -05:00 |
|
blitzmann
|
f0b0285f77
|
Merge branch 'development' of https://github.com/pyfa-org/Pyfa into development
|
2018-02-27 00:46:10 -05:00 |
|
blitzmann
|
e706a015b3
|
Merge branch 'issue/1397' into development
|
2018-02-27 00:45:53 -05:00 |
|
blitzmann
|
a804f9a1ad
|
Fix working on missing skills context menu (#1412)
(cherry picked from commit 96c13c344a)
|
2018-02-27 00:45:46 -05:00 |
|
blitzmann
|
9e1b7dbb87
|
Add ability to drag a module from fitting window to projected pane
|
2018-02-27 00:44:42 -05:00 |
|
blitzmann
|
551ffe9ed3
|
Quick fix for #1430
|
2018-02-27 00:23:29 -05:00 |
|
blitzmann
|
cbe1ce5bcd
|
Merge branch 'master' into test-3
|
2018-02-27 00:16:45 -05:00 |
|
Ryan Holmes
|
917afd5067
|
Merge pull request #1441 from pyfa-org/issue/1440
Convert sec status to float on character import (#1440)
|
2018-02-27 00:15:59 -05:00 |
|
blitzmann
|
c3fb9231a4
|
Convert sec status to float on character import (#1440)
|
2018-02-27 00:15:20 -05:00 |
|
blitzmann
|
2ed2f8e262
|
Fix issue with losing wrapper for FittingView when closing
|
2018-02-25 12:04:57 -05:00 |
|
blitzmann
|
390d90ac47
|
Merge branch 'issue/1434' into test-3 (#1434)
# Conflicts:
# gui/builtinViews/fittingView.py
|
2018-02-25 01:57:36 -05:00 |
|
blitzmann
|
4c877e7a5a
|
re-enable the tab preview
|
2018-02-25 01:45:43 -05:00 |
|
blitzmann
|
972fe433f7
|
remove vestigial file
|
2018-02-25 00:11:13 -05:00 |
|
blitzmann
|
ecaf6f96a9
|
guage: respect animation setting (#1434)
|
2018-02-25 00:10:17 -05:00 |
|
Ryan Holmes
|
8541e2a869
|
Merge pull request #1438 from pyfa-org/issue/1433
DNA export should respect Export Charges setting
|
2018-02-24 23:50:21 -05:00 |
|
blitzmann
|
48a2963472
|
Merge branch 'issue/1433' into test-3
|
2018-02-24 23:40:26 -05:00 |
|
blitzmann
|
f245a02372
|
DNA export should respect Export Charges setting
|
2018-02-24 23:37:53 -05:00 |
|
blitzmann
|
1c16343b46
|
Merge branch 'master' into test-3
|
2018-02-24 22:24:16 -05:00 |
|
Ryan Holmes
|
d0f66f2d16
|
Merge pull request #1437 from pyfa-org/issue/1432
Always open imports in a new tab (#1432)
|
2018-02-24 22:23:13 -05:00 |
|
blitzmann
|
df0c6ed269
|
Merge branch 'bug/amount-modal' into test-3
|
2018-02-24 22:21:02 -05:00 |
|
Ryan Holmes
|
9a4e26a5be
|
Merge pull request #1436 from pyfa-org/bug/amount-modal
Handle getting value for Change Amount differently for projected fits (#1435)
|
2018-02-24 22:20:51 -05:00 |
|
blitzmann
|
2b87f91279
|
tox fix
|
2018-02-24 22:20:24 -05:00 |
|
blitzmann
|
9b48b61b9b
|
Merge branch 'bug/amount-modal' into test-3
|
2018-02-24 22:17:22 -05:00 |
|
blitzmann
|
57e67b3699
|
Handle getting value for Change Amount differently for projected fits
|
2018-02-24 22:17:04 -05:00 |
|
blitzmann
|
15e60c3d24
|
Always open imports in a new tab (#1432)
|
2018-02-24 21:11:53 -05:00 |
|
blitzmann
|
ebf07db6c6
|
Partial fix for #1430
|
2018-02-24 19:01:54 -05:00 |
|