Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2af57ff
fix(styling): Added wordwrap to Notifications #624
lsemesky Sep 19, 2016
f3e01a7
Merge pull request #66 from aml-development/624_notificationWordWrap
lsemesky Sep 21, 2016
5164b55
release-1.1.19
mannyrivera2010 Sep 21, 2016
28f7301
fix(reviews)
lsemesky Sep 28, 2016
b57cd13
Merge pull request #67 from aml-development/686_fixReviewWarningMessage
lsemesky Sep 28, 2016
1054c1a
enhance(tags): Increase tag length to 30 lines center #719
lsemesky Sep 30, 2016
87cb760
Merge pull request #68 from aml-development/719_IncreaseTagLength
lsemesky Oct 3, 2016
01fc70b
release-1.1.20
mannyrivera2010 Oct 5, 2016
def3f63
enhancement(privateListings): updated apps language according to tick…
lsemesky Oct 20, 2016
a0f90ce
Merge remote-tracking branch 'origin/master' into 722_PrivateAppsLang…
lsemesky Oct 20, 2016
eac54d0
enhancement(privateListings): updated capitalization #722
lsemesky Oct 20, 2016
15e7798
enhancement(privateListings): corrected typo #722
lsemesky Oct 20, 2016
bc9a914
Merge pull request #69 from aml-development/722_PrivateAppsLanguage
lsemesky Oct 20, 2016
e8cd30e
release-1.1.21
mannyrivera2010 Oct 20, 2016
44b519b
Default URL updated. Minor version upgrade to 1.2.0.
rhutzel Nov 1, 2016
7807292
Default URLs updated. Minor version upgrade to 1.2.1.
rhutzel Nov 1, 2016
4c1c2c5
OZP-70: Added SYSTEM_HIGH_CLASSIFICATION and default value
chazzlabs Dec 2, 2016
72aedc7
OZP-70: Fixed default value declaration for system high classification
Dec 2, 2016
4f974b8
Fixed gir URLs
Dec 19, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions app/OzoneConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 */',
Expand Down Expand Up @@ -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 */',
Expand All @@ -55,14 +55,20 @@ 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 */',
// @endif
// @ifndef WEBTOP_URL
"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
"IE_REDIRECT_URL": '/* @echo IE_REDIRECT_URL */',
// @endif
Expand Down
6 changes: 3 additions & 3 deletions app/js/constants/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Expand Down Expand Up @@ -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.',
Expand All @@ -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'
};
1 change: 1 addition & 0 deletions app/styles/_notification.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
.UserNotification {
padding: 15px;
color: $gray-light;
word-wrap: break-word;

.btn {
margin: 5px 5px 0 0;
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"name": "ozp-react-commons",
"version": "1.1.18",
"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"
},
"repository": {
"type": "git",
"url": "https://github.com/ozone-development/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": "https://github.com/ozone-development/ozp-react-commons",
"homepage": "https://www.github.com/ozoneplatform/ozp-react-commons",
"dependencies": {
"bootstrap-sass": "git://github.com/ozone-development/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",
Expand Down