blitzmann
|
f94fbd740a
|
Merge branch 'bug/amount-modal' into test-3
# Conflicts:
# gui/builtinContextMenus/amount.py
|
2018-02-24 02:55:40 -05:00 |
|
blitzmann
|
1da12cb18e
|
tox fix
|
2018-02-24 02:54:23 -05:00 |
|
blitzmann
|
e0cddcd061
|
Redesign amount modal, basing style off wx.TextEntryDialog (but not a wx.TextEntryDialog, because there are possibilities to do a few different things in this modal)
|
2018-02-24 02:47:13 -05:00 |
|
blitzmann
|
73d59569ff
|
Merge remote-tracking branch 'origin/master' into test-3
# Conflicts:
# gui/characterEditor.py
|
2018-02-23 23:28:33 -05:00 |
|
blitzmann
|
e85d144928
|
Migrate the Save Character As dialog tot he same dialog / validator as the Edit Character Name (#1419)
|
2018-02-23 23:25:11 -05:00 |
|
blitzmann
|
96c13c344a
|
Fix working on missing skills context menu (#1412)
|
2018-02-23 01:15:57 -05:00 |
|
blitzmann
|
8f42822d9e
|
Add roman package as a requirement, and remove the roman module from pyfa
|
2018-02-23 01:04:31 -05:00 |
|
blitzmann
|
c5ba79cfbb
|
Merge branch 'master' into test-3
# Conflicts:
# .gitignore
|
2018-02-23 01:02:51 -05:00 |
|
Ryan Holmes
|
3a23d820cc
|
Merge branch 'master' into acceptRomanNumerals
|
2018-02-23 01:01:07 -05:00 |
|
blitzmann
|
c917d22db5
|
tox fixes for the roman library to prevent travis from yelling at us
|
2018-02-23 01:00:43 -05:00 |
|
blitzmann
|
c3f8b102fa
|
Add the romans library to pyfa itself to avoid having to modify the binaries
|
2018-02-23 00:57:26 -05:00 |
|
blitzmann
|
5e566db47d
|
Fix attribute override export / import (#1420)
|
2018-02-23 00:36:52 -05:00 |
|
blitzmann
|
dd78a41171
|
Fix HTML export (more encoding stuff). Also fix old bug in which unicode fit names don't display correctly in the webbrowser. #1411
|
2018-02-23 00:13:14 -05:00 |
|
blitzmann
|
8abd25fe40
|
Use a scolled window in preference pages
|
2018-02-19 23:32:44 -05:00 |
|
blitzmann
|
d59c897921
|
Fix image list in preferences dialog
|
2018-02-19 01:20:57 -05:00 |
|
blitzmann
|
42ccc53166
|
bit of clean up for reload setting
|
2018-02-18 20:35:46 -05:00 |
|
blitzmann
|
35ad21da38
|
Add pattern for commit hashes to update dialog
|
2018-02-17 16:27:12 -05:00 |
|
blitzmann
|
5571bae8b2
|
Fix situation in which event propagation was not working properly for structures
|
2018-02-17 12:47:07 -05:00 |
|
blitzmann
|
8b2cfe44f2
|
Merge remote-tracking branch 'origin/master' into test-3
# Conflicts:
# config.py
# eos/saveddata/fighter.py
|
2018-02-17 12:31:58 -05:00 |
|
blitzmann
|
12a526fa9e
|
Fix for some standup fighter errors
|
2018-02-17 11:59:51 -05:00 |
|
blitzmann
|
82e3db1ffb
|
Centralize version string getting. Still trying to work out how we should handle automatic version increments so we don't have to modify files all the time. Remove version file from repo (should only be a thing when building binaries)
|
2018-02-17 11:10:42 -05:00 |
|
BlueShanks
|
bd0fcbef3a
|
Fixed style issues which were throwing errors
The code was failing an automatic test because of style issues, which are hopefully fixed now
|
2018-02-17 18:26:00 +10:00 |
|
blitzmann
|
0456cb2f96
|
Merge remote-tracking branch 'origin/master' into test-3
|
2018-02-16 22:26:10 -05:00 |
|
blitzmann
|
cafd92f169
|
add a todo
|
2018-02-16 22:26:02 -05:00 |
|
blitzmann
|
05f08970c9
|
fix character editor not spawning on OSX
|
2018-02-16 20:40:51 -05:00 |
|
blitzmann
|
636ee1de23
|
Get new Standup fighters working
|
2018-02-15 22:26:42 -05:00 |
|
BlueShanks
|
c5c673e360
|
moved a line back to where it was
results in a net smaller diff
|
2018-02-16 00:46:51 +10:00 |
|
BlueShanks
|
5cd21da7b1
|
Character Editor: accept skill plans in Roman numerals too
|
2018-02-16 00:19:56 +10:00 |
|
blitzmann
|
da0f89ef91
|
Merge commit 'refs/tags/v1.35.0^{}' into test-3
|
2018-02-14 22:25:45 -05:00 |
|
blitzmann
|
89b6e8f8c3
|
fix tox stuff
|
2018-02-14 22:15:48 -05:00 |
|
blitzmann
|
c6e715aa5c
|
Merge branch 'master' into test-3
|
2018-02-14 22:07:33 -05:00 |
|
blitzmann
|
649ba9f3e4
|
Merge branch 'master' into singularity
|
2018-02-14 21:31:54 -05:00 |
|
blitzmann
|
ed649dd4c7
|
Merge branch 'test-3' into esi
|
2018-02-11 23:23:30 -05:00 |
|
blitzmann
|
33618f12f7
|
Fix issue when error happens before wx is even initialized traceback is never set
|
2018-02-11 23:22:37 -05:00 |
|
blitzmann
|
33eccaa374
|
Merge branch 'test-3' into esi
# Conflicts:
# requirements.txt
|
2018-02-11 23:17:50 -05:00 |
|
blitzmann
|
5f0ce58c29
|
Merge branch 'master' into test-3
# Conflicts:
# gui/builtinShipBrowser/fitItem.py
# service/port.py
|
2018-02-11 21:29:17 -05:00 |
|
blitzmann
|
d94d49f0a9
|
Add misc column to booster panel, and show booster duration
|
2018-02-10 20:45:26 -05:00 |
|
blitzmann
|
0f30ea554d
|
Fix for #1377 - group up support fighters and modify the bonus based on amount active
|
2018-02-10 14:14:31 -05:00 |
|
blitzmann
|
50dd74dbe8
|
Add packaging requirement, and use it's PEP 440 version parsing for version comparisons.
|
2018-02-10 00:59:25 -05:00 |
|
blitzmann
|
7b0f672f04
|
Get encrypted refresh tokens working
|
2018-02-09 18:25:53 -05:00 |
|
blitzmann
|
33bf5234d0
|
Goodbye eveapi! You have served us well all these years!
Start stripping XML API stuff and implement ESI skill fetching.
|
2018-02-09 00:42:59 -05:00 |
|
blitzmann
|
cb392e7e5f
|
Rename a few things
|
2018-02-08 01:52:38 -05:00 |
|
blitzmann
|
dfba033190
|
Implement posting fit to EVE server
|
2018-02-08 01:50:52 -05:00 |
|
blitzmann
|
5fbe623ae6
|
get fit deletion working. Need to be aware that we are still using cached fit listing...
|
2018-02-08 01:38:24 -05:00 |
|
blitzmann
|
e025bff99b
|
Get ESI fitting import working completely. Use a file cache for EsiApp to prevent long startup times (possibly cache for about a week or so, and start in background if it needs to be gotten again?)
|
2018-02-08 01:24:40 -05:00 |
|
blitzmann
|
e77dddc15b
|
More work on getting fittings form a character via ESI. It's starting to be come a pain working with this client with having to background it until it initializes. Thinking about rolling my own, considering we only need a few calls and not a whole package.
|
2018-02-07 02:07:42 -05:00 |
|
blitzmann
|
eea8019593
|
Get fitting browser to show up with proper characters (still not functional). Start testing ways to store the esipy app on the service (it can take a few seconds to initialize due to network calls)
|
2018-02-07 01:21:22 -05:00 |
|
blitzmann
|
c7360c8cc3
|
Get logging into EVE working and SSO characters saving, along with client hashes being stored alongside characters.
|
2018-02-07 00:44:37 -05:00 |
|
blitzmann
|
2d7eed4aac
|
Fix for #1355 - we were not properly deleting the fit from the list being passed into the Import event (which the history functionality piggy backs on). This also fixes the same bug with the import list.
|
2018-02-06 00:36:57 -05:00 |
|
blitzmann
|
2376148380
|
Start ripping CREST stuff out, add new SSOCharacter stuff in. Long process ahead.
|
2018-02-02 02:05:49 -05:00 |
|