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

Mezcla cambios anteriores a la rama

parent 44da07b5

.gitignore

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

.gitmodules.old

*.tar.gz

*.log

package.json

+22 −22
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ 
    "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",
@@ -68,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",

yarn.lock

+50 −140

File changed.

Preview size limit exceeded, changes collapsed.