From 582d3b600f704d86638e54c0922760e6777578b4 Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Thu, 13 Apr 2017 10:41:54 +0200 Subject: [PATCH 1/2] Fix #1720. Removed wrong copyright annotations in documented components (#1722) --- package.json | 2 +- web/client/components/buttons/FullScreenButton.jsx | 2 +- web/client/components/plugins/PluginsContainer.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 47cc2a4f57..649ee1f68d 100644 --- a/package.json +++ b/package.json @@ -167,7 +167,7 @@ "scripts": { "doc": "docma -c docma-config.json --dest web/docs", "cleandoc": "rimraf web/docs && rimraf web/client/mapstore/docs", - "doctest": "docma -c docma-config.json --dest web/client/mapstore/docs && echo documentation is accessible from the mapstore/docs path when running start sript", + "doctest": "docma -c docma-config.json --dest web/client/mapstore/docs && echo documentation is accessible from the mapstore/docs path when running npm start", "postinstall": "node checkCesium.js && mkdirp ./web/client/libs/Cesium && download --extract --out ./web/client/libs/Cesium https://cesiumjs.org/releases/Cesium-1.17.zip || echo Cesium already installed", "clean": "rimraf ./web/client/dist", "compile": "npm run clean && mkdirp ./web/client/dist && webpack --progress --config prod-webpack.config.js", diff --git a/web/client/components/buttons/FullScreenButton.jsx b/web/client/components/buttons/FullScreenButton.jsx index 163677115a..51dd8b7fd0 100644 --- a/web/client/components/buttons/FullScreenButton.jsx +++ b/web/client/components/buttons/FullScreenButton.jsx @@ -1,4 +1,4 @@ -/** +/* * Copyright 2017, GeoSolutions Sas. * All rights reserved. * diff --git a/web/client/components/plugins/PluginsContainer.jsx b/web/client/components/plugins/PluginsContainer.jsx index 67de15e09f..bc7859af25 100644 --- a/web/client/components/plugins/PluginsContainer.jsx +++ b/web/client/components/plugins/PluginsContainer.jsx @@ -1,4 +1,4 @@ -/** +/* * Copyright 2016, GeoSolutions Sas. * All rights reserved. * From 9ea9d2f5fff67a6f5972596f6a0123f87bffa844 Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Thu, 13 Apr 2017 12:39:11 +0200 Subject: [PATCH 2/2] Fix #1723. Setup travis build for release (#1725) - This Fix #1723 allowing to run travis build to every release branch ( format YYYY.MM.mm) --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5acf78b502..4a46dbfa35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: node_js node_js: - 4 script: npm run travis -addons: +addons: firefox: latest before_install: - export DISPLAY=:99.0 @@ -12,3 +12,4 @@ before_install: branches: only: - master + - /^\d{4}\.\d{2}.\d{2}$/