Skip to content

Commit

Permalink
Merge pull request #26 from NUWCDIVNPT/phase-1-dev
Browse files Browse the repository at this point in the history
Increment beta release
  • Loading branch information
csmig authored Oct 26, 2020
2 parents 2e78ed8 + 6e0016b commit 5191f90
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion api/source/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "stig-management-api",
"version": "1.0.0",
"version": "1.0.0-beta.1",
"description": "An API for managing evaluations of Security Technical Implementation Guide (STIG) assessments.",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion api/source/specification/stig-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ info:
contact:
name: Carl Smigielski
email: carl.a.smigielski@saic.com
version: 1.0.0
version: 1.0.0-beta.1
servers:
- url: 'http://localhost:54000/api'
paths:
Expand Down
2 changes: 1 addition & 1 deletion api/source/utils/config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
let config = {
version: '1.0.0-beta',
version: '1.0.0-beta.1',
commit: {
branch: process.env.COMMIT_BRANCH || 'na',
sha: process.env.COMMIT_SHA || 'na',
Expand Down
3 changes: 3 additions & 0 deletions clients/extjs/css/stigman.css
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ body {
color:#000000;
word-wrap: break-word;
}
.sm-home-widget-text a {
color: #000000;
}
.sm-home-widget-header-1 {
padding-top:10px;
padding-left:20px;
Expand Down
2 changes: 1 addition & 1 deletion clients/extjs/js/Env.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Ext.ns('STIGMAN')

STIGMAN.Env = {
version: '1.0.0-beta',
version: '1.0.0-beta.1',
apiBase: "/api" || "../api",
commit: {
branch: "" || "na",
Expand Down
2 changes: 1 addition & 1 deletion clients/extjs/js/Env.js.template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Ext.ns('STIGMAN')

STIGMAN.Env = {
version: '1.0.0-beta',
version: '1.0.0-beta.1',
apiBase: "${STIGMAN_CLIENT_API_BASE}" || "../api",
commit: {
branch: "${COMMIT_BRANCH}" || "na",
Expand Down
6 changes: 2 additions & 4 deletions clients/extjs/js/SM/MainPanel.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,10 @@ SM.DocWidget = Ext.extend(Ext.Panel, {
`<div class=sm-home-widget-header>`,
`<div class='sm-home-widget-title'>Documentation</div>`,
`</div>`,
`<div class='sm-home-widget-subtitle'>Introduction</div>`,
`<div class='sm-home-widget-subtitle'>Project Home</div>`,
`<div class='sm-home-widget-text'>What is <a target="_blank" href="https://github.com/NUWCDIVNPT/stig-manager#stig-manager">STIG Manager OSS</a>?</div>`,
`<div class='sm-home-widget-subtitle'>Wiki</div>`,
`<div class='sm-home-widget-text'>Visit our <a target="_blank" href="https://github.com/NUWCDIVNPT/stig-manager/wiki">wiki</a>, a work in progress!</div>`,
`<div class='sm-home-widget-subtitle'>User Guide</div>`,
`<div class='sm-home-widget-text'>Check out our User Guide <a target="_blank" href="https://github.com/NUWCDIVNPT/stig-manager/tree/phase-1-dev/docs">on GitHub</a></div>`,
`<div class='sm-home-widget-text'>Visit our <a target="_blank" href="https://nuwcdivnpt.github.io/stig-manager">User Guide</a> on GitHub Pages</div>`,
`<div class='sm-home-widget-subtitle'>Issues and Contributions</div>`,
`<div class='sm-home-widget-text'>Want to help out? <a target="_blank" href="https://github.com/NUWCDIVNPT/stig-manager/blob/phase-1-dev/CONTRIBUTING.md">Check out our Contribution Guide</a></div>`,

Expand Down
8 changes: 4 additions & 4 deletions docs/Release_Notes.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Release Notes


## Releases

### 1.0.0-beta
This is the initial beta release of STIG Manager

### STIG Manager OSS 1.0.1

### STIG Manager OSS 1.0.0-beta
### 1.0.0-beta.1
Numerous enhancements and bug fixes, including token handling and better concurrency. The project is ready for non-production deployments and pilots to demonstrate suitability for first production release.

0 comments on commit 5191f90

Please sign in to comment.