Commit Graph
1586 Commits
Author SHA1 Message Date
Athanasius 173733cc44 Merge branch 'stable' into develop 2020-07-14 11:43:30 +01:00
Athanasius 6f004e6df7 Merge pull request #602 from EDCD/release-4.0.1.0
Release 4.0.1.0
2020-07-14 11:36:40 +01:00
Athanasius 87530e32b1 edmarketconnector.xml: 4.0.1.0 Release/4.0.1.0 2020-07-14 11:34:26 +01:00
Athanasius 07b6002775 Release 4.0.1.0 appversion and ChangeLog.md 2020-07-14 11:27:55 +01:00
Athanasius ec32849a17 plugins/eddb: Fallback to system_name if no system_address
* Cleans up imports.
* Fixes some '<tab># ...' to use 2 spaces.
* Add type hints to system_url().
* Always store, even if not current provider: this.{system_address,
  station_marketid,system_population}
2020-07-13 22:12:29 +01:00
Athanasius f3e25f0340 EDDB system URL: Don't pick up system_address from CAPI at all 2020-07-13 21:03:57 +01:00
Athanasius 0d045d54f4 docs/Releasing.md: re-structure and clarifications.
I'd been deviating slightly from what it said, so I've updated to what I
now actually do.
2020-07-13 17:46:57 +01:00
Athanasius f95e55d3d4 Contributing.md: beta can lag behind main/stable/develop 2020-07-13 13:40:34 +01:00
Athanasius 6a890188bc Contributing.md: master is deprecated, use main. 2020-07-13 13:38:12 +01:00
Athanasius 7e888f5924 Add Changelog.md to distributed files. Release/4.0.0.0 2020-07-13 12:30:48 +01:00
Athanasius 6184a9cc32 edmarketconnector.xml: Update for Windows 4.0.0.0 2020-07-13 12:20:45 +01:00
Athanasius a0c1221446 Increase version to 4.0.0.0 2020-07-13 12:09:05 +01:00
Athanasius 42f2fa4ed1 ChangeLog: Additions for 4.0.0.0
* Removed old 3.99.5.0 header.
* Correct *all* URLs referencing 'master' branch to 'main'.
* Add note for developers to check Contributing.md.
2020-07-13 12:08:46 +01:00
Athanasius ea0d6471d2 Contributing.md: Fix 'contentions' typo 2020-07-13 12:04:44 +01:00
Athanasius 0a3c574137 ChangeLog: Initial 4.0.0.0 text
This has amalgamated the 3.99.X.0 changelogs into one.

Still need to check if anything else needs adding.
2020-07-13 11:59:57 +01:00
Athanasius 8d0cd8c9dc PLUGINS.md: Change header to 'Developer Plugin Documentation' 2020-07-13 11:59:10 +01:00
Athanasius b9b22edf5d Update translations
Minor st-Latn-BA changes.
2020-07-13 11:45:39 +01:00
Athanasius 7d0bd6e4bc Removes py2exe from requirements.txt
We specify version and where to get it in docs/Releasing.md, and it's
not "pip install"-able, so don't cause errors with this.
2020-07-13 10:53:12 +01:00
Athanasius dec2f3d041 theme not them 2020-07-12 23:15:47 +01:00
Athanasius f96b00f8ef Merge pull request #574 from A-UNDERSCORE-D/enhancement/cleanup-edshipyard
cleanup edshipyard
2020-07-12 20:50:25 +01:00
Athanasius 04090842d7 Add a few more allowed plugin imports in docs
* L10n
* theme.theme
* plug allows for flags.
* monitor.gamerunning()
2020-07-12 19:54:23 +01:00
Athanasius e473493509 Merge pull request #593 from EDCD/issue/545-plugin-api-doc
Issue/545 plugin api doc
2020-07-12 19:27:17 +01:00
Athanasius 71bb14a737 Document allowed imports for PLUGINS
* List added in 'Available imports' section of PLUGINS.md
* Various *.py files now have comments about things being allowed for
 plugin import.
2020-07-12 19:25:47 +01:00
Athanasius 63f5db3785 plugins/inara.py makes no use of import companion
So remove it.
2020-07-12 19:24:16 +01:00
Athanasius c25120e0aa plugins/edsm.py makes no use of import companion
So remove it.
2020-07-12 19:10:57 +01:00
Athanasius 2bd6e4cb1c PLUGINS.md: Flesh out plugin API docs
* Note in monitor.py to update the docs if anything changed about the
 'state' dictionary.
* Expand on arguments to all plugin call-ins.
* Particularly what the 'state' diction passed to journal_entry()
 contains.
