ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-22 03:40:46 +03:00
Code Issues Projects Releases Wiki Activity
1,513 Commits 16 Branches 276 Tags
Commit Graph

1513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Athanasius
0c6f1acd59
Merge pull request #571 from EDCD/fix/display-var-errors 
Pull X11 setup back out of function for 'dpy'.
 2020-07-09 13:07:31 +01:00
Athanasius
94a9a9b948 Pull X11 setup back out of function for 'dpy'. 
'dpy' needs to be global, and there might be other side effects.  So
just revert to this code being global.
 2020-07-09 08:32:35 +01:00
Athanasius
758b726878
Merge pull request #570 from A-UNDERSCORE-D/fix/display-var-errors 
Fix #568 with ENV var workaround
 2020-07-08 17:07:54 +01:00
A_D
be98365fb3
Fix #568 with ENV var workaround 
EDMC.py would break due to an import chain that ends up in theme. Theme
does a whole bunch of work to setup our GUI for EDMarketConnector.py,
but it does this on any import, which will fail spectacularly if there
is either no DISPLAY var set or no X11 libs available on our machine at
all (as a sidenote this means it probably also breaks on a wholly
wayland install).

This fixes the issue by adding a check for an environment variable on
import of theme. This can and WILL break if the env var is set and
EDMarketConnector.py is used, but if you do that its your own fault.
 2020-07-08 17:55:54 +02:00
Athanasius
3476956d85 Merge branch 'beta' into develop 
This brings in the 3.99.3.0 changes.
 2020-07-07 20:02:04 +01:00
Athanasius
c71e7b7286 Changelog.md: 3.99.3.0 Release/3.99.3.0 2020-07-07 19:48:55 +01:00
Athanasius
dc13a143a3 Update Swedish translation 2020-07-07 19:47:53 +01:00
Athanasius
de55ff7ce0 Increase appversion to 3.99.3.0 2020-07-07 19:43:02 +01:00
Athanasius
3ff77c3c54 EDMC.py: import re, fix version compare and report 
* I neglected to `import re` when I changed the Journal file name check.
* `map` isn't comparable in Python 3.7, need to `list()` it as well.
* Just print the full `appversion`.  The old code was assuming that none of
  A, B, C, D in A.B.C.D would be two or more digits.

close #566
 2020-07-07 19:02:06 +01:00
Athanasius
cda7d9d3f4
Merge pull request #567 from Athanasius/fix/566-cli-params 
EDMC.py: import re, fix version compare and report
 2020-07-07 19:01:18 +01:00
Athanasius
41984e86a2 EDMC.py: import re, fix version compare and report 
* I neglected to `import re` when I changed the Journal file name check.
* `map` isn't comparable in Python 3.7, need to `list()` it as well.
* Just print the full `appversion`.  The old code was assuming that none of
  A, B, C, D in A.B.C.D would be two or more digits.

close #566
 2020-07-07 19:00:06 +01:00
Athanasius
98227b7af0
Merge pull request #562 from A-UNDERSCORE-D/enhancement/cleanup 
Cleanup commodity.py (PEP8, code simplification)
 2020-07-07 14:26:41 +01:00
Athanasius
273e121736 PLUGINS.md: Installation instructions on wiki 2020-07-06 18:22:02 +01:00
Athanasius
d50d141a8e README.md: Missing ) on disclaimer 2020-07-06 18:13:56 +01:00
Athanasius
2426d9381f README.md: Update forum URLs for disclaimer. 
* The old-forum format URL didn't work, managed to find the post and
   get the current URL.
 * Added link to when Journal files were announced.
 2020-07-06 18:09:34 +01:00
Athanasius
4d96a062da README.md: Fix 'documenation' typo 2020-07-06 17:36:12 +01:00
Athanasius
344351b1fa README.md: Minor formatting edits 
* Move 'Running from source' to just after installation.
 * Consistently use '---' headings.
 * Shorten heading markdown to --- or ===
 2020-07-06 17:32:11 +01:00
A_D
76e561d231
Cleanup commodity.py (PEP8, code simplification) 
I removed most of the overly complex oneliners for equivalent multi-line
constructs. The code behaviour should remain the same.

Otherwise mostly reformatting happened here, spaces after commas, that
sort of thing.
 2020-07-06 18:30:23 +02:00
Athanasius
38bddd9bd9 README.md: Config files and different drive -> wiki 2020-07-06 17:17:33 +01:00
Athanasius
c02cd8d9cb README.md: 'Update Error' is in the wiki Troubleshooting 2020-07-06 17:16:34 +01:00
Athanasius
032614304a README.md: Plugins? Wiki! 2020-07-06 17:14:30 +01:00
Athanasius
295087946f README.md: Main blurb is in Wiki, direct there 2020-07-06 17:12:01 +01:00
Athanasius
bff215d92e README.md: Uninstall also on Wiki now 2020-07-06 16:57:41 +01:00
Athanasius
19d043a66a README.md: Remove the "new maintainer" blurb 
It's been a few weeks, anyone who was going to see it in the critical
time frame either has or hasn't now.

Leave the pointer to Discord at the top though.
 2020-07-06 16:48:08 +01:00
Athanasius
ea631949ca README.md: Running from source -> wiki, Packaging -> Releasing.md 2020-07-06 16:36:49 +01:00
Athanasius
a955612e28 PRIVACY.md: This is all on the wiki 2020-07-06 16:31:04 +01:00
Athanasius
6c598ad77f README.md: Reference Wiki for "Installation" 2020-07-06 16:25:51 +01:00
Athanasius
f3401dcdea README.md: Reference wiki for Acknowledgements 2020-07-06 16:20:32 +01:00
Athanasius
f1cb5b98fa README.md: Reference Wiki for Troubleshooting 
There's no point keeping this up to date in two places.

Part of reducing the 'wall of text' nature of this file.
 2020-07-06 16:16:34 +01:00
Athanasius
65793bce24 Contributing.md: develop is default branch, XXX- issue number optional 2020-07-06 16:05:09 +01:00
Athanasius
733047c11b Releasing.md: Release tags are Release/A.B.C.D 2020-07-06 16:04:27 +01:00
Athanasius
2f9b564f90 Merge branch 'develop' into python3 2020-07-05 20:50:29 +01:00
Athanasius
e020c24f12 Merge branch 'release-3.99.2.0' into develop Release/3.99.2.0 2020-07-05 20:12:04 +01:00
Athanasius
1a22b88d8a README.md: Thank Gurra for Swedish translation 2020-07-05 20:11:37 +01:00
Athanasius
a21809d98f Merge branch 'develop' of https://github.com/EDCD/EDMarketConnector into develop 2020-07-05 20:10:51 +01:00
Athanasius
a64671015b Merge branch 'beta' into develop 2020-07-05 20:10:36 +01:00
Athanasius
87c4139bbb Merge branch 'beta' into develop 2020-07-05 20:08:52 +01:00
Athanasius
252b1a648d
Merge pull request #558 from EDCD/release-3.99.2.0 
Release 3.99.2.0
 2020-07-05 20:07:49 +01:00
Athanasius
c4c2a84143 Merge branch 'beta' into release-3.99.2.0 2020-07-05 20:05:50 +01:00
Athanasius
719fa082a9 Changelog for 3.99.2.0 2020-07-05 20:04:41 +01:00
Athanasius
7e838953c9 Increase version to 3.99.2.0 2020-07-05 20:01:05 +01:00
Athanasius
1a8410e9a2 Update translations ready for 3.99.2.0 2020-07-05 19:58:36 +01:00
Athanasius
26da1be135 Merge branch 'issue/549-helper-scripts' into develop 2020-07-05 19:50:32 +01:00
Athanasius
085333c80b Update issue templates 2020-07-05 19:46:02 +01:00
Athanasius
1a18c2be9b Merge branch 'develop' into python3 2020-07-05 19:41:07 +01:00
Athanasius
80cf6975a8
Merge pull request #557 from EDCD/l10n/Add-Swedish 
Add Swedish Translation
 2020-07-05 19:34:56 +01:00
Athanasius
72bed8fc17 Add Swedish, sv-SE, to .wxs file for installation 2020-07-05 19:30:22 +01:00
Athanasius
58078546ac Add Swedish Translationo 
TODO: Add to installer setup so it will be in the next release.
 2020-07-05 16:21:45 +01:00
Athanasius
e21fc8f4c5 Merge branch 'develop' of https://github.com/EDCD/EDMarketConnector into develop 2020-07-05 16:16:44 +01:00
Athanasius
2de8b9b94f docs/Translations: Finalize "don't translate" phrases immediately. 2020-07-05 16:16:18 +01:00