Commit f59fbe81 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'feature-updateMerge' into dev

parents dd7d4508 dbc37b86

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ dist 
test_reports

.gitmodules.old

*.tar.gz

*.log

grunt/config/cleanBuiltApp.js

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ module.exports = function(grunt) { 


	var directoriesToDelete = [

		'alertify', 'awesome-markers', 'cbtree', 'd3', 'd3Tip', 'dijit', 'dojo', 'dojox', 'deepmerge', 'dropzone',

		'dstore', 'handlebars', 'L-areaselect', 'L-coordinates', 'L-draw', 'L-miniMap', 'L-navBar', 'leaflet',

		'handlebars', 'L-areaselect', 'L-coordinates', 'L-draw', 'L-miniMap', 'L-navBar', 'leaflet',

		'leaflet-measure', 'leaflet-nontiledlayer', 'mediatorjs', 'moment', 'node-uuid', 'proj4js', 'pruneCluster',

		'put-selector', 'redmic', 'RWidgets', 'sockjs', 'stompjs', 'templates', 'tv4', 'wicket'

	];

package.json

+42 −43
Original line number Diff line number Diff line
@@ -29,37 +29,36 @@ 
    "start": "node app"

  },

  "dependencies": {

    "commander": "^2.20.3",

    "express": "^4.17.1",

    "morgan": "^1.10.0",

    "prom-client": "^11.5.3",

    "pug": "^3.0.2",

    "response-time": "^2.3.2",

    "winston": "^2.4.5"

    "commander": "2.20.3",

    "express": "4.17.1",

    "morgan": "1.10.0",

    "prom-client": "11.5.3",

    "pug": "3.0.2",

    "response-time": "2.3.2",

    "winston": "2.4.5"

  },

  "devDependencies": {

    "alertifyjs": "^1.13.1",

    "alertifyjs": "1.13.1",

    "cbtree": "https://github.com/pjekel/cbtree.git#master",

    "color-js": "^1.0.5",

    "d3": "^5.16.0",

    "d3-tip": "^0.7.1",

    "deepmerge": "^3.3.0",

    "dijit": "1.13.0",

    "dojo": "^1.17.2",

    "dojo-dstore": "^1.2.1",

    "dojo-util": "^1.17.2",

    "dojox": "^1.17.2",

    "draggabilly": "^2.4.1",

    "dropzone": "^5.9.3",

    "glob": "^8.0.1",

    "grunt": "^1.5.2",

    "grunt-contrib-clean": "^2.0.1",

    "grunt-contrib-copy": "^1.0.0",

    "grunt-contrib-jshint": "^3.2.0",

    "grunt-contrib-uglify": "^5.2.1",

    "grunt-force-task": "^3.0.0",

    "grunt-git": "^1.1.1",

    "grunt-shell": "^4.0.0",

    "color-js": "1.0.5",

    "d3": "5.16.0",

    "d3-tip": "0.7.1",

    "deepmerge": "3.3.0",

    "dijit": "1.17.2",

    "dojo": "1.17.2",

    "dojo-util": "1.17.2",

    "dojox": "1.17.2",

    "draggabilly": "2.4.1",

    "dropzone": "5.4.0",

    "glob": "8.0.1",

    "grunt": "1.5.2",

    "grunt-contrib-clean": "2.0.1",

    "grunt-contrib-copy": "1.0.0",

    "grunt-contrib-jshint": "3.2.0",

    "grunt-contrib-uglify": "5.2.1",

    "grunt-force-task": "3.0.0",

    "grunt-git": "1.1.1",

    "grunt-shell": "4.0.0",

    "gulp": "^2.7.0",

    "gulp-cli": "^2.2.0",

    "handlebars": "^4.0.11",
@@ -69,27 +68,27 @@ 
    "leaflet": "^1.3.0",

    "leaflet-areaselect": "https://github.com/heyman/leaflet-areaselect.git#master",

    "leaflet-awesome-markers": "https://github.com/lennardv2/Leaflet.awesome-markers.git#2.0/develop",

    "leaflet-draw": "^1.0.2",

    "leaflet-measure": "^2.1.7",

    "leaflet-minimap": "^3.6.1",

    "leaflet-draw": "1.0.2",

    "leaflet-measure": "2.1.7",

    "leaflet-minimap": "3.6.1",

    "leaflet-navbar": "https://github.com/davidchouse/Leaflet.NavBar.git#master",

    "leaflet.coordinates": "^0.1.5",

    "leaflet.nontiledlayer": "^1.0.9",

    "load-grunt-tasks": "^4.0.0",

    "mediator-js": "^0.11.0",

    "moment": "^2.22.1",

    "nib": "^1.1.2",

    "leaflet.coordinates": "0.1.5",

    "leaflet.nontiledlayer": "1.0.9",

    "load-grunt-tasks": "4.0.0",

    "mediator-js": "0.11.0",

    "moment": "2.22.1",

    "nib": "1.1.2",

    "node-uuid": "https://github.com/kelektiv/node-uuid.git#v1.4.7",

    "packery": "^2.1.1",

    "packery": "2.1.1",

    "pdfjs": "https://github.com/mozilla/pdf.js.git#v2.3.200",

    "prunecluster": "https://github.com/pedroetb/PruneCluster.git",

    "put-selector": "^0.3.6",

    "sockjs-client": "^1.1.4",

    "put-selector": "0.3.6",

    "sockjs-client": "1.1.4",

    "stompjs": "https://github.com/jmesnil/stomp-websocket.git#master",

    "stylus": "^0.54.8",

    "stylus": "0.54.8",

    "tv4": "https://github.com/geraintluff/tv4.git#master",

    "uglify-js": "^3.3.24",

    "wicket": "^1.3.6"

    "uglify-js": "3.3.24",

    "wicket": "1.3.6"

  },

  "engines": {

    "node": ">=6.0",

public/javascript/dojoConfig.js

+0 −3
Original line number Diff line number Diff line
@@ -11,9 +11,6 @@ dojoConfig = { 
	},{

		name: 'app',

		location: '../app'

	},{

		name: 'dstore',

		location: '../dstore'

	},{

		name: 'put-selector',

		location: '../put-selector'

public/javascript/dstore

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../../node_modules/dojo-dstore
 
 No newline at end of file