From f1216cf04b35cf63ee08c18581daa7c9a73cbf70 Mon Sep 17 00:00:00 2001 From: rkenyon1969 Date: Wed, 7 Sep 2016 11:12:03 -0400 Subject: [PATCH 01/37] modified centerTour.js and tour.js to support changes to tour in Hud --- app/js/tour/centerTour.js | 100 ++++++++++++++++++++++++++++++-------- app/js/tour/tour.js | 22 +++++---- 2 files changed, 93 insertions(+), 29 deletions(-) diff --git a/app/js/tour/centerTour.js b/app/js/tour/centerTour.js index 2a83f64e8..329419d0b 100644 --- a/app/js/tour/centerTour.js +++ b/app/js/tour/centerTour.js @@ -1,15 +1,31 @@ 'use strict'; -var {CENTER_URL} = require('ozp-react-commons/OzoneConfig'); +var {CENTER_URL, HUD_URL} = require('ozp-react-commons/OzoneConfig'); CENTER_URL = `/${CENTER_URL.match(/http.?:\/\/[^/]*\/(.*?)\/?$/)[1]}/`; var PubSub = require('browser-pubsub'); var tourCh = new PubSub('tour'); var ObjectDB = require('object-db'); -var tourDB = new ObjectDB('ozp_tour'); +// rjk +var tourDBMain = new ObjectDB('ozp_tour').init(); +var tourDB = tourDBMain.get(); +var contentLocalHUD = ''; +var contentLocalStart = ''; -var ProfileSearchActions = require('../actions/ProfileSearchActions'); +console.log(tourDBMain); +console.log(tourDB); + +if (typeof tourDB.hud !== 'undefined' && (tourDB.hud.ran === true || tourDB.hud.startHudTour === true)){ + contentLocalStart = "Continue tour"; +}else{ + contentLocalStart = "Start the tour"; +} +if (typeof tourDB.hud !== 'undefined' && (tourDB.hud.ran === true)){ + contentLocalHUD = ''; +} + +var ProfileSearchActions = require('../actions/ProfileSearchActions'); var readyObject = {}; // HACK: for some reason window.localstorage is lost in this file. @@ -30,12 +46,12 @@ const meTour = new Tour({ //0 { title: "Welcome. ", - content: "This simple tour guides you through the toolbar items and introduces you to the primary components of the system: The Center, HUD, and Webtop. These three components enable you to discover, bookmark, rate, review, organize and launch mission and business applications from across the enterprise.", + content: "This simple tour guides you through the toolbar items and introduces you to the primary components of the system: The HUD, Center and Webtop. These three components enable you to discover, bookmark, rate, review, organize and launch mission and business applications from across the enterprise.", orphan: true, onShown: function(){ $('#welcome').focus(); }, - template: '' + template: '' }, //1 { @@ -45,6 +61,9 @@ const meTour = new Tour({ placement: "bottom", onShown: function(){ $('#tourstop-hud').focus(); + if(tourDB.global_ran===true){ + meTour.goTo(7); + } }, backdropContainer: ".navbar-fixed-top", backdropPadding: 0 @@ -111,18 +130,24 @@ const meTour = new Tour({ }, onHidden: function() { $("#tourstop-global-menu").removeClass("open"); + }, + onNext: function() { + tourDBMain.set({ + global_ran: true + }); } }, //7 { element: "#tourstop-center-search", title: "Search and Filter", - content: "Use keywords and filters to explore listings. When you enter a search term, the system looks for your term in the listing's name, description, tags, etc.", - placement: "bottom", + content: "Use keywords and filters like listings type and organizations to explore listings. When you enter a search term, the system looks for your term in the listing's name, description, tags, etc.", + placement: "left", onShown: function(){ $('#tourstop-center-search').focus(); }, backdropContainer: "#header" + //backdropContainer: ".form-group .Search" }, //8 { @@ -161,7 +186,7 @@ const meTour = new Tour({ }, onNext: function() { var nextStep = function() { - meTour.goTo(11); + meTour.goTo(12); }; (function checkStatus() { if (readyObject.overviewLoaded) { @@ -173,6 +198,34 @@ const meTour = new Tour({ } }, //11 + { + path: `${CENTER_URL}#/home/?%2F%3F=`, + element: ".Discovery__SearchResults .listing:first, .infiniteScroll", + title: "Bookmark Listings for HUD tour steps", + content: "Hover over 3 tiles to bookmark them to your HUD. The tiles will be used to complete the tour in HUD.", + placement: "top", + orphan:true, + //backdrop: false, + onShown: function() { + $(".Discovery__SearchResults .listing:first .slide-up, .infiniteScroll .listing:first .slide-up").css("top", "0px"); + }, + onHide: function() { + $(".Discovery__SearchResults .listing:first .slide-up, .infiniteScroll .listing:first .slide-up").css("top", "137px"); + }, + onNext: function() { + var nextStep = function() { + meTour.goTo(12); + }; + (function checkStatus() { + if (readyObject.overviewLoaded) { + nextStep(); + } else { + setTimeout(checkStatus, 100); + } + })(); + } + }, + //12 { path: `${CENTER_URL}#/home/?%2F%3F=&listing=1&action=view&tab=overview`, element: ".modal-body", @@ -187,7 +240,7 @@ const meTour = new Tour({ tourCh.publish({ overviewLoaded: false }); - meTour.goTo(12); + meTour.goTo(13); }; (function checkStatus() { if (readyObject.reviewsLoaded) { @@ -200,10 +253,9 @@ const meTour = new Tour({ onPrev: function() { $(".quickview").modal("hide"); meTour.goTo(10); - } }, - //12 + //13 { path: `${CENTER_URL}#/home/?%2F%3F=&listing=1&action=view&tab=reviews`, element: ".modal-body .nav .active", @@ -218,7 +270,7 @@ const meTour = new Tour({ tourCh.publish({ reviewsLoaded: false }); - meTour.goTo(13); + meTour.goTo(14); }; (function checkStatus() { if (readyObject.detailsLoaded) { @@ -230,7 +282,7 @@ const meTour = new Tour({ }, onPrev: function() { var prevStep = function() { - meTour.goTo(11); + meTour.goTo(12); }; (function checkStatus() { if (readyObject.overviewLoaded) { @@ -241,7 +293,7 @@ const meTour = new Tour({ })(); } }, - //13 + //14 { path: `${CENTER_URL}#/home/?%2F%3F=&listing=1&action=view&tab=details`, element: ".modal-body .nav .active", @@ -256,7 +308,7 @@ const meTour = new Tour({ tourCh.publish({ detailsLoaded: false }); - meTour.goTo(14); + meTour.goTo(15); }; (function checkStatus() { if (readyObject.resourcesLoaded) { @@ -268,7 +320,7 @@ const meTour = new Tour({ }, onPrev: function() { var prevStep = function() { - meTour.goTo(12); + meTour.goTo(13); }; (function checkStatus() { if (readyObject.reviewsLoaded) { @@ -279,24 +331,32 @@ const meTour = new Tour({ })(); } }, - //14 + //15 { path: `${CENTER_URL}#/home/?%2F%3F=&listing=1&action=view&tab=resources`, element: ".modal-body .nav .active", title: "Listing Resources", - content: "If the listing includes instructions like user manuals and contact information, you will find it here.Thank you for taking the time to tour AppsMall.", + content: "If the listing includes instructions like user manuals and contact information, you will find it here. Thank you for taking the time to tour AppsMall.", placement: "bottom", backdropContainer: ".modal-content", backdropPadding: 0, orphan:true, - template: '', + template: '', + onShow: function() { + tourDBMain.set({ + center: { + ran: true, + startCenterTour: true + } + }); + }, onNext: function() {meTour.end();}, onPrev: function() { var prevStep = function() { tourCh.publish({ resourcesLoaded: false }); - meTour.goTo(13); + meTour.goTo(14); }; (function checkStatus() { if (readyObject.detailsLoaded) { diff --git a/app/js/tour/tour.js b/app/js/tour/tour.js index 9dfaed1b6..3cd73da3f 100644 --- a/app/js/tour/tour.js +++ b/app/js/tour/tour.js @@ -3,19 +3,22 @@ var ProfileSearchActions = require('../actions/ProfileSearchActions'); var $ = require('jquery'); var ObjectDB = require('object-db'); +var tourDB = new ObjectDB('ozp_tour').init(); // Setup our LocalstorageDB we will use this to talk between Center, // Webtop and Hud tours. -var tourDB = new ObjectDB('ozp_tour').init({ - center: { - ran: false, - startCenterTour: false - } -}); +//var tourDB = new ObjectDB('ozp_tour').init({ // rjk +if (typeof tourDB.db.data.center === 'undefined') { + tourDB.set({ + center: { + ran: false, + startCenterTour: false + } + }); +} var { globalTour, centerTour } = require('./'); - var centerStatus = tourDB.get('center'); var initTour = function() { @@ -32,7 +35,8 @@ ProfileSearchActions.tourCheck.listen(() => { tourDB.set({ center: { ran: true - } + }, + center_ran:true }); }); @@ -41,5 +45,5 @@ ProfileSearchActions.tourCheck.listen(() => { $(document).on('click', '#tour-start', function(e){ e.preventDefault(); - centerTour.restart().goTo(1); + centerTour.restart().goTo(0); }); From e69f88539aa2cd6d12d83fdc6d5d33a0965642c6 Mon Sep 17 00:00:00 2001 From: rkenyon1969 Date: Wed, 7 Sep 2016 13:30:54 -0400 Subject: [PATCH 02/37] fix: new code to redirect at end of center tour --- app/js/tour/centerTour.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/js/tour/centerTour.js b/app/js/tour/centerTour.js index 329419d0b..0914b406b 100644 --- a/app/js/tour/centerTour.js +++ b/app/js/tour/centerTour.js @@ -12,9 +12,6 @@ var tourDB = tourDBMain.get(); var contentLocalHUD = ''; var contentLocalStart = ''; -console.log(tourDBMain); -console.log(tourDB); - if (typeof tourDB.hud !== 'undefined' && (tourDB.hud.ran === true || tourDB.hud.startHudTour === true)){ contentLocalStart = "Continue tour"; }else{ @@ -350,7 +347,13 @@ const meTour = new Tour({ } }); }, - onNext: function() {meTour.end();}, + onNext: function(){ + if (typeof tourDB.hud === 'undefined' || tourDB.hud.ran === false){ + document.location.href = HUD_URL; + }else{ + meTour.end(); + } + }, onPrev: function() { var prevStep = function() { tourCh.publish({ From e7e7da77f91936050eeb5080f5e5a136d0062a5d Mon Sep 17 00:00:00 2001 From: rkenyon1969 Date: Wed, 7 Sep 2016 13:50:06 -0400 Subject: [PATCH 03/37] fix: centerTour.js --- app/js/tour/centerTour.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/js/tour/centerTour.js b/app/js/tour/centerTour.js index 0914b406b..0cd60ea35 100644 --- a/app/js/tour/centerTour.js +++ b/app/js/tour/centerTour.js @@ -369,6 +369,9 @@ const meTour = new Tour({ } })(); } + }, + { + title: "end holder" } ] }); From 7f3d4f86ce3786fc32218fa1b76d9f03a0d279eb Mon Sep 17 00:00:00 2001 From: rkenyon1969 Date: Wed, 7 Sep 2016 16:23:06 -0400 Subject: [PATCH 04/37] Fix: reset global_ran when restarting tour --- app/js/tour/tour.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/js/tour/tour.js b/app/js/tour/tour.js index 3cd73da3f..49b4f51a4 100644 --- a/app/js/tour/tour.js +++ b/app/js/tour/tour.js @@ -45,5 +45,8 @@ ProfileSearchActions.tourCheck.listen(() => { $(document).on('click', '#tour-start', function(e){ e.preventDefault(); + tourDB.set({ + global_ran: false + }); centerTour.restart().goTo(0); }); From a512cf24372ef4de6ff6c09c1553547aae80cd12 Mon Sep 17 00:00:00 2001 From: Matt Wisniewski Date: Thu, 8 Sep 2016 12:40:06 -0400 Subject: [PATCH 05/37] Update centerTour.js --- app/js/tour/centerTour.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/js/tour/centerTour.js b/app/js/tour/centerTour.js index 0cd60ea35..d6ae283fd 100644 --- a/app/js/tour/centerTour.js +++ b/app/js/tour/centerTour.js @@ -6,7 +6,7 @@ CENTER_URL = `/${CENTER_URL.match(/http.?:\/\/[^/]*\/(.*?)\/?$/)[1]}/`; var PubSub = require('browser-pubsub'); var tourCh = new PubSub('tour'); var ObjectDB = require('object-db'); -// rjk + var tourDBMain = new ObjectDB('ozp_tour').init(); var tourDB = tourDBMain.get(); var contentLocalHUD = ''; From 6aa82a9c83ce0a8be373f912af1b161c31f1a82a Mon Sep 17 00:00:00 2001 From: Matt Wisniewski Date: Thu, 8 Sep 2016 12:42:04 -0400 Subject: [PATCH 06/37] Update centerTour.js --- app/js/tour/centerTour.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/js/tour/centerTour.js b/app/js/tour/centerTour.js index d6ae283fd..be31e1334 100644 --- a/app/js/tour/centerTour.js +++ b/app/js/tour/centerTour.js @@ -9,7 +9,7 @@ var ObjectDB = require('object-db'); var tourDBMain = new ObjectDB('ozp_tour').init(); var tourDB = tourDBMain.get(); -var contentLocalHUD = ''; +var contentLocalHUD = ``; var contentLocalStart = ''; if (typeof tourDB.hud !== 'undefined' && (tourDB.hud.ran === true || tourDB.hud.startHudTour === true)){ From d84edc0159af6db01859fb6630ea4d61737b340d Mon Sep 17 00:00:00 2001 From: Manny Rivera Date: Fri, 9 Sep 2016 15:22:40 -0400 Subject: [PATCH 07/37] release-1.1.43 --- CHANGELOG.md | 9 +++++++++ package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a48e6560c..4aa8b660d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +### 1.1.43 (2016-09-09) + + +#### Bug Fixes + +* centerTour.js ([e7e7da77](https://github.com/ozone-development/ozp-center.git/commit/e7e7da77f91936050eeb5080f5e5a136d0062a5d)) +* new code to redirect at end of center tour ([e69f8853](https://github.com/ozone-development/ozp-center.git/commit/e69f88539aa2cd6d12d83fdc6d5d33a0965642c6)) + + ### 1.1.42 (2016-09-01) diff --git a/package.json b/package.json index c3ce50446..4855830ad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "center-ui", - "version": "1.1.42", + "version": "1.1.43", "repository": { "type": "git", "url": "https://github.com/ozone-development/ozp-center.git" From e14c4e5ad69a7a20750d46bcf29c07c3ec26fd2a Mon Sep 17 00:00:00 2001 From: Andrew Konsowski Date: Thu, 15 Sep 2016 08:47:44 -0400 Subject: [PATCH 08/37] fix(index):added a check to see if we should display webtop --- app/js/components/NavBar/index.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/js/components/NavBar/index.jsx b/app/js/components/NavBar/index.jsx index cd3cc1572..69d206ddd 100644 --- a/app/js/components/NavBar/index.jsx +++ b/app/js/components/NavBar/index.jsx @@ -51,7 +51,9 @@ var NavBar = React.createClass({ From fb529cde262c5e1ded5618ddacd9effcdd41497f Mon Sep 17 00:00:00 2001 From: Manny Rivera Date: Wed, 21 Sep 2016 15:14:00 -0400 Subject: [PATCH 09/37] release-1.1.44 --- CHANGELOG.md | 3 +++ package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4aa8b660d..392accc73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### 1.1.44 (2016-09-21) + + ### 1.1.43 (2016-09-09) diff --git a/package.json b/package.json index 4855830ad..bafc4b34b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "center-ui", - "version": "1.1.43", + "version": "1.1.44", "repository": { "type": "git", "url": "https://github.com/ozone-development/ozp-center.git" From 88e0dc90918dc7c3207451056c595a519b349175 Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Wed, 28 Sep 2016 14:11:02 -0400 Subject: [PATCH 10/37] fix(reviews): Changed variable name and text to reflect that reviews are not to be above FOUO #686 --- .../components/quickview/reviews/EditReview.jsx | 4 ++-- .../quickview/reviews/SubmitReview.jsx | 4 ++-- .../components/shared/ReviewWarningMessage.jsx | 16 ++++++++++++++++ app/js/components/shared/SystemHighMessage.jsx | 16 ---------------- 4 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 app/js/components/shared/ReviewWarningMessage.jsx delete mode 100644 app/js/components/shared/SystemHighMessage.jsx diff --git a/app/js/components/quickview/reviews/EditReview.jsx b/app/js/components/quickview/reviews/EditReview.jsx index 02ae8ddb9..5275a9517 100644 --- a/app/js/components/quickview/reviews/EditReview.jsx +++ b/app/js/components/quickview/reviews/EditReview.jsx @@ -3,7 +3,7 @@ var React = require('react'); var { classSet } = React.addons; var Reflux = require('reflux'); -var SystemHighMessage = require('../../shared/SystemHighMessage.jsx'); +var ReviewWarningMessage = require('../../shared/ReviewWarningMessage.jsx'); var _ = require('../../../utils/_'); var IconRating = require('../../shared/IconRating.jsx'); var PopoverConfirmationButton = require('./../../shared/PopoverConfirmationButton.jsx'); @@ -122,7 +122,7 @@ var EditReview = React.createClass({
Description
- + {isEditingRateAllowed && } diff --git a/app/js/components/quickview/reviews/SubmitReview.jsx b/app/js/components/quickview/reviews/SubmitReview.jsx index 52468d290..e078621ea 100644 --- a/app/js/components/quickview/reviews/SubmitReview.jsx +++ b/app/js/components/quickview/reviews/SubmitReview.jsx @@ -2,7 +2,7 @@ var React = require('react'); var { classSet } = React.addons; -var SystemHighMessage = require('../../shared/SystemHighMessage.jsx'); +var ReviewWarningMessage = require('../../shared/ReviewWarningMessage.jsx'); var _ = require('../../../utils/_'); var IconRating = require('../../shared/IconRating.jsx'); var ListingActions = require('../../../actions/ListingActions'); @@ -71,7 +71,7 @@ var ReviewListing = React.createClass({
Description
- +

Must have more than {limit} characters

diff --git a/app/js/components/shared/ReviewWarningMessage.jsx b/app/js/components/shared/ReviewWarningMessage.jsx new file mode 100644 index 000000000..69d397bcc --- /dev/null +++ b/app/js/components/shared/ReviewWarningMessage.jsx @@ -0,0 +1,16 @@ +'use strict'; + +var React = require('react'); +var { reviewWarningMessage } = require('ozp-react-commons/constants/messages'); + +var ReviewWarningMessage = React.createClass({ + + render: function () { + return ( +

{reviewWarningMessage}

+ ); + } + +}); + +module.exports = ReviewWarningMessage; diff --git a/app/js/components/shared/SystemHighMessage.jsx b/app/js/components/shared/SystemHighMessage.jsx deleted file mode 100644 index 8c04cb7c2..000000000 --- a/app/js/components/shared/SystemHighMessage.jsx +++ /dev/null @@ -1,16 +0,0 @@ -'use strict'; - -var React = require('react'); -var { systemHigh } = require('ozp-react-commons/constants/messages'); - -var SystemHighMessage = React.createClass({ - - render: function () { - return ( -

{systemHigh}

- ); - } - -}); - -module.exports = SystemHighMessage; From b14319cd9e32317335ea2ae693bd3626ef95fdad Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Fri, 30 Sep 2016 13:42:38 -0400 Subject: [PATCH 11/37] enhance(tags): Increase tag length to 30 #719 --- app/js/components/createEdit/validation/listing.js | 2 +- app/js/components/quickview/DetailsTab.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/js/components/createEdit/validation/listing.js b/app/js/components/createEdit/validation/listing.js index 487808521..3f649cc91 100644 --- a/app/js/components/createEdit/validation/listing.js +++ b/app/js/components/createEdit/validation/listing.js @@ -44,7 +44,7 @@ var securityMarking = NonBlankString(200), type = NonBlankString(50), whatIsNew = maybe(StringMax(255)), categories = list(NonBlankString(50)), - tags = list(StringMax(16)), + tags = list(StringMax(30)), intents = list(NonBlankString(127)), screenshots = list(Screenshot), contacts = list(Contact), diff --git a/app/js/components/quickview/DetailsTab.jsx b/app/js/components/quickview/DetailsTab.jsx index 44e860cd2..1ba133033 100644 --- a/app/js/components/quickview/DetailsTab.jsx +++ b/app/js/components/quickview/DetailsTab.jsx @@ -71,7 +71,7 @@ var DetailsTab = React.createClass({

{ URL }

{ categories ? categories : }

-

{this.renderTags(this) }

+

{this.renderTags(this) }

{ updatedDate }

{ versionNumber }

From cedc79100c1941c77d81e063c6197c59540a029b Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Mon, 3 Oct 2016 13:45:59 -0400 Subject: [PATCH 12/37] fix(Carousel): Fixed arrows disappearing when tabbing into carousel #524 --- app/js/components/carousel/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/js/components/carousel/index.jsx b/app/js/components/carousel/index.jsx index eb317f2c5..a6b93902b 100644 --- a/app/js/components/carousel/index.jsx +++ b/app/js/components/carousel/index.jsx @@ -27,13 +27,13 @@ var Carousel = React.createClass({ return (
+ +
    { this.props.children }
- -
); From 3da978299e0911f3625eee482faee7f5894dc379 Mon Sep 17 00:00:00 2001 From: Manny Rivera Date: Wed, 5 Oct 2016 15:00:39 -0400 Subject: [PATCH 13/37] release-1.1.45 --- CHANGELOG.md | 9 +++++++++ package.json | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 392accc73..da16021bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +### 1.1.45 (2016-10-05) + + +#### Bug Fixes + +* **Carousel:** Fixed arrows disappearing when tabbing into carousel #524 ([cedc7910](https://github.com/ozone-development/ozp-center.git/commit/cedc79100c1941c77d81e063c6197c59540a029b)) +* **reviews:** Changed variable name and text to reflect that reviews are not to be above FOUO ([88e0dc90](https://github.com/ozone-development/ozp-center.git/commit/88e0dc90918dc7c3207451056c595a519b349175)) + + ### 1.1.44 (2016-09-21) diff --git a/package.json b/package.json index bafc4b34b..9532ab639 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "center-ui", - "version": "1.1.44", + "version": "1.1.45", "repository": { "type": "git", "url": "https://github.com/ozone-development/ozp-center.git" From f5b56837806de324061b3faa567179d991a20d61 Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Fri, 7 Oct 2016 15:56:54 -0400 Subject: [PATCH 14/37] Fix(SecurityBanner): Check if current user is a secondPartyUser and sets classification accordingly #709 --- app/js/main.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/js/main.js b/app/js/main.js index 63f5ac9a3..017a062e2 100644 --- a/app/js/main.js +++ b/app/js/main.js @@ -50,6 +50,15 @@ var Routes = require('./components/Routes.jsx'), * Render everything when we get our profile */ SelfStore.listen(_.once(function(profileData) { + + // Classification needs to run after the profileData is loaded + $(function() { + console.log(profileData.currentUser); + $(document).classification({ + level: profileData.currentUser.secondPartyUser?'U':'U-FOUO' + }); + }); + Router.run(routes, function (Handler) { var main = document.getElementById('main'), component; @@ -91,12 +100,6 @@ ProfileActions.fetchSelf(); window._paq = _paq; })(); -// Classification -$(function() { - $(document).classification({ - level: 'U' - }); -}); require('tour'); From 598d03f2adcd887a5944c447e3fb7c394a6c108d Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Fri, 7 Oct 2016 15:58:32 -0400 Subject: [PATCH 15/37] Fix(SecurityBanner): Removing console.log #709 --- app/js/main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/js/main.js b/app/js/main.js index 017a062e2..b44a1b7e8 100644 --- a/app/js/main.js +++ b/app/js/main.js @@ -53,7 +53,6 @@ SelfStore.listen(_.once(function(profileData) { // Classification needs to run after the profileData is loaded $(function() { - console.log(profileData.currentUser); $(document).classification({ level: profileData.currentUser.secondPartyUser?'U':'U-FOUO' }); From c641ae038b987dbea9316367d49e179de1d4a1ff Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Tue, 11 Oct 2016 10:55:50 -0400 Subject: [PATCH 16/37] Fix(Carousel): Moved carousel buttons below carousel div to correct clickthrough #723 --- app/js/components/carousel/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/js/components/carousel/index.jsx b/app/js/components/carousel/index.jsx index a6b93902b..80ea8e912 100644 --- a/app/js/components/carousel/index.jsx +++ b/app/js/components/carousel/index.jsx @@ -27,14 +27,14 @@ var Carousel = React.createClass({ return (
- -
    { this.props.children }
+ +
); }, From 9d1665754090e9c2824520b50b68c209b6023000 Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Mon, 17 Oct 2016 15:44:01 -0400 Subject: [PATCH 17/37] fix(notificationSettings) Fix notification overflow --- app/styles/management/_notifications.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/styles/management/_notifications.scss b/app/styles/management/_notifications.scss index ed20f7cfa..267bd018a 100644 --- a/app/styles/management/_notifications.scss +++ b/app/styles/management/_notifications.scss @@ -5,6 +5,7 @@ position: relative; } .ActiveNotification, .PastNotification { + word-wrap: break-word; margin-bottom: 20px; } From 146219a795e3470e7c93ddc497914f2cfc245728 Mon Sep 17 00:00:00 2001 From: Manny Rivera Date: Thu, 20 Oct 2016 15:28:25 -0400 Subject: [PATCH 18/37] release-1.1.46 --- CHANGELOG.md | 3 +++ package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da16021bd..d70815b3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### 1.1.46 (2016-10-20) + + ### 1.1.45 (2016-10-05) diff --git a/package.json b/package.json index 9532ab639..361f526fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "center-ui", - "version": "1.1.45", + "version": "1.1.46", "repository": { "type": "git", "url": "https://github.com/ozone-development/ozp-center.git" From edab8279ccf7bf3e84774090edbcf1f285225f06 Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Fri, 21 Oct 2016 13:36:55 -0400 Subject: [PATCH 19/37] fix(Carousel): Fixed styling for new listings so they don't appear out of the list #726 --- app/styles/_carousel.scss | 3 +-- app/styles/_featured-listings.scss | 5 ----- app/styles/main.scss | 1 + 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/styles/_carousel.scss b/app/styles/_carousel.scss index 5ead29ec0..160112552 100644 --- a/app/styles/_carousel.scss +++ b/app/styles/_carousel.scss @@ -1,6 +1,5 @@ .carousel-wrapper { position: relative; - margin-left: -15px; .carousel { margin: 0 !important; @@ -13,7 +12,7 @@ height: 100%; background: rgba(25, 31, 37, 0.4); top: 0; - left: 15px; + left: 0; color: $white; z-index:1; diff --git a/app/styles/_featured-listings.scss b/app/styles/_featured-listings.scss index 6cc5bf058..2313092bb 100644 --- a/app/styles/_featured-listings.scss +++ b/app/styles/_featured-listings.scss @@ -12,9 +12,4 @@ height: 100%; } } - - .prev { - left: 0px; - } - } diff --git a/app/styles/main.scss b/app/styles/main.scss index 005e3316b..ddead0b79 100644 --- a/app/styles/main.scss +++ b/app/styles/main.scss @@ -113,6 +113,7 @@ a:focus { @import 'listing/search-listing-tile'; @import 'listing/admin-owner-listing-tile'; @import 'featured-listings'; +@import 'new-listings'; @import 'discovery'; @import 'quickview'; @import 'create-edit'; From 9c54020d312834bdb6a0f61232f3431e1ea9803b Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Fri, 21 Oct 2016 13:39:38 -0400 Subject: [PATCH 20/37] fix(Carousel): Forgot new style sheet #726 --- app/styles/_new-listings.scss | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 app/styles/_new-listings.scss diff --git a/app/styles/_new-listings.scss b/app/styles/_new-listings.scss new file mode 100644 index 000000000..612e5b63a --- /dev/null +++ b/app/styles/_new-listings.scss @@ -0,0 +1,3 @@ +.new-arrival-listings > .carousel > ul { + left: -15px !important; +} \ No newline at end of file From 17fff2335a8c1aae010ac81bbe503d04420a7dba Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Fri, 21 Oct 2016 13:41:00 -0400 Subject: [PATCH 21/37] fix(Carousel): Added newline because github was complaining #726 --- app/styles/_new-listings.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/_new-listings.scss b/app/styles/_new-listings.scss index 612e5b63a..fb76e88b5 100644 --- a/app/styles/_new-listings.scss +++ b/app/styles/_new-listings.scss @@ -1,3 +1,3 @@ .new-arrival-listings > .carousel > ul { left: -15px !important; -} \ No newline at end of file +} From de43acafa01e7f76200e37758934a6d9c14d6f47 Mon Sep 17 00:00:00 2001 From: Laura Semesky Date: Tue, 25 Oct 2016 12:19:52 -0400 Subject: [PATCH 22/37] fix(carousel): correcting previous style change which prevented carousel animation --- app/styles/_new-listings.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/styles/_new-listings.scss b/app/styles/_new-listings.scss index fb76e88b5..9b8c34635 100644 --- a/app/styles/_new-listings.scss +++ b/app/styles/_new-listings.scss @@ -1,3 +1,3 @@ -.new-arrival-listings > .carousel > ul { - left: -15px !important; +.new-arrival-listings .SearchListingTile { + margin: 0px 30px 30px 0px; } From fd34823a2f58b87ab40d77949ed8ba3d70e3b636 Mon Sep 17 00:00:00 2001 From: Manny Rivera Date: Wed, 26 Oct 2016 14:20:40 -0400 Subject: [PATCH 23/37] release-1.1.47 --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d70815b3d..750a91c35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +### 1.1.47 (2016-10-26) + + +#### Bug Fixes + +* **Carousel:** + * Added newline because github was complaining #726 ([17fff233](https://github.com/ozone-development/ozp-center.git/commit/17fff2335a8c1aae010ac81bbe503d04420a7dba)) + * Forgot new style sheet #726 ([9c54020d](https://github.com/ozone-development/ozp-center.git/commit/9c54020d312834bdb6a0f61232f3431e1ea9803b)) + * Fixed styling for new listings so they don't appear out of the list #726 ([edab8279](https://github.com/ozone-development/ozp-center.git/commit/edab8279ccf7bf3e84774090edbcf1f285225f06)) +* **carousel:** correcting previous style change which prevented carousel animation ([de43acaf](https://github.com/ozone-development/ozp-center.git/commit/de43acafa01e7f76200e37758934a6d9c14d6f47)) + + ### 1.1.46 (2016-10-20) diff --git a/package.json b/package.json index 361f526fb..47b51746c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "center-ui", - "version": "1.1.46", + "version": "1.1.47", "repository": { "type": "git", "url": "https://github.com/ozone-development/ozp-center.git" From 31da828d58dee84b50bf95a362fe2b2ef6367d93 Mon Sep 17 00:00:00 2001 From: Robert Hutzel Date: Tue, 1 Nov 2016 15:57:08 -0400 Subject: [PATCH 24/37] Dropped Piwik support. Forbidden API calls cause redirection to CAS login screen. webpack dev server now serves at :8000/ instead of :8000/dist Various URL repairs in package.json and upgraded ozp-react-commons. --- app/js/main.js | 34 +++++++--------------------------- gulp/tasks/dev.js | 5 +++-- package.json | 18 +++++++++--------- 3 files changed, 19 insertions(+), 38 deletions(-) diff --git a/app/js/main.js b/app/js/main.js index b44a1b7e8..e75a68510 100644 --- a/app/js/main.js +++ b/app/js/main.js @@ -18,7 +18,7 @@ var SelfStore = require('ozp-react-commons/stores/SelfStore'); var ProfileActions = require('ozp-react-commons/actions/ProfileActions'); var LoadError = require('ozp-react-commons/components/LoadError.jsx'); var { - METRICS_URL, + API_URL, APP_TITLE, IE_REDIRECT_URL } = require('ozp-react-commons/OzoneConfig'); @@ -42,6 +42,12 @@ $.ajaxPrefilter(function (options) { }; }); +$(document).ajaxError(function (event, jqxhr, settings, thrownError ) { + if (settings.url.indexOf('/api/') >= 0 && thrownError === 'FORBIDDEN') { + window.location = API_URL + '/accounts/login/'; + } +}); + var Routes = require('./components/Routes.jsx'), routes = Routes(); @@ -75,32 +81,6 @@ SelfStore.listen(_.once(function(profileData) { ProfileActions.fetchSelf(); -(function initPiwik() { - var _paq = window._paq || []; - _paq.push(['trackPageView']); - _paq.push(['enableLinkTracking']); - - (function() { - var d = document, - g = d.createElement('script'), - s = d.getElementsByTagName('script')[0], - u = METRICS_URL; - - _paq.push(['setTrackerUrl', u+'piwik.php']); - _paq.push(['setSiteId', 1]); - - g.type='text/javascript'; - g.async=true; - g.defer=true; - g.src=u+'piwik.js'; - s.parentNode.insertBefore(g,s); - })(); - - window._paq = _paq; -})(); - - - require('tour'); require('./tour/tour.js'); diff --git a/gulp/tasks/dev.js b/gulp/tasks/dev.js index be58e51a4..f3c39865a 100644 --- a/gulp/tasks/dev.js +++ b/gulp/tasks/dev.js @@ -11,7 +11,8 @@ gulp.task('dev', ['sass', 'copy', 'config', 'fonts', 'images', 'svg', 'jqueryUnd // Start a webpack-dev-server var server = new WebpackDevServer(webpack(devConfig), { - publicPath: "/dist/assets", + contentBase: "./dist", + publicPath: "/assets", stats: { colors: true } @@ -19,7 +20,7 @@ gulp.task('dev', ['sass', 'copy', 'config', 'fonts', 'images', 'svg', 'jqueryUnd server.listen(8000, "0.0.0.0", function (err) { if(err) throw new gutil.PluginError("webpack-dev-server", err); - gutil.log("[webpack-dev-server]", "http://localhost:8000/webpack-dev-server/dist"); + gutil.log("[webpack-dev-server]", "http://localhost:8000"); }); // refresh app on sass, images and html changes diff --git a/package.json b/package.json index 47b51746c..ebea9cae2 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,9 @@ "version": "1.1.47", "repository": { "type": "git", - "url": "https://github.com/ozone-development/ozp-center.git" + "url": "http://dev1.vistronix.com:9080/ozp/ozp-center.git" }, - "homepage": "https://github.com/ozone-development/ozp-center/blob/master/README.md", + "homepage": "http://dev1.vistronix.com:9080/ozp/ozp-center/blob/master/README.md", "license": { "type": "Apache-2.0", "url": "https://spdx.org/licenses/Apache-2.0" @@ -17,7 +17,7 @@ "start": "gulp dev", "test": "./node_modules/karma/bin/karma start", "build": "NODE_ENV=\"production\" gulp build", - "buildGhPages": "API_URL=\"https://www.owfgoss.org/ng/dev/mp\" HUD_URL=\"http://ozone-development.github.io/ozp-hud/\" WEBTOP_URL=\"http://ozone-development.github.io/ozp-webtop/\" HELP_URL=\"http://ozone-development.github.io/ozp-hud/assets/PlaceholderUserGuide.pdf\" gulp build", + "buildGhPages": "API_URL=\"http://localhost:4440\" HUD_URL=\"http://localhost:8088\" WEBTOP_URL=\"http://localhost:9000\" HELP_URL=\"http://aml-development.github.io/ozp-hud/assets/PlaceholderUserGuide.pdf\" gulp build", "deployGhPages": "npm run buildGhPages && gulp deploy", "changelog": "gulp changelog", "tarDistDate": "gulp tarDistDate", @@ -64,7 +64,7 @@ "karma-webpack": "1.5.0", "mocha": "2.1.0", "node-sass": "3.4.2", - "ozp-classification": "git://github.com/ozone-development/ozp-classification", + "ozp-classification": "git://github.com/aml-development/ozp-classification", "raw-loader": "0.5.1", "react-hot-loader": "0.5.0", "react-proxy-loader": "0.3.2", @@ -82,8 +82,8 @@ "babel-plugin-transform-es2015-classes":"^6.8.0", "babel-preset-es2015": "^6.6.0", "babel-preset-react": "^6.5.0", - "bootstrap-classify": "git://github.com/ozone-development/bootstrap-classify#ozp-integ", - "bootstrap-sass": "git://github.com/ozone-development/bootstrap-sass", + "bootstrap-classify": "git://github.com/aml-development/bootstrap-classify#ozp-integ", + "bootstrap-sass": "git://github.com/aml-development/ozp-bootstrap-sass", "bootstrap-tour": "git://github.com/ozone-utils/bootstrap-tour", "browser-pubsub": "^1.2.1", "console-polyfill": "^0.2.2", @@ -92,7 +92,7 @@ "eslint-loader": "^1.2.0", "exports-loader": "0.6.2", "humps": "git://github.com/domchristie/humps.git", - "icons": "git://github.com/ozone-development/ozp-icons", + "icons": "git://github.com/aml-development/ozp-icons", "jquery": "^2.2.0", "lodash-amd": "2.4.1", "magnific-popup": "^0.9.9", @@ -100,14 +100,14 @@ "moment": "2.9.0", "object-assign": "1.0.0", "object-db": "^1.2.4", - "ozp-react-commons": "git://github.com/ozone-development/ozp-react-commons#master", + "ozp-react-commons": "git+http://dev1.vistronix.com:9080/ozp/ozp-react-commons#master", "react": "0.12.2", "react-datepicker": "0.5.1", "react-icon-rating": "0.2.0", "react-input-placeholder": "1.0.0", "react-radio-group": "1.0.0", "react-router": "0.12.4", - "react-select-box": "git://github.com/ozone-development/react-select-box#master", + "react-select-box": "git://github.com/aml-development/react-select-box#master", "reflux": "0.1.15", "select2": "^3.5.1", "spin.js": "2.0.2", From 2372bbacc2c862a5e4cde15dc50c658c667f7f17 Mon Sep 17 00:00:00 2001 From: clabas Date: Wed, 2 Nov 2016 16:08:18 -0400 Subject: [PATCH 25/37] Added .git extension to ozp-react-commons repo in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ebea9cae2..cc6379a09 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "moment": "2.9.0", "object-assign": "1.0.0", "object-db": "^1.2.4", - "ozp-react-commons": "git+http://dev1.vistronix.com:9080/ozp/ozp-react-commons#master", + "ozp-react-commons": "git+http://dev1.vistronix.com:9080/ozp/ozp-react-commons.git#master", "react": "0.12.2", "react-datepicker": "0.5.1", "react-icon-rating": "0.2.0", From dd6671f1a0e46276f486550c5dfed224d667eddc Mon Sep 17 00:00:00 2001 From: Charles Labas Date: Mon, 7 Nov 2016 16:50:42 -0500 Subject: [PATCH 26/37] ozp-analytics will check for the existence of the window._paq array before pushing events --- app/js/analytics/ozp-analytics.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/app/js/analytics/ozp-analytics.js b/app/js/analytics/ozp-analytics.js index 2b44eafec..df3ffd7ba 100644 --- a/app/js/analytics/ozp-analytics.js +++ b/app/js/analytics/ozp-analytics.js @@ -1,35 +1,41 @@ 'use strict'; +var pushEvent = function(event) { + if (window._paq) { + window._paq.push(event); + } +}; + module.exports = { trackEvent: function (label, data, agency) { - window._paq.push(['trackEvent', label, data, agency]); + pushEvent(['trackEvent', label, data, agency]); }, trackCategorization: function (label, category, total) { - window._paq.push(['trackEvent', label, category, total]); + pushEvent(['trackEvent', label, category, total]); }, trackSiteSearch: function (label, query, total) { query = query.toLowerCase(); - window._paq.push(['trackSiteSearch', query, label, total]); + pushEvent(['trackSiteSearch', query, label, total]); }, trackListingCreation: function(listingName, agency){ - window._paq.push(['trackEvent', 'Listing Creation', listingName, agency]); + pushEvent(['trackEvent', 'Listing Creation', listingName, agency]); }, trackListingOrgApproval: function(listingName, agency){ - window._paq.push(['trackEvent', 'Listing Org Approval', listingName, agency]); + pushEvent(['trackEvent', 'Listing Org Approval', listingName, agency]); }, trackListingApproval: function(listingName, agency){ - window._paq.push(['trackEvent', 'Listing Approval', listingName, agency]); + pushEvent(['trackEvent', 'Listing Approval', listingName, agency]); }, trackListingReview: function(listingName, agency){ - window._paq.push(['trackEvent', 'Listing Review', listingName, agency]); + pushEvent(['trackEvent', 'Listing Review', listingName, agency]); }, trackListingReviewView: function(listingName, agency){ - window._paq.push(['trackEvent', 'Listing Review View', listingName, agency]); + pushEvent(['trackEvent', 'Listing Review View', listingName, agency]); } }; From c017f4e2dfd23843f0f951f22dc895b0c254c4c2 Mon Sep 17 00:00:00 2001 From: Charles Labas Date: Tue, 8 Nov 2016 10:17:50 -0500 Subject: [PATCH 27/37] OZP-41: x-csrftoken header will be added to all POST requests --- app/js/main.js | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/app/js/main.js b/app/js/main.js index e75a68510..04ac541be 100644 --- a/app/js/main.js +++ b/app/js/main.js @@ -35,11 +35,37 @@ require('script!bootstrap-classify'); window.moment = require('moment'); window.Tether = require('tether'); +var getCookie = function(cookieName) { + var cookieValue = null; + + if (document.cookie && document.cookie !== '') { + var cookies = document.cookie.split(';'); + + $.each(cookies, function(cookie) { + var cookie = $.trim(cookie); + + // Does this cookie string begin with the cookieName we want? + if (cookie.substring(0, cookieName.length + 1) === (cookieName + '=')) { + cookieValue = decodeURIComponent(cookie.substring(cookieName.length + 1)); + + // Returning false breaks out of $.each + return false; + } + }); + } + + return cookieValue; +}; + // Enable withCredentials for all requests -$.ajaxPrefilter(function (options) { +$.ajaxPrefilter(function (options, originalOptions, jqXHR) { options.xhrFields = { withCredentials: true }; + + if (options['type'].toLowerCase() === 'post') { + jqXHR.setRequestHeader('X-CSRFToken', getCookie('csrftoken')); + } }); $(document).ajaxError(function (event, jqxhr, settings, thrownError ) { From f7836578a9a27276ad9d048c8c3777e922ea950f Mon Sep 17 00:00:00 2001 From: Charles Labas Date: Tue, 8 Nov 2016 10:57:03 -0500 Subject: [PATCH 28/37] OZP-41: fixed arguments in jQuery.each handler --- app/js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/js/main.js b/app/js/main.js index 04ac541be..2f8f69aa4 100644 --- a/app/js/main.js +++ b/app/js/main.js @@ -41,7 +41,7 @@ var getCookie = function(cookieName) { if (document.cookie && document.cookie !== '') { var cookies = document.cookie.split(';'); - $.each(cookies, function(cookie) { + $.each(cookies, function(index, cookie) { var cookie = $.trim(cookie); // Does this cookie string begin with the cookieName we want? From c10e9f4906c90ecdedd7a3545f05ebed974bf257 Mon Sep 17 00:00:00 2001 From: Charles Labas Date: Tue, 8 Nov 2016 11:19:44 -0500 Subject: [PATCH 29/37] OZP-41: Added x-csrftoken header to DELETE requests --- app/js/main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/js/main.js b/app/js/main.js index 2f8f69aa4..d2af264aa 100644 --- a/app/js/main.js +++ b/app/js/main.js @@ -63,7 +63,8 @@ $.ajaxPrefilter(function (options, originalOptions, jqXHR) { withCredentials: true }; - if (options['type'].toLowerCase() === 'post') { + var requestType = options['type'].toLowerCase(); + if (requestType === 'post' || requestType === 'delete') { jqXHR.setRequestHeader('X-CSRFToken', getCookie('csrftoken')); } }); From fc06144a3db43eb866ac9fac9f63b6f588a6d6d7 Mon Sep 17 00:00:00 2001 From: Charles Labas Date: Mon, 14 Nov 2016 20:41:34 +0000 Subject: [PATCH 30/37] OZP-36: Replaced source as Github for ozp-react-commons dependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cc6379a09..2bbaa4a23 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "moment": "2.9.0", "object-assign": "1.0.0", "object-db": "^1.2.4", - "ozp-react-commons": "git+http://dev1.vistronix.com:9080/ozp/ozp-react-commons.git#master", + "ozp-react-commons": "git://github.com/ozone-development/ozp-react-commons#master", "react": "0.12.2", "react-datepicker": "0.5.1", "react-icon-rating": "0.2.0", From f28cec81dddb32c89779e514aff68b16e2b3d6ff Mon Sep 17 00:00:00 2001 From: Charles Labas Date: Mon, 14 Nov 2016 20:43:34 +0000 Subject: [PATCH 31/37] Changed ozone-development to aml-development for ozp-react-commons dependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2bbaa4a23..f0988248e 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "moment": "2.9.0", "object-assign": "1.0.0", "object-db": "^1.2.4", - "ozp-react-commons": "git://github.com/ozone-development/ozp-react-commons#master", + "ozp-react-commons": "git://github.com/aml-development/ozp-react-commons#master", "react": "0.12.2", "react-datepicker": "0.5.1", "react-icon-rating": "0.2.0", From 4fecb93baf483c404cc59f814bf88e9f6777d5a1 Mon Sep 17 00:00:00 2001 From: Charles Labas Date: Thu, 1 Dec 2016 16:23:57 -0500 Subject: [PATCH 32/37] OZP-69: Replaced aml-development/ozp-classification dependency with Gitlab ozp-classification --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f0988248e..2029cc0b1 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "karma-webpack": "1.5.0", "mocha": "2.1.0", "node-sass": "3.4.2", - "ozp-classification": "git://github.com/aml-development/ozp-classification", + "ozp-classification": "git+http://dev1.vistronix.com:9080/ozp/ozp-classification", "raw-loader": "0.5.1", "react-hot-loader": "0.5.0", "react-proxy-loader": "0.3.2", From 9506fe06eb85387716b30414a65dc87a9887b9f0 Mon Sep 17 00:00:00 2001 From: Charles Labas Date: Fri, 2 Dec 2016 10:27:21 -0500 Subject: [PATCH 33/37] OZP-70: Changed ozp-react-commons dependency and made system classification configurable --- app/js/main.js | 5 +++-- package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/js/main.js b/app/js/main.js index d2af264aa..2544aa0b1 100644 --- a/app/js/main.js +++ b/app/js/main.js @@ -20,7 +20,8 @@ var LoadError = require('ozp-react-commons/components/LoadError.jsx'); var { API_URL, APP_TITLE, - IE_REDIRECT_URL + IE_REDIRECT_URL, + SYSTEM_HIGH_CLASSIFICATION } = require('ozp-react-commons/OzoneConfig'); @@ -87,7 +88,7 @@ SelfStore.listen(_.once(function(profileData) { // Classification needs to run after the profileData is loaded $(function() { $(document).classification({ - level: profileData.currentUser.secondPartyUser?'U':'U-FOUO' + level: SYSTEM_HIGH_CLASSIFICATION }); }); diff --git a/package.json b/package.json index 2029cc0b1..939deba54 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "moment": "2.9.0", "object-assign": "1.0.0", "object-db": "^1.2.4", - "ozp-react-commons": "git://github.com/aml-development/ozp-react-commons#master", + "ozp-react-commons": "git+http://dev1.vistronix.com:9080/ozp/ozp-react-commons.git#master", "react": "0.12.2", "react-datepicker": "0.5.1", "react-icon-rating": "0.2.0", From e3695c4855a1ff024f505a77a07f456e58baf09e Mon Sep 17 00:00:00 2001 From: Charles Labas Date: Fri, 2 Dec 2016 10:55:04 -0500 Subject: [PATCH 34/37] OZP-70: Made classification banners colored by classification --- app/js/main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/js/main.js b/app/js/main.js index 2544aa0b1..53e4bd74f 100644 --- a/app/js/main.js +++ b/app/js/main.js @@ -88,7 +88,8 @@ SelfStore.listen(_.once(function(profileData) { // Classification needs to run after the profileData is loaded $(function() { $(document).classification({ - level: SYSTEM_HIGH_CLASSIFICATION + level: SYSTEM_HIGH_CLASSIFICATION, + colorBanners: true }); }); From 02a0380c14c1e9eda51f0173750bb6a3e29911e4 Mon Sep 17 00:00:00 2001 From: Charles Labas Date: Fri, 2 Dec 2016 18:58:14 +0000 Subject: [PATCH 35/37] Added .git extension to ozp-classification dependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 939deba54..31339b8f6 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ "karma-webpack": "1.5.0", "mocha": "2.1.0", "node-sass": "3.4.2", - "ozp-classification": "git+http://dev1.vistronix.com:9080/ozp/ozp-classification", + "ozp-classification": "git+http://dev1.vistronix.com:9080/ozp/ozp-classification.git", "raw-loader": "0.5.1", "react-hot-loader": "0.5.0", "react-proxy-loader": "0.3.2", From 1e584203810664554af9dc1c4c726ab808305fde Mon Sep 17 00:00:00 2001 From: clabas Date: Mon, 19 Dec 2016 10:21:22 -0500 Subject: [PATCH 36/37] Fixed references to github URLs in package.json --- package.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 31339b8f6..e1d53624f 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,9 @@ "version": "1.1.47", "repository": { "type": "git", - "url": "http://dev1.vistronix.com:9080/ozp/ozp-center.git" + "url": "https://www.github.com/ozoneplatform/ozp/ozp-center.git" }, - "homepage": "http://dev1.vistronix.com:9080/ozp/ozp-center/blob/master/README.md", + "homepage": "https://www.github.com/ozoneplatform/ozp/ozp-center/blob/master/README.md", "license": { "type": "Apache-2.0", "url": "https://spdx.org/licenses/Apache-2.0" @@ -17,7 +17,7 @@ "start": "gulp dev", "test": "./node_modules/karma/bin/karma start", "build": "NODE_ENV=\"production\" gulp build", - "buildGhPages": "API_URL=\"http://localhost:4440\" HUD_URL=\"http://localhost:8088\" WEBTOP_URL=\"http://localhost:9000\" HELP_URL=\"http://aml-development.github.io/ozp-hud/assets/PlaceholderUserGuide.pdf\" gulp build", + "buildGhPages": "API_URL=\"http://localhost:4440\" HUD_URL=\"http://localhost:8088\" WEBTOP_URL=\"http://localhost:9000\" HELP_URL=\"http://ozoneplatform.github.io/ozp-hud/assets/PlaceholderUserGuide.pdf\" gulp build", "deployGhPages": "npm run buildGhPages && gulp deploy", "changelog": "gulp changelog", "tarDistDate": "gulp tarDistDate", @@ -64,7 +64,7 @@ "karma-webpack": "1.5.0", "mocha": "2.1.0", "node-sass": "3.4.2", - "ozp-classification": "git+http://dev1.vistronix.com:9080/ozp/ozp-classification.git", + "ozp-classification": "git://github.com/ozoneplatform/ozp/ozp-classification.git", "raw-loader": "0.5.1", "react-hot-loader": "0.5.0", "react-proxy-loader": "0.3.2", @@ -82,8 +82,8 @@ "babel-plugin-transform-es2015-classes":"^6.8.0", "babel-preset-es2015": "^6.6.0", "babel-preset-react": "^6.5.0", - "bootstrap-classify": "git://github.com/aml-development/bootstrap-classify#ozp-integ", - "bootstrap-sass": "git://github.com/aml-development/ozp-bootstrap-sass", + "bootstrap-classify": "git://github.com/ozoneplatform/bootstrap-classify#ozp-integ", + "bootstrap-sass": "git://github.com/ozoneplatform/ozp-bootstrap-sass", "bootstrap-tour": "git://github.com/ozone-utils/bootstrap-tour", "browser-pubsub": "^1.2.1", "console-polyfill": "^0.2.2", @@ -92,7 +92,7 @@ "eslint-loader": "^1.2.0", "exports-loader": "0.6.2", "humps": "git://github.com/domchristie/humps.git", - "icons": "git://github.com/aml-development/ozp-icons", + "icons": "git://github.com/ozoneplatform/ozp-icons", "jquery": "^2.2.0", "lodash-amd": "2.4.1", "magnific-popup": "^0.9.9", @@ -100,14 +100,14 @@ "moment": "2.9.0", "object-assign": "1.0.0", "object-db": "^1.2.4", - "ozp-react-commons": "git+http://dev1.vistronix.com:9080/ozp/ozp-react-commons.git#master", + "ozp-react-commons": "git://github.com/ozoneplatform/ozp/ozp-react-commons.git#master", "react": "0.12.2", "react-datepicker": "0.5.1", "react-icon-rating": "0.2.0", "react-input-placeholder": "1.0.0", "react-radio-group": "1.0.0", "react-router": "0.12.4", - "react-select-box": "git://github.com/aml-development/react-select-box#master", + "react-select-box": "git://github.com/ozoneplatform/react-select-box#master", "reflux": "0.1.15", "select2": "^3.5.1", "spin.js": "2.0.2", From 652123fb7def2d563ed1db801dd3e3f4ca29cc1b Mon Sep 17 00:00:00 2001 From: clabas Date: Mon, 19 Dec 2016 10:24:04 -0500 Subject: [PATCH 37/37] Removed 'ozp' from git URLs --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index e1d53624f..22a59106d 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,9 @@ "version": "1.1.47", "repository": { "type": "git", - "url": "https://www.github.com/ozoneplatform/ozp/ozp-center.git" + "url": "https://www.github.com/ozoneplatform/ozp-center.git" }, - "homepage": "https://www.github.com/ozoneplatform/ozp/ozp-center/blob/master/README.md", + "homepage": "https://www.github.com/ozoneplatform/ozp-center/blob/master/README.md", "license": { "type": "Apache-2.0", "url": "https://spdx.org/licenses/Apache-2.0" @@ -64,7 +64,7 @@ "karma-webpack": "1.5.0", "mocha": "2.1.0", "node-sass": "3.4.2", - "ozp-classification": "git://github.com/ozoneplatform/ozp/ozp-classification.git", + "ozp-classification": "git://github.com/ozoneplatform/ozp-classification.git", "raw-loader": "0.5.1", "react-hot-loader": "0.5.0", "react-proxy-loader": "0.3.2", @@ -100,7 +100,7 @@ "moment": "2.9.0", "object-assign": "1.0.0", "object-db": "^1.2.4", - "ozp-react-commons": "git://github.com/ozoneplatform/ozp/ozp-react-commons.git#master", + "ozp-react-commons": "git://github.com/ozoneplatform/ozp-react-commons.git#master", "react": "0.12.2", "react-datepicker": "0.5.1", "react-icon-rating": "0.2.0",