third-party-mirrors/EDDN
1
0
Fork 0
mirror of https://github.com/EDCD/EDDN.git synced 2025-04-25 12:42:14 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
287 Commits 9 Branches 12 Tags
Commit Graph

287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AnthorNet
8fa93fbb40 Bump Version 2016-09-23 10:11:25 +02:00
AnthorNet
18626d1975 Merge pull request #50 from jamesremuscat/pr/49 
Pr/49
 2016-09-23 10:09:08 +02:00
AnthorNet
d68fd2caa8 Merge remote-tracking branch 'refs/remotes/origin/master' into pr/49 
# Conflicts:
#	src/eddn/conf/Settings.py
 2016-09-23 10:08:02 +02:00
AnthorNet
fff6a35d3e Merge pull request #48 from Marginal/journal 
Schema for Journal entries
 2016-09-20 09:01:32 +02:00
Jonathan Harris
e82e968834 Activate blackmarket schema 2016-09-15 17:37:40 +01:00
Jonathan Harris
e496d8822c New schema for blackmarket info 2016-09-15 17:37:40 +01:00
Jonathan Harris
335ec09331 Add mandatory "StarSystem" property. 2016-09-07 13:51:25 +01:00
Jonathan Harris
66b078d344 Activate journal schema 2016-08-28 13:08:44 +01:00
Jonathan Harris
76b99fad29 New schema for journal entries 2016-08-28 13:07:53 +01:00
AnthorNet
bff39d1fb1 Update Version.py 2016-08-17 15:33:11 +02:00
AnthorNet
cd5b985d97 Merge pull request #47 from Marginal/schema-cleanup 
Schema rationalisation
 2016-08-16 10:36:13 +02:00
Jonathan Harris
c96add2396 Activate new schemas 2016-08-02 02:24:50 +01:00
Jonathan Harris
8719225a4c New schema for commodities 
Report commodities using FDev Companion API names instead of English
names.

Report additional useful info from the Companion API:
- meanPrice
- statusFlags
- additional stockBracket and demandBracket values
 2016-08-02 02:24:50 +01:00
Jonathan Harris
eb7f3b1b4f Simplified new schemas for outfitting and shipyard 
Report modules and ships using FDev symbolic names instead of English
names, classes and ratings.
 2016-08-02 02:24:50 +01:00
Jonathan Harris
e605d24331 Revert "Merge pull request #42 from Marginal/IDs" 
This reverts commit afa3e08c92c42b34aa4afcdf1fcf66d3be754c81, reversing
changes made to cb3546517ef9309579eddf67cb3f8fb4c5ca7f13.
 2016-08-01 17:49:23 +01:00
AnthorNet
9bdd571bc2 Close #43 2016-05-31 16:46:58 +02:00
AnthorNet
afa3e08c92 Merge pull request #42 from Marginal/IDs 
Add FDev IDs - two proposals
 2016-05-31 16:40:57 +02:00
James Muscat
cb3546517e Merge pull request #41 from Marginal/master 
Make gatewayTimestamp strictly conformant.
 2016-01-26 10:35:39 +00:00
Jonathan Harris
608050eed4 Document standard string values and IDs. 2016-01-23 03:51:47 +00:00
Jonathan Harris
a14f92b2e8 Alternative proposal. 2016-01-22 18:49:59 +00:00
Jonathan Harris
172dfd1913 Add optional FDev IDs to schemas. 2016-01-22 17:25:49 +00:00
Jonathan Harris
a925155547 Make gatewayTimestamp strictly conformant. 
http://json-schema.org/latest/json-schema-validation.html#anchor108
RCF3339: http://tools.ietf.org/html/rfc3339#section-5.6
 2016-01-22 17:11:54 +00:00
AnthorNet
81894ae0a7 Added ping to monitor 2016-01-18 15:04:57 +01:00
AnthorNet
7cc1e74130 Fix zmq.green not handling zmq.RCVTIMEO in python 2.7 examples 2016-01-07 14:03:37 +01:00
AnthorNet
6e7b6b8b96 Bump version v0.6.2 2015-12-21 16:25:29 +01:00
AnthorNet
fa0897b985 Fix H class in outfittings schema 2015-12-21 16:24:44 +01:00
AnthorNet
04321747e9 Removed Commodity v1 projection from EDDN Status 2015-12-21 16:23:13 +01:00
AnthorNet
09779528fe Fix status page when EDDN receive no message... 2015-12-16 15:14:14 +01:00
AnthorNet
5eebf820b0 Merge branch 'master' of https://github.com/jamesremuscat/EDDN into jamesremuscat/master v0.6.1 2015-12-05 12:41:15 +01:00
AnthorNet
cacd56b0c2 Bump version 2015-12-05 12:36:29 +01:00
AnthorNet
be184cc476 Merge pull request #37 from Marginal/utf8 
Handle non-ASCII characters in messages, e.g. in the uploaderID field.
 2015-12-05 12:16:23 +01:00
AnthorNet
086849a249 Merge pull request #36 from Marginal/master 
Add E:D 1.5 ships.
 2015-12-05 12:15:38 +01:00
Jonathan Harris
a70edab1a2 Handle non-ASCII characters in messages, i.e. in the uploaderID field. 2015-12-05 04:39:32 +00:00
Jonathan Harris
857c28bbb2 Add Asp Scout. 2015-12-02 18:32:54 +00:00
Jonathan Harris
bd6eef4153 Restore E:D 1.4 ships. 2015-12-02 18:31:06 +00:00
Jonathan Harris
8f7fb3966c Add E:D 1.5 ships. 2015-12-02 18:22:39 +00:00
AnthorNet
331efbfdaa Merge branch 'master' of https://github.com/jamesremuscat/EDDN into jamesremuscat/master v0.6 2015-10-07 06:27:38 +02:00
AnthorNet
fe502da6f8 Tag release 2015-10-07 06:17:31 +02:00
AnthorNet
ef279e7a4c Merge pull request #33 from Marginal/1.4 
Add E:D 1.4 ships.
 2015-09-23 08:09:56 +02:00
Jonathan Harris
c5bf949ca6 Add E:D 1.4 ships. 2015-09-01 19:03:02 +01:00
AnthorNet
b3bab38381 PIP8 compat 2015-08-25 07:42:11 +02:00
AnthorNet
97f3aef07d Merge pull request #32 from Marginal/master 
Deploy outfitting schema
 2015-08-25 07:26:08 +02:00
Jonathan Harris
ae75b5cf6d Deploy outfitting schema. 2015-07-22 18:46:36 +01:00
Jonathan Harris
f82814231c Merge branch 'master' of github.com:jamesremuscat/EDDN 2015-07-22 18:33:47 +01:00
AnthorNet
4b9e2f411e Merge pull request #22 from Marginal/master 
Suggestion for proposal #20
 2015-07-21 11:28:11 +02:00
James Muscat
ab64b8c830 Delete unused import / organise imports. v0.5 2015-07-06 17:03:48 +01:00
James Muscat
802633d3ef Bind gateway to localhost by default (e.g. and then proxy via nginx) 2015-07-06 16:10:29 +01:00
James Muscat
b0ec0de6ca Remove dead code. 2015-07-02 15:37:58 +01:00
James Muscat
103846d42a Don't share state between StatsCollector instances! Fixes #30. 2015-07-02 15:31:04 +01:00
James Muscat
99871b8631 Increase wait to 61 seconds just in case. 2015-07-02 11:14:17 +01:00