Mirroring/coriolis
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis.git synced 2025-12-10 07:05:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
William Blythe
2018-12-31 08:19:07 +11:00
parent 544e5acaef 593f069806
commit 2457c30b94
10 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.esdoc.json
View File

@@ -35,7 +35,7 @@
"title": "Coriolis", "title": "Coriolis",
"description": "Coriolis Shipyard for Elite Dangerous", "description": "Coriolis Shipyard for Elite Dangerous",
"repository": "https://github.com/EDCD/coriolis", "repository": "https://github.com/EDCD/coriolis",
"site": "https://coriolis.edcd.io", "site": "https://coriolis.io",
"author": "https://github.com/edcd", "author": "https://github.com/edcd",
"image": "./src/images/logo/192x192.png" "image": "./src/images/logo/192x192.png"
} }
@@ -81,7 +81,7 @@
"title": "Coriolis", "title": "Coriolis",
"description": "Coriolis Shipyard for Elite Dangerous", "description": "Coriolis Shipyard for Elite Dangerous",
"repository": "https://github.com/EDCD/coriolis", "repository": "https://github.com/EDCD/coriolis",
"site": "https://coriolis.edcd.io", "site": "https://coriolis.io",
"author": "https://github.com/edcd", "author": "https://github.com/edcd",
"image": "./src/images/logo/192x192.png" "image": "./src/images/logo/192x192.png"
} }

2
package.json
View File

@@ -5,7 +5,7 @@
"type": "git", "type": "git",
"url": "https://github.com/EDCD/coriolis" "url": "https://github.com/EDCD/coriolis"
}, },
"homepage": "https://coriolis.edcd.io", "homepage": "https://coriolis.io",
"bugs": "https://github.com/EDCD/coriolis/issues", "bugs": "https://github.com/EDCD/coriolis/issues",
"private": true, "private": true,
"engine": "node >= 4.8.1", "engine": "node >= 4.8.1",

1
src/app/i18n/en.json
View File

@@ -238,6 +238,7 @@
"rof": "Rate of fire", "rof": "Rate of fire",
"angle": "Scan angle", "angle": "Scan angle",
"scanrate": "Scan rate", "scanrate": "Scan rate",
"proberadius": "Probe Radius",
"scantime": "Scan time", "scantime": "Scan time",
"shield": "Shield", "shield": "Shield",
"armour": "Armour", "armour": "Armour",

7
src/app/pages/Page.jsx
View File

@@ -70,6 +70,13 @@ export default class Page extends React.Component {
document.title = this.state.title || 'Coriolis'; document.title = this.state.title || 'Coriolis';
} }
/**
* Update the window title upon mount
*/
componentDidMount() {
document.title = this.state.title || 'Coriolis';
}
/** /**
* Updates the title upon change * Updates the title upon change
* @param {Object} newProps Incoming properties * @param {Object} newProps Incoming properties

4
src/app/shipyard/Serializer.js
View File

@@ -85,12 +85,12 @@ export function toDetailedBuild(buildName, ship) {
code = ship.toString(); code = ship.toString();
let data = { let data = {
$schema: 'https://coriolis.edcd.io/schemas/ship-loadout/4.json#', $schema: 'https://coriolis.io/schemas/ship-loadout/4.json#',
name: buildName, name: buildName,
ship: ship.name, ship: ship.name,
references: [{ references: [{
name: 'Coriolis.io', name: 'Coriolis.io',
url: 'https://coriolis.edcd.io' + outfitURL(ship.id, code, buildName), url: 'https://coriolis.io' + outfitURL(ship.id, code, buildName),
code, code,
shipId: ship.id shipId: ship.id
}], }],

3
src/app/shipyard/StatsFormatting.js
View File

@@ -78,5 +78,6 @@ export const STATS_FORMATTING = {
'thermres': { 'format': 'pct' }, 'thermres': { 'format': 'pct' },
'wepcap': { 'format': 'round1', 'unit': 'MJ' }, 'wepcap': { 'format': 'round1', 'unit': 'MJ' },
'weprate': { 'format': 'round1', 'unit': 'MW' }, 'weprate': { 'format': 'round1', 'unit': 'MW' },
'jumpboost': { 'format': 'round1', 'unit': 'LY' } 'jumpboost': { 'format': 'round1', 'unit': 'LY' },
'proberadius': { 'format': 'pct1', 'unit': 'pct' },
}; };

2
src/schemas/ship-loadout/1.json
View File

@@ -1,6 +1,6 @@
{ {
"$schema": "http://json-schema.org/draft-04/schema#", "$schema": "http://json-schema.org/draft-04/schema#",
"id": "https://coriolis.edcd.io/schemas/ship-loadout/1.json#", "id": "https://coriolis.io/schemas/ship-loadout/1.json#",
"title": "Ship Loadout", "title": "Ship Loadout",
"type": "object", "type": "object",
"description": "The details for a specific ship build/loadout. DEPRECATED in favor of Version 3", "description": "The details for a specific ship build/loadout. DEPRECATED in favor of Version 3",

2
src/schemas/ship-loadout/2.json
View File

@@ -1,6 +1,6 @@
{ {
"$schema": "http://json-schema.org/draft-04/schema#", "$schema": "http://json-schema.org/draft-04/schema#",
"id": "https://coriolis.edcd.io/schemas/ship-loadout/2.json#", "id": "https://coriolis.io/schemas/ship-loadout/2.json#",
"title": "Ship Loadout", "title": "Ship Loadout",
"type": "object", "type": "object",
"description": "The details for a specific ship build/loadout. DEPRECATED in favor of Version 3", "description": "The details for a specific ship build/loadout. DEPRECATED in favor of Version 3",

2
src/schemas/ship-loadout/3.json
View File

@@ -1,6 +1,6 @@
{ {
"$schema": "http://json-schema.org/draft-04/schema#", "$schema": "http://json-schema.org/draft-04/schema#",
"id": "https://coriolis.edcd.io/schemas/ship-loadout/3.json#", "id": "https://coriolis.io/schemas/ship-loadout/3.json#",
"title": "Ship Loadout", "title": "Ship Loadout",
"type": "object", "type": "object",
"description": "The details for a specific ship build/loadout", "description": "The details for a specific ship build/loadout",

2
src/schemas/ship-loadout/4.json
View File

@@ -1,6 +1,6 @@
{ {
"$schema": "http://json-schema.org/draft-04/schema#", "$schema": "http://json-schema.org/draft-04/schema#",
"id": "https://coriolis.edcd.io/schemas/ship-loadout/4.json#", "id": "https://coriolis.io/schemas/ship-loadout/4.json#",
"title": "Ship Loadout", "title": "Ship Loadout",
"type": "object", "type": "object",
"description": "The details for a specific ship build/loadout", "description": "The details for a specific ship build/loadout",