Skip to content

Commit 43911e4

Browse files
committed
Merge branch 'develop' of https://github.com/ngageoint/mage-server into team-details-upgrade
2 parents c79524d + 83b3235 commit 43911e4

35 files changed

+4268
-8059
lines changed

instance/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @ngageoint/mage

instance/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ngageoint/mage.dev-instance",
3-
"version": "6.4.0-beta.1",
3+
"version": "6.4.0-beta.2",
44
"description": "Assemble a MAGE Server deployment from the core service, the web-app, and selected plugins. This is primarily a development tool because the dependencies point to relative directories instead of production packages. This can however serve as a starting point to create a production MAGE instance package.json.",
55
"scripts": {
66
"start": "npm run start:dev",

package-lock.json

Lines changed: 16 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@ngageoint/mage.project",
33
"description": "This is the root package definition for the mage-server monorepo.",
44
"private": true,
5-
"version": "6.4.0-beta.1",
5+
"version": "6.4.0-beta.2",
66
"files": [],
77
"scripts": {
88
"postinstall": "npm-run-all service:ci web-app:ci arcgis:ci sftp:ci",
@@ -47,7 +47,7 @@
4747
"start-web": "npm run web-app:debug"
4848
},
4949
"devDependencies": {
50+
"@types/angular-ui-router": "^1.1.44",
5051
"npm-run-all": "4.1.5"
51-
},
52-
"dependencies": {}
53-
}
52+
}
53+
}

0 commit comments

Comments
 (0)