Commit Graph

698 Commits (2bb71eca80adcc3a97ce784240749156fc223be2)

Author SHA1 Message Date
Javier Arce a427e5ae22 Adds colorpicker
8 years ago
xavijam aa207b0336 Added Backbone-undo and start using it for style definition model
8 years ago
Carlos Matallín 0a7cf59e34 Merge branch 'master' into 7375-infowindow-form
8 years ago
Carlos Matallín a8d3d116be infowindows: move layer definition model save to fields view
8 years ago
Nicklas Gummesson 52ed4753f1 Bump frontend assets version
8 years ago
Carlos Matallín dcdb776870 Merge branch 'master' into infowindows3
8 years ago
Javier Arce 616be3f8e4 Bump front
8 years ago
Javier Arce ed5f10f4cb Bump frontend
8 years ago
Javier Arce d0fb144a3e Adds colorpicker
8 years ago
Carlos Matallín aa46b39e1c infowindows: fix broken spec
8 years ago
Buti 6c871314ba Merge pull request #7341 from CartoDB/7327-custom-select-keys
8 years ago
nobuti 2954ba6d62 Bumped version.
8 years ago
Raul Ochoa 83d37f8958 Remove factor-bundle plugin
8 years ago
Raul Ochoa f7a4fe68a4 cartoassets as dev dependency as it's not require'd
8 years ago
xavijam 6b98026b17 Package version change done
8 years ago
Carlos Matallín 618273e5b6 Merge branch 'master' into infowindows3
8 years ago
Nicklas Gummesson b6ca5ca374 Bump frontend assets version
8 years ago
Carlos Matallín 6d18cf6d73 Merge branch 'master' into infowindows3
8 years ago
Raul Ochoa 13ef5ca809 Merge remote-tracking branch 'origin/master' into split-editor-bundles
8 years ago
xavijam d08292d575 New package version + cartodb.js version updated
8 years ago
xavijam 2ab507d3fb Package.json version updated
8 years ago
Carlos Matallín 2fd93a5d6f Merge branch 'master' into infowindows3
8 years ago
xavijam 0765cfc71c Merged with master
8 years ago
xavijam 44f36d034e Updated
9 years ago
Raul Ochoa 0b096f41df Use factor-bundle to extract common deps for editor bundles
9 years ago
Raul Ochoa b4ec2a6294 Upgrade browserify deps to use factor-bundle
9 years ago
xavijam 132831afd0 Updated trade areas analysis with new parameters, isolines and dissolved
9 years ago
Juan Ignacio Sánchez Lara c94e875364 package.json
9 years ago
Carlos Matallín 9fd47afa58 http => https
9 years ago
Carlos Matallín 235d22cfb7 infowindow: style
9 years ago
Carlos Matallín 6adef2f95f Merge branch 'master' into infowindows3
9 years ago
piensaenpixel 981cd33ad3 bump package version
9 years ago
xavijam da21fac1fa Merge branch 'issue-7256' of github.com:CartoDB/cartodb into issue-7256
9 years ago
Javier Álvarez Medina b1a805ce12 Bumped version again
9 years ago
xavijam 19a569cc79 Getting element size with getBoundingClientRect
9 years ago
Javier Arce ac3c333458 Bump frontend version
9 years ago
Javier Arce 3a3eb14eac Merge branch 'master' into 7016-migrate-background-importer
9 years ago
Javier Arce 0c9229a0db Bump frontend version
9 years ago
Raul Ochoa 30aae404bc Merge pull request #7232 from CartoDB/fix-dependencies
9 years ago
Javier Arce 91e493a746 Merge branch 'master' into 7016-migrate-background-importer
9 years ago
Raul Ochoa 3b42915791 Use DI master branch
9 years ago
Raul Ochoa 77246919e9 Be more specific about what we want to dedupe with browserify-resolutions
9 years ago
Raul Ochoa 8c445fa60d Do not use --dev in shrinkwrap generation
9 years ago
Raul Ochoa d155bbd2c4 Remove resolutions plugin
9 years ago
Raul Ochoa e9505629aa Reuse existing dep queue-async
9 years ago
Raul Ochoa 5832624514 Use branch not extending cartodb.js
9 years ago
Raul Ochoa b84e4cea0d Move to dep
9 years ago
Raul Ochoa 27d90bdd98 Split dependencies from dev dependencies
9 years ago
Carlos Matallín 05391f05cb infowindows: layerInfowindowModel
9 years ago
Carlos Matallín 916788d1e0 Merge branch 'master' of github.com:CartoDB/cartodb
9 years ago