Commit Graph

624 Commits (c683f4390f715cca2fcc896fddcd92a1917ba679)

Author SHA1 Message Date
xavijam f1fec782e6 First part of import panes migrated
9 years ago
xavijam c89377c47d Making markdown available as browserify module
9 years ago
xavijam 242614e880 Changed moment global require name
9 years ago
xavijam d249c09040 New package version
9 years ago
xavijam 8012009233 Added backbone-model-file-upload as a npm module
9 years ago
xavijam 5444d4cf05 Added tipsy for editor-3
9 years ago
xavijam e31bffad4d Package.json version updated
9 years ago
Nicklas Gummesson 3bb98eb3a5 Merge remote-tracking branch 'origin/master' into 6918-integrate-analysis-api
9 years ago
xavijam 5aee4544ba Adding point-in-polygon analysis
9 years ago
xavijam 396a8c211d Merge branch 'master' into issue-6859
9 years ago
Nicklas Gummesson 57e136a61c Merge remote-tracking branch 'origin/master' into 6918-integrate-analysis-api
9 years ago
Nicklas Gummesson de47894fad Update source map support
9 years ago
xavijam bb3d34218a New package version added
9 years ago
Nicklas Gummesson caa9960cf5 Merge remote-tracking branch 'origin/master' into 6918-integrate-analysis-api
9 years ago
Javier Arce 91c89c5c82 Merge branch 'master' into 6784-layer-interaction
9 years ago
Nicklas Gummesson bbf65b58df Use WIP branches
9 years ago
Nicklas Gummesson 6d4bdf8a3f Add other ow owned libs to the update script
9 years ago
Nicklas Gummesson 6eb06291f2 Add script to update internal deps
9 years ago
Javier Arce 18b8a45001 merged with master
9 years ago
xavijam 18d5a02d4a Conflicts with master fixed
9 years ago
xavijam 5f2fa8c169 Updated package json and shrinkwrap
9 years ago
xavijam 6490fd6042 Fixing dependencies problem
9 years ago
xavijam d29152b388 Merged with master
9 years ago
xavijam b67fd938a3 Updated deep-insights and cartodb.js dependencies
9 years ago
Javier Arce 217d735832 Merge branch 'master' into 6784-layer-interaction
9 years ago
xavijam 0fa02fd61a Adding jQuery-UI as dependency + new version
9 years ago
Francisco Dans 00467d7108 Merge pull request #6893 from CartoDB/160316update
9 years ago
Javier Arce 852f8765b5 Adds jQuery-ui library
9 years ago
Francisco Dans 7d6ceb46f0 uses previous reference format
9 years ago
Francisco Dans 38ca7f9f9d puts in cartodb.js hash that matches deep insights
9 years ago
Francisco Dans bb5b1fa8ac resolves conflicts
9 years ago
Francisco Dans 76af9c872b updates deps in package.json
9 years ago
María Checa 926fabece8 Updated package.json version
9 years ago
Nicklas Gummesson df643ab1ad Merge remote-tracking branch 'origin/master' into 6780-persist-analysis-camshaft-ref
9 years ago
xavijam bdcb6add09 Updating dependencies
9 years ago
Nicklas Gummesson 3dac1ae9b6 Integrate camshaft reference
9 years ago
María Checa 5ec9b99184 Package.json version updated
9 years ago
María Checa f99678dcd8 Changed package.json version
9 years ago
xavijam 1792c2d265 Updated again dependencies
9 years ago
xavijam 6ef114ddeb Updating package.json + shrinkwrap
9 years ago
Carlos Matallín 444b0569d0 explore: update description, keywords, and h1
9 years ago
xavijam 2f257f4bc8 Updating package json + shrinkwrap
9 years ago
Javier Álvarez Medina 5639404f4c Merge pull request #6828 from CartoDB/update-cdb-deep-insights-dependencies
9 years ago
xavijam 751694005d Updated CartoDB.js + shrinkwrap
9 years ago
Javier Arce ceed5a9aea Bump frontend assets version
9 years ago
Nicklas Gummesson 72560251a1 Bump frontend assets version
9 years ago
xavijam 101814621a Fixing problem with geocoding icon + updating NEWs
9 years ago
xavijam 331fd3e545 Updating package version
9 years ago
xavijam bf74045a18 Updating CartoDB.js and Deep-insights dependencies
9 years ago
Nicklas Gummesson 1e64b13777 Bump frontend assets version
9 years ago