diff --git a/CHANGELOG.md b/CHANGELOG.md index a48e6560c..750a91c35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,39 @@ +### 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) + + +### 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) + + +### 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/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]); } }; 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({ diff --git a/app/js/components/carousel/index.jsx b/app/js/components/carousel/index.jsx index eb317f2c5..80ea8e912 100644 --- a/app/js/components/carousel/index.jsx +++ b/app/js/components/carousel/index.jsx @@ -32,9 +32,9 @@ var Carousel = React.createClass({ { this.props.children }
- - + + ); }, 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 }

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; diff --git a/app/js/main.js b/app/js/main.js index 63f5ac9a3..53e4bd74f 100644 --- a/app/js/main.js +++ b/app/js/main.js @@ -18,9 +18,10 @@ 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 + IE_REDIRECT_URL, + SYSTEM_HIGH_CLASSIFICATION } = require('ozp-react-commons/OzoneConfig'); @@ -35,11 +36,44 @@ 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(index, 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 }; + + var requestType = options['type'].toLowerCase(); + if (requestType === 'post' || requestType === 'delete') { + jqXHR.setRequestHeader('X-CSRFToken', getCookie('csrftoken')); + } +}); + +$(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'), @@ -50,6 +84,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() { + $(document).classification({ + level: SYSTEM_HIGH_CLASSIFICATION, + colorBanners: true + }); + }); + Router.run(routes, function (Handler) { var main = document.getElementById('main'), component; @@ -67,38 +110,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; -})(); - -// Classification -$(function() { - $(document).classification({ - level: 'U' - }); -}); - - require('tour'); require('./tour/tour.js'); diff --git a/app/js/tour/centerTour.js b/app/js/tour/centerTour.js index 2a83f64e8..be31e1334 100644 --- a/app/js/tour/centerTour.js +++ b/app/js/tour/centerTour.js @@ -1,15 +1,28 @@ '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'); -var ProfileSearchActions = require('../actions/ProfileSearchActions'); +var tourDBMain = new ObjectDB('ozp_tour').init(); +var tourDB = tourDBMain.get(); +var contentLocalHUD = ``; +var contentLocalStart = ''; + +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 +43,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 +58,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 +127,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 +183,7 @@ const meTour = new Tour({ }, onNext: function() { var nextStep = function() { - meTour.goTo(11); + meTour.goTo(12); }; (function checkStatus() { if (readyObject.overviewLoaded) { @@ -173,6 +195,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 +237,7 @@ const meTour = new Tour({ tourCh.publish({ overviewLoaded: false }); - meTour.goTo(12); + meTour.goTo(13); }; (function checkStatus() { if (readyObject.reviewsLoaded) { @@ -200,10 +250,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 +267,7 @@ const meTour = new Tour({ tourCh.publish({ reviewsLoaded: false }); - meTour.goTo(13); + meTour.goTo(14); }; (function checkStatus() { if (readyObject.detailsLoaded) { @@ -230,7 +279,7 @@ const meTour = new Tour({ }, onPrev: function() { var prevStep = function() { - meTour.goTo(11); + meTour.goTo(12); }; (function checkStatus() { if (readyObject.overviewLoaded) { @@ -241,7 +290,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 +305,7 @@ const meTour = new Tour({ tourCh.publish({ detailsLoaded: false }); - meTour.goTo(14); + meTour.goTo(15); }; (function checkStatus() { if (readyObject.resourcesLoaded) { @@ -268,7 +317,7 @@ const meTour = new Tour({ }, onPrev: function() { var prevStep = function() { - meTour.goTo(12); + meTour.goTo(13); }; (function checkStatus() { if (readyObject.reviewsLoaded) { @@ -279,24 +328,38 @@ 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: '', - onNext: function() {meTour.end();}, + template: '', + onShow: function() { + tourDBMain.set({ + center: { + ran: true, + startCenterTour: true + } + }); + }, + 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({ resourcesLoaded: false }); - meTour.goTo(13); + meTour.goTo(14); }; (function checkStatus() { if (readyObject.detailsLoaded) { @@ -306,6 +369,9 @@ const meTour = new Tour({ } })(); } + }, + { + title: "end holder" } ] }); diff --git a/app/js/tour/tour.js b/app/js/tour/tour.js index 9dfaed1b6..49b4f51a4 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,8 @@ ProfileSearchActions.tourCheck.listen(() => { $(document).on('click', '#tour-start', function(e){ e.preventDefault(); - centerTour.restart().goTo(1); + tourDB.set({ + global_ran: false + }); + centerTour.restart().goTo(0); }); 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/_new-listings.scss b/app/styles/_new-listings.scss new file mode 100644 index 000000000..9b8c34635 --- /dev/null +++ b/app/styles/_new-listings.scss @@ -0,0 +1,3 @@ +.new-arrival-listings .SearchListingTile { + margin: 0px 30px 30px 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'; 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; } 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 c3ce50446..22a59106d 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "center-ui", - "version": "1.1.42", + "version": "1.1.47", "repository": { "type": "git", - "url": "https://github.com/ozone-development/ozp-center.git" + "url": "https://www.github.com/ozoneplatform/ozp-center.git" }, - "homepage": "https://github.com/ozone-development/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" @@ -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://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://github.com/ozone-development/ozp-classification", + "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", @@ -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/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/ozone-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://github.com/ozone-development/ozp-react-commons#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", "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/ozoneplatform/react-select-box#master", "reflux": "0.1.15", "select2": "^3.5.1", "spin.js": "2.0.2",