* The contents of the `data` dictionary passed to `cmdr_data()`.
2020-07-12 18:10:16 +01:00
Athanasius 37c00d31ee General text re-flow to make subsequent changes more obvious.
Also fixed formatting of some of the embedded code.
2020-07-12 16:25:20 +01:00
Athanasius ae62bec63d Remove extraneous 'e '
*shakes fist at PyCharm*
2020-07-12 16:07:19 +01:00
Athanasius 690b8b0da3 Use 'main' branch for 'migrate plugins' URL 2020-07-12 15:59:40 +01:00
Athanasius 6910696172 Merge pull request #591 from EDCD/feature/589-sort-plugins-for-load
sort internal plugins before loading
2020-07-12 15:51:50 +01:00
Athanasius 076eab9e22 sort internal plugins before loading
This is already done for 'found' plugins, so let's avoid any potnetial
future surprise with the internal ones as well.

close #589
2020-07-12 15:50:49 +01:00
Athanasius 624f2a7907 Changelog and version bump for 3.99.5.0 Release/3.99.5.0 2020-07-11 21:03:48 +01:00
Athanasius c78d9241df Merge pull request #573 from A-UNDERSCORE-D/fix/477-inara-cargo-slow-update
Fixed updating inara cargo only on major events
2020-07-11 20:04:17 +01:00
A_D f43141202b Removed debug print 2020-07-11 20:55:18 +02:00
A_D 061fbddb2d Fixed wording of comment on last_update_time 2020-07-11 20:53:48 +02:00
A_D 9b82464f88 Fixed updating inara cargo only on major events
This works by checking on _any_ event the status of the cargo vs the
current stored version. If the live cargo differs from the updated
cargo, _and_ we have not sent any update in the past 45 seconds (as this
would have contained the cargo anyway), we queue an actual send to the
API.

This unfortunately isn't checked only when docked, but on the plus side
miners will be happy to have their cargo updated relatively often.

Fixes #477. Possibly not quite what they wanted, but its about as close
as this will get
2020-07-11 20:53:47 +02:00
Athanasius 96f7457ae3 Merge pull request #587 from EDCD/fix/586-EDDB-system-links
Fix/586 eddb system links
2020-07-11 19:48:19 +01:00
Athanasius 317a0f6b63 EDDB is default station provider, do station_marketid as needed
We need a better way to do provider defaults.  Heck, settings defaults period.
Let's assume we'll put in place a "standard" config file once we move to one.
2020-07-11 19:47:30 +01:00
Athanasius 6932fdc883 EDDB: Use CAPI for system_address/station_marketid only if not already set
See issue #586 - a user had incorrect system_address set, but only sometimes.

This could possibly be due to CAPI errors/lag, so only use it as the source
when the values aren't yet set.  Otherwise Journal should always have provided
the correct value in a timely manner.
2020-07-11 18:57:04 +01:00
A_D 1928379571 Removed broken link, fixed interpolation key name
Broken link didn't appear to add any further information as per
discussion in PR
2020-07-10 23:44:56 +02:00
Athanasius 0282d0c6ba Version 3.99.4.0
* config.appversion increased.
* Changelog updated.
Release/3.99.4.0
2020-07-10 12:52:36 +01:00
Athanasius ec9533d092 Updated translations: pl, pt-BR 2020-07-10 12:50:12 +01:00
Athanasius 1fd35bb119 Change URL branch 'develop' to 'main' in docs 2020-07-10 11:15:26 +01:00
Athanasius d4706a053e We now use 'main' instead of 'master' in place of 'develop'
After 4.0.0.0 we need to not have 'develop' as default branch, so change it
now, and migrate to 'main' instead of 'master' whilst we're at it.
2020-07-10 11:07:45 +01:00
Athanasius fb6e4b1d38 Merge pull request #578 from EDCD/issue/576-Remove-all-BPC-code
Remove last traces of 'BPC' output code
2020-07-10 10:26:08 +01:00
Athanasius 65086be1cd Remove last traces of 'BPC' output code
close #576
2020-07-10 10:25:08 +01:00
Athanasius accc361d54 Merge pull request #577 from EDCD/fix/575-Remove-old-anonymous
Remove all use of defunct 'anonymous' option
2020-07-10 08:40:29 +01:00
Athanasius ef3306e3f5 Remove all use of defunct 'anonymous' option
The UI for setting the 'anonymous' option was removed in
f17f5d3f25 ("PKCE OAuth2 access to cAPI").
Since then there's been no way for a user to set, or unset, this option
(and the associated custom uploaderID).  However anyone with the registry keys
still set would have had them take effect.

This commit removes the last bits of code that were making use of it.

Note that the EDDN Relay anonymises all uploaderID values, so no listener
has been seeing the 'raw' values for a long time now.

close #575
2020-07-10 08:36:13 +01:00
A_D c4abe6b3ca Replaced missed modulo formatting 2020-07-10 06:01:47 +02:00
A_D a6e6b6353d Tidied regexp
Python regexps should always be held in r'' or raw strings, ensuring
that python doesn't try to expand the regexp escapes.

I also removed the escaped -, as they're only special characters in
character groups
2020-07-10 06:01:47 +02:00