1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-19 02:17:38 +03:00

2354 Commits

Author SHA1 Message Date
Athanasius
cabf7289cb
Merge pull request #794 from EDCD/fix/actions-windows-build-name
Add name to windows build action
2020-12-08 17:42:27 +00:00
A_D
bd74aaf0aa
Add name to windows build action
This should make it show up with a more sane name
2020-12-08 19:36:26 +02:00
Athanasius
7737766a58
Merge pull request #792 from A-UNDERSCORE-D/actions/only-msi
Remove Appcast generation, only upload msi installer
2020-12-08 16:55:16 +00:00
A_D
3a0da6dadc
Added missing newline 2020-12-08 18:53:23 +02:00
A_D
033a3bb4da
Removed appcast, only upload msi installer 2020-12-08 18:51:00 +02:00
Athanasius
85a1a8efce
Merge pull request #789 from A-UNDERSCORE-D/github-actions-build
Build automatically with github actions
2020-12-08 16:40:24 +00:00
A_D
87afa69f53
Removed py2exe setup 2020-12-08 18:37:33 +02:00
A_D
fa3335d59a
Added windows build 2020-12-08 18:37:32 +02:00
Athanasius
ec93dec8a7
Merge pull request #791 from EDCD/enhancement/main-for-4.1.5
Cherry-pick in some key commits for upcoming 4.1.5
2020-12-08 16:33:01 +00:00
Athanasius
5cc4a6e80b EDMarketConnector: Add detailed logging to shutdown sequence 2020-12-08 16:14:06 +00:00
Athanasius
3ff9bdcc88 Fix Python 3.8 syntax use in backport to 4.1.x/Python 3.7 2020-12-08 16:08:30 +00:00
Athanasius
2b60220365 EDMarketConnector: popup for "already running"
* This also refactors code around so that isort and flake8 are happy
  about the module level imports.
2020-12-08 16:06:50 +00:00
A_D
d650db5a1a Added name mangling support to EDMCContextFilter
Python name mangling is more about name collisions than actually making
things private.

This commit adds a check to resolve mangled names to their runtime
names, and adds a just-in-case default to fetching the attribute.

Fixes #764
2020-12-08 15:59:40 +00:00
Athanasius
7be255b8ac Releasing: py2exe via pip / requirements-dev.txt now. 2020-12-08 15:59:28 +00:00
Athanasius
08ac054cce requirements: py2exe now available from pypi, so no need for VCS 2020-12-08 15:58:41 +00:00
Athanasius
654e062966
Merge pull request #790 from J15t98J/patch-1
Fix dead link in PLUGINS.md
2020-12-08 15:14:20 +00:00
Joshua Tyler-Jones
1c16b5fae6
Fix dead link in PLUGINS.md 2020-12-08 15:08:27 +00:00
Athanasius
f658660580
Merge pull request #783 from A-UNDERSCORE-D/fix/commodities-csv-not-updated
Fixed Void Opal name in commodities.csv
2020-12-04 15:17:44 +00:00
Athanasius
9009dc7340 Merge branch 'main' of https://github.com/EDCD/EDMarketConnector into main 2020-12-03 12:27:38 +00:00
Athanasius
412708b3d1 Issues: Bugs: Emphasise we want BOTH log files.
Also cleans up the wording, as 4.1.4 has been out months so there'll
always be the -debug log file now.
2020-12-03 12:26:50 +00:00
A_D
859572e8b6
Fixed Void Opal name 2020-12-02 17:19:27 +02:00
Athanasius
128f22941d
Merge pull request #781 from A-UNDERSCORE-D/fix/779-utf8-file-encodings
Always read journal with utf-8 in EDMC.py
2020-12-02 14:22:45 +00:00
A_D
8bb9cecfc0
Explanation comment on try/except 2020-12-02 16:08:06 +02:00
A_D
9ec03008ce
Moved comment to correct place 2020-12-02 16:03:43 +02:00
A_D
977e62188a
Made sure to handle non-utf8 locales 2020-12-02 15:57:42 +02:00
A_D
52d39dc5fd
Moved os.environ above logging import 2020-12-02 15:54:59 +02:00
Athanasius
17ed1ef1db Merge branch 'stable' into main 2020-10-15 11:57:49 +01:00
Athanasius
69c94f0515 appcast 4.1.4 Release/4.1.4 2020-10-15 11:53:06 +01:00
Athanasius
64f203517d Release 4.1.4 2020-10-15 11:49:30 +01:00
Athanasius
3724f30a53
Merge pull request #760 from EDCD/fix/755-4.1.3-not-starting
Locale: Be even more paranoid about setting UTF-8 encoding
2020-10-14 20:03:33 +01:00
Athanasius
582b981afa Locale: Be even more paranoid about setting UTF-8 encoding
* Only set if not on win32, or if we are and a known good version of
 Windows 10 (or later).
2020-10-14 19:15:48 +01:00
Athanasius
aee4114edd Bug Report Template: git/Linux version info 2020-10-09 09:50:27 +01:00
Athanasius
f3e8dbf7c1 Merge branch 'stable' into main 2020-10-08 15:40:14 +01:00
A_D
beed337c70 Create dependabot config file
Dependabot will open PRs automatically for us to update dependencies, assuming they have no breaking changes.
2020-10-08 15:39:24 +01:00
Athanasius
d7641d6858 appcast 4.1.3 Release/4.1.3 2020-10-08 15:28:35 +01:00
Athanasius
187dee5f81 Release 4.1.3 2020-10-08 15:23:47 +01:00
Athanasius
9404ebabee
Merge pull request #743 from EDCD/fix/737-lutris-wine
try/except ctypes.windll.user32.CalculatePopupWindowPosition
2020-10-08 15:13:02 +01:00
Athanasius
5effd044ac try/except ctypes.windll.user32.CalculatePopupWindowPosition
As we can't rely on the is_wine check, use an exception for this.
2020-10-08 14:55:32 +01:00
Athanasius
0091267c00 Merge branch 'stable' into main 2020-10-08 14:47:01 +01:00
Athanasius
e515c5b3e0 setup.py: Check we're running under Python 3.7.x 2020-10-08 14:20:03 +01:00
Athanasius
ec8c95b1a8 Merge branch 'fix/734-revert-gdiscaling' into main 2020-10-07 18:09:48 +01:00
Athanasius
a6b23e741d Remove gdiScaling from EDMarketConnector.manifest
* This causes dpiAware to not work.
* Without dpiAware text is blurry under UI scaling.
* The bug with wrongly sized tkinter.ttk.RadioButton elements has been
  fixed in Tcl/Tk source, but no new release made yet, so the bug
  lingers in all released Python versions.
2020-10-07 18:07:43 +01:00
Athanasius
b977e93c63 Merge branch 'releases' into stable 2020-10-07 10:26:02 +01:00
Athanasius
b87ed70edb Merge tag 'release/4.1.2' into releases
Release 4.1.2
2020-10-07 10:25:27 +01:00
Athanasius
be716cfd27 Merge branch 'stable' of https://github.com/EDCD/EDMarketConnector into stable 2020-10-07 10:18:23 +01:00
Athanasius
7c699c9552 Merge branch 'fix/edmc-boolean-oops' into release-4.1.2 Release/4.1.2 2020-10-07 10:17:58 +01:00
Athanasius
5bbeeeee32 appcast 4.1.2 2020-10-07 10:12:38 +01:00
Athanasius
42b71e8d26 Release 4.1.2 2020-10-07 10:08:40 +01:00
Athanasius
56d7730249
Merge pull request #740 from EDCD/fix/edmc-boolean-oops
EDMC: Revert accidental change of boolean logic
2020-10-07 10:01:16 +01:00
Athanasius
72119d6818 EDMC: Revert accidental change of boolean logic
not (A or B) != not A or B

Although "not A and not B" would be equivalent.
2020-10-07 09:58:51 +01:00