From 2af57ffe657b339784582eca4be67e0be56692f0 Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Mon, 19 Sep 2016 16:34:40 -0400 Subject: [PATCH 01/14] fix(styling): Added wordwrap to Notifications #624 --- app/styles/_notification.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/styles/_notification.scss b/app/styles/_notification.scss index aee4876..9fab530 100644 --- a/app/styles/_notification.scss +++ b/app/styles/_notification.scss @@ -17,6 +17,7 @@ .UserNotification { padding: 15px; color: $gray-light; + word-wrap: break-word; .btn { margin: 5px 5px 0 0; From 5164b55d270ee5b274219224e82eef6b91f4c439 Mon Sep 17 00:00:00 2001 From: Manny Rivera Date: Wed, 21 Sep 2016 15:13:59 -0400 Subject: [PATCH 02/14] release-1.1.19 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f73b6b4..f4442f8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ozp-react-commons", - "version": "1.1.18", + "version": "1.1.19", "description": "React.js and Reflux.js components which are shared by the center-ui and hud-ui projects.", "scripts": { "test": "./node_modules/karma/bin/karma start" From 28f73016092a47cce4f33126a52fffca7e2259c9 Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Wed, 28 Sep 2016 14:13:13 -0400 Subject: [PATCH 03/14] fix(reviews) : Changed variable name and text to reflect that reviews are not to be above FOUO #686 --- app/js/constants/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/js/constants/messages.js b/app/js/constants/messages.js index e24dbda..934420c 100644 --- a/app/js/constants/messages.js +++ b/app/js/constants/messages.js @@ -122,5 +122,5 @@ var listingMessages = { module.exports = { listingMessages: listingMessages, - systemHigh: 'Data entered must NOT be above System High!' + reviewWarningMessage: 'Data entered must NOT be above FOUO' }; From 1054c1a071dde4f57815f0fc81c8990c3d8ce3a0 Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Fri, 30 Sep 2016 13:55:46 -0400 Subject: [PATCH 04/14] enhance(tags): Increase tag length to 30 lines center #719 --- app/js/constants/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/js/constants/messages.js b/app/js/constants/messages.js index 934420c..c78c206 100644 --- a/app/js/constants/messages.js +++ b/app/js/constants/messages.js @@ -104,7 +104,7 @@ var listingMessages = { 'help.agencyShort': 'Associated organization is required.', 'help.screenshots': 'At least one screenshot is required. Each screenshot requires two images, a preview and a full-size screenshot.', 'help.owners': 'At least one owner is required.', - 'help.tags': 'May contain letters, numbers or symbols and must be 16 characters long or less.', + 'help.tags': 'May contain letters, numbers or symbols and must be 30 characters long or less.', 'help.launchUrl': 'Must be a valid URL.', 'help.categories': 'At least one is required.', 'help.contacts.name': 'May contain letters, numbers or symbols and must be 100 characters long or less.', From 01fc70b48ee9c390fb1f41946c47838645959b27 Mon Sep 17 00:00:00 2001 From: Manny Rivera Date: Wed, 5 Oct 2016 15:00:38 -0400 Subject: [PATCH 05/14] release-1.1.20 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f4442f8..50ac1fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ozp-react-commons", - "version": "1.1.19", + "version": "1.1.20", "description": "React.js and Reflux.js components which are shared by the center-ui and hud-ui projects.", "scripts": { "test": "./node_modules/karma/bin/karma start" From def3f63494ad4b1952805191d9022d6d7d30355c Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Thu, 20 Oct 2016 14:00:26 -0400 Subject: [PATCH 06/14] enhancement(privateListings): updated apps language according to ticket #722 --- app/js/constants/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/js/constants/messages.js b/app/js/constants/messages.js index c78c206..8bf5a1a 100644 --- a/app/js/constants/messages.js +++ b/app/js/constants/messages.js @@ -66,7 +66,7 @@ var listingMessages = { 'description.featuredBannerIconMarking': markingDescription, 'description.versionName': 'Numerical identification of which release version is being submitted.', 'description.launchUrl': 'URL where this listing can be reached by users.', - 'description.isPrivate': 'By default, web applications/widgets are visible to all organizations using the platform. If this listing is set to private (only visible to your organization), justification for private use must be included in the Usage Requirements field. A Center Steward will contact you if the justification is not acceptable.', + 'description.isPrivate': 'By default, web applications/widgets are visible to all Agencies using Apps Mall. If this listing is set to private (only visible to your Agency), justification for private use must be included in the Usage Requirements field. A Content Steward will contact you if the justification is not acceptable.', 'description.requirements': 'Details about what system, security, or other requirements must be met in order to use this listing. If none apply, write "None."', 'description.whatIsNew': 'Description of what is new or different in this latest version.', 'description.agencyShort': 'Organization overseeing this listing.', From eac54d049df597a839043f5f9179ee900d54a4c5 Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Thu, 20 Oct 2016 15:10:56 -0400 Subject: [PATCH 07/14] enhancement(privateListings): updated capitalization #722 --- app/js/constants/messages.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/js/constants/messages.js b/app/js/constants/messages.js index 8bf5a1a..04c43e8 100644 --- a/app/js/constants/messages.js +++ b/app/js/constants/messages.js @@ -66,7 +66,7 @@ var listingMessages = { 'description.featuredBannerIconMarking': markingDescription, 'description.versionName': 'Numerical identification of which release version is being submitted.', 'description.launchUrl': 'URL where this listing can be reached by users.', - 'description.isPrivate': 'By default, web applications/widgets are visible to all Agencies using Apps Mall. If this listing is set to private (only visible to your Agency), justification for private use must be included in the Usage Requirements field. A Content Steward will contact you if the justification is not acceptable.', + 'description.isPrivate': 'By default, web applications/widgets are visible to all agencies using Apps Mall. If this listing is set to private (only visible to your agency), justification for private use must be included in the Usage Requirements field. A Content Steward will contact you if the justification is not acceptable.', 'description.requirements': 'Details about what system, security, or other requirements must be met in order to use this listing. If none apply, write "None."', 'description.whatIsNew': 'Description of what is new or different in this latest version.', 'description.agencyShort': 'Organization overseeing this listing.', @@ -78,7 +78,7 @@ var listingMessages = { 'description.contacts.organization': ' Organization associated with the individual, position, or group being contacted.', 'description.contacts.name': 'Name of the individual, position, or group being contacted.', 'description.contacts.type': 'What would a user contact this individual or group of people for?', - 'description.screenshots.largeImage': 'Must be at least 960px wide x 600px tall.', + 'description.screenshots.largeImage': 'Must be at least 960px wide xs 600px tall.', 'description.screenshots.largeImageMarking': markingDescription, 'description.screenshots.smallImage': 'Must be at least 600px wide x 376px tall.', 'description.screenshots.smallImageMarking': markingDescription, From 15e77989378ef53ad095917727238e17f22ba047 Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Thu, 20 Oct 2016 15:17:31 -0400 Subject: [PATCH 08/14] enhancement(privateListings): corrected typo #722 --- app/js/constants/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/js/constants/messages.js b/app/js/constants/messages.js index 04c43e8..b2471c8 100644 --- a/app/js/constants/messages.js +++ b/app/js/constants/messages.js @@ -78,7 +78,7 @@ var listingMessages = { 'description.contacts.organization': ' Organization associated with the individual, position, or group being contacted.', 'description.contacts.name': 'Name of the individual, position, or group being contacted.', 'description.contacts.type': 'What would a user contact this individual or group of people for?', - 'description.screenshots.largeImage': 'Must be at least 960px wide xs 600px tall.', + 'description.screenshots.largeImage': 'Must be at least 960px wide x 600px tall.', 'description.screenshots.largeImageMarking': markingDescription, 'description.screenshots.smallImage': 'Must be at least 600px wide x 376px tall.', 'description.screenshots.smallImageMarking': markingDescription, From e8cd30e020d1f728fcbdb34fe14a29775f3f5354 Mon Sep 17 00:00:00 2001 From: Manny Rivera Date: Thu, 20 Oct 2016 15:28:24 -0400 Subject: [PATCH 09/14] release-1.1.21 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 50ac1fe..770771f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ozp-react-commons", - "version": "1.1.20", + "version": "1.1.21", "description": "React.js and Reflux.js components which are shared by the center-ui and hud-ui projects.", "scripts": { "test": "./node_modules/karma/bin/karma start" From 44b519ba8155fc043f2a246ec7405db256421bfd Mon Sep 17 00:00:00 2001 From: Robert Hutzel Date: Tue, 1 Nov 2016 13:46:30 -0400 Subject: [PATCH 10/14] Default URL updated. Minor version upgrade to 1.2.0. --- app/OzoneConfig.js | 6 +++--- package.json | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/OzoneConfig.js b/app/OzoneConfig.js index 8b4f6d6..5d326d2 100644 --- a/app/OzoneConfig.js +++ b/app/OzoneConfig.js @@ -13,7 +13,7 @@ window.OzoneConfig = { "API_URL": '/* @echo API_URL */', // @endif // @ifndef API_URL - "API_URL": 'https://localhost:8443/marketplace', + "API_URL": 'http://localhost:4440', // @endif // @ifdef HELP_URL "HELP_URL": '/* @echo HELP_URL */', @@ -43,7 +43,7 @@ window.OzoneConfig = { "CENTER_URL": '/* @echo CENTER_URL */', // @endif // @ifndef CENTER_URL - "CENTER_URL": "http://localhost:8000/dist", + "CENTER_URL": "http://localhost:8000", // @endif // @ifdef CENTER_REVIEWS_CHAR_LIMIT "CENTER_REVIEWS_CHAR_LIMIT": '/* @echo CENTER_REVIEWS_CHAR_LIMIT */', @@ -55,7 +55,7 @@ window.OzoneConfig = { "HUD_URL": '/* @echo HUD_URL */', // @endif // @ifndef HUD_URL - "HUD_URL": "http://localhost:8088/dist", + "HUD_URL": "http://localhost:8088", // @endif // @ifdef WEBTOP_URL "WEBTOP_URL": '/* @echo WEBTOP_URL */', diff --git a/package.json b/package.json index 770771f..9ebf0d9 100644 --- a/package.json +++ b/package.json @@ -1,22 +1,22 @@ { "name": "ozp-react-commons", - "version": "1.1.21", + "version": "1.2.0", "description": "React.js and Reflux.js components which are shared by the center-ui and hud-ui projects.", "scripts": { "test": "./node_modules/karma/bin/karma start" }, "repository": { "type": "git", - "url": "https://github.com/ozone-development/ozp-react-commons.git" + "url": "http://dev1.vistronix.com:9080/ozp/ozp-react-commons.git" }, "author": "", "license": "Apache-2.0", "bugs": { "url": "https://www.owfgoss.org/jira/browse/OZF" }, - "homepage": "https://github.com/ozone-development/ozp-react-commons", + "homepage": "http://dev1.vistronix.com:9080/ozp/ozp-react-commons", "dependencies": { - "bootstrap-sass": "git://github.com/ozone-development/bootstrap-sass#master", + "bootstrap-sass": "git://github.com/aml-development/ozp-bootstrap-sass#master", "es5-shim": "^4.0.6", "humps": "git://github.com/domchristie/humps.git", "jquery": "^2.1.1", From 7807292fab23e253c07d1b64bc486ec547974bc0 Mon Sep 17 00:00:00 2001 From: Robert Hutzel Date: Tue, 1 Nov 2016 14:44:50 -0400 Subject: [PATCH 11/14] Default URLs updated. Minor version upgrade to 1.2.1. --- app/OzoneConfig.js | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/OzoneConfig.js b/app/OzoneConfig.js index 5d326d2..8cea59d 100644 --- a/app/OzoneConfig.js +++ b/app/OzoneConfig.js @@ -43,7 +43,7 @@ window.OzoneConfig = { "CENTER_URL": '/* @echo CENTER_URL */', // @endif // @ifndef CENTER_URL - "CENTER_URL": "http://localhost:8000", + "CENTER_URL": "http://localhost:8000/", // @endif // @ifdef CENTER_REVIEWS_CHAR_LIMIT "CENTER_REVIEWS_CHAR_LIMIT": '/* @echo CENTER_REVIEWS_CHAR_LIMIT */', @@ -55,7 +55,7 @@ window.OzoneConfig = { "HUD_URL": '/* @echo HUD_URL */', // @endif // @ifndef HUD_URL - "HUD_URL": "http://localhost:8088", + "HUD_URL": "http://localhost:8088/", // @endif // @ifdef WEBTOP_URL "WEBTOP_URL": '/* @echo WEBTOP_URL */', diff --git a/package.json b/package.json index 9ebf0d9..142b076 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ozp-react-commons", - "version": "1.2.0", + "version": "1.2.1", "description": "React.js and Reflux.js components which are shared by the center-ui and hud-ui projects.", "scripts": { "test": "./node_modules/karma/bin/karma start" From 4c1c2c5df79f1b72acf603f54998856d084133f6 Mon Sep 17 00:00:00 2001 From: Charles Labas Date: Fri, 2 Dec 2016 10:12:10 -0500 Subject: [PATCH 12/14] OZP-70: Added SYSTEM_HIGH_CLASSIFICATION and default value --- app/OzoneConfig.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/OzoneConfig.js b/app/OzoneConfig.js index 8cea59d..31c2701 100644 --- a/app/OzoneConfig.js +++ b/app/OzoneConfig.js @@ -63,6 +63,9 @@ window.OzoneConfig = { // @ifndef WEBTOP_URL "WEBTOP_URL": "http://localhost:9000/", // @endif + // @ifdef SYSTEM_HIGH_CLASSIFICATION + "SYSTEM_HIGH_CLASSIFICATION": "U", + // @endif // @ifdef IE_REDIRECT_URL "IE_REDIRECT_URL": '/* @echo IE_REDIRECT_URL */', // @endif From 72aedc75e887bdf109db460631b333c60e8f0d62 Mon Sep 17 00:00:00 2001 From: clabas Date: Fri, 2 Dec 2016 10:36:19 -0500 Subject: [PATCH 13/14] OZP-70: Fixed default value declaration for system high classification --- app/OzoneConfig.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/OzoneConfig.js b/app/OzoneConfig.js index 31c2701..6831f5c 100644 --- a/app/OzoneConfig.js +++ b/app/OzoneConfig.js @@ -64,6 +64,9 @@ window.OzoneConfig = { "WEBTOP_URL": "http://localhost:9000/", // @endif // @ifdef SYSTEM_HIGH_CLASSIFICATION + "SYSTEM_HIGH_CLASSIFICATION": '/* @echo SYSTEM_HIGH_CLASSIFICATION */', + // @endif + // @ifndef SYSTEM_HIGH_CLASSIFICATION "SYSTEM_HIGH_CLASSIFICATION": "U", // @endif // @ifdef IE_REDIRECT_URL From 4f974b8bfb2be45d0dc9ee350c605a3d0769b573 Mon Sep 17 00:00:00 2001 From: clabas Date: Mon, 19 Dec 2016 11:42:47 -0500 Subject: [PATCH 14/14] Fixed gir URLs --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 142b076..69b0e38 100644 --- a/package.json +++ b/package.json @@ -7,16 +7,16 @@ }, "repository": { "type": "git", - "url": "http://dev1.vistronix.com:9080/ozp/ozp-react-commons.git" + "url": "https://www.github.com/ozoneplatform/ozp-react-commons.git" }, "author": "", "license": "Apache-2.0", "bugs": { "url": "https://www.owfgoss.org/jira/browse/OZF" }, - "homepage": "http://dev1.vistronix.com:9080/ozp/ozp-react-commons", + "homepage": "https://www.github.com/ozoneplatform/ozp-react-commons", "dependencies": { - "bootstrap-sass": "git://github.com/aml-development/ozp-bootstrap-sass#master", + "bootstrap-sass": "git://github.com/ozoneplatform/ozp-bootstrap-sass#master", "es5-shim": "^4.0.6", "humps": "git://github.com/domchristie/humps.git", "jquery": "^2.1.1",