conflicts solved

.gitignore

@@ -15,3 +15,5 @@ Gemfile.lock
 test/SpecRunner.html
 .rvmrc
 .idea/
+themes/css/cartodb.css
+cartodb.js-bower/

Gruntfile.js

@@ -4,15 +4,24 @@
  *  framework
  *
  */
-
-
 module.exports = function(grunt) {
-  
+
   require('load-grunt-tasks')(grunt);
   require('time-grunt')(grunt);
+  var semver = require('semver');
 
   var pkg = grunt.file.readJSON('package.json');
+
+  if (!pkg.version || !semver.valid(pkg.version)) {
+    grunt.fail.fatal('package.json version is not valid' , 1);
+  }
+
   var version = pkg.version.split('.');
+  var VERSION_OBJ =  {
+      major:      version[0],
+      minor:      version[0] + '.' + version[1],
+      bugfixing:  pkg.version
+   }
 
   var config = {
     dist: 'dist',
@@ -22,11 +31,20 @@ module.exports = function(grunt) {
       minor:      version[0] + '.' + version[1],
       bugfixing:  pkg.version
     },
-    pkg:  pkg
+    pkg: pkg
   };
 
   grunt.initConfig({
+    secrets: {},
     config: config,
+    dist: 'dist',
+    app:  'www',
+    version: {
+      major:      version[0],
+      minor:      version[0] + '.' + version[1],
+      bugfixing:  pkg.version
+    },
+    pkg:  pkg,
     gitinfo: {},
     s3: require('./grunt/tasks/s3').task(grunt, config),
     prompt: require('./grunt/tasks/prompt').task(grunt, config),
@@ -87,6 +105,7 @@ module.exports = function(grunt) {
   grunt.registerTask('test', [ 'jasmine' ]);
 
   grunt.registerTask('release', [
+    'prompt:bump',
     'build'
   ]);
 
@@ -96,7 +115,7 @@ module.exports = function(grunt) {
       grunt.fail.fatal('secrets.json file does not exist, copy secrets.example.json and rename it' , 1);
     }
 
-    // Read secrets 
+    // Read secrets
     grunt.config.set('secrets', grunt.file.readJSON('secrets.json'));
 
     if (
@@ -114,12 +133,35 @@ module.exports = function(grunt) {
     ]);
   });
 
+  grunt.registerTask('set_current_version', function() {
+    var version = pkg.version;
+    var minor = version.split('.');
+    minor.pop()
+    minor = minor.join('.');
+    var options = {
+      version: version,
+      minor: minor,
+      increment: 'build',
+      bugfixing: version
+    };
+
+    // Check if version was set via prompt, and
+    // use that version and not the package version
+    var bump = grunt.config.get('bump');
+    if (bump) {
+      options = bump;
+      options.bugfixing = bump.version;
+    }
+
+    grunt.config.set('bump', options);
+  });
+
   grunt.registerTask('invalidate', function(){
     if (!grunt.file.exists('secrets.json')) {
       grunt.fail.fatal('secrets.json file does not exist, copy secrets.example.json and rename it' , 1);
     }
 
-    // Read secrets 
+    // Read secrets
     grunt.config.set('secrets', grunt.file.readJSON('secrets.json'));
 
     if (!grunt.config('secrets') ||
@@ -137,29 +179,37 @@ module.exports = function(grunt) {
   grunt.registerTask('pages', [ 'buildcontrol:pages' ]);
 
   grunt.registerTask('build', [
-      'prompt:bump',
-      'replace',
-      'gitinfo',
-      'clean:dist',
-      'concurrent:dist',
-      'useminPrepare',
-      'concat',
-      'autoprefixer:dist',
-      'cssmin',
-      'copy:distStatic',
-      'imagemin',
-      'svgmin',
-      'filerev',
-      'usemin',
-      'htmlmin',
-      'uglify'
+    'dist_js',
+    'useminPrepare',
+    'cssmin',
+    'imagemin',
+    'svgmin',
+    'filerev',
+    'usemin',
+    'htmlmin',
+    'uglify'
+  ]);
+
+  grunt.registerTask('dist_js', [
+    'set_current_version',
+    'js'
+  ])
+
+  grunt.registerTask('js', [
+    'replace',
+    'gitinfo',
+    'clean:dist',
+    'concurrent:dist',
+    'concat',
+    'autoprefixer:dist'
   ]);
 
   grunt.registerTask('dist', [
+    'set_current_version',
     'build'
   ]);
 
   grunt.registerTask('default', [
-    'build'
+    'dist'
   ]);
-}
+}

Makefile

@@ -48,6 +48,9 @@ dist/cartodb.noleaflet.js: dist/_cartodb_noleaflet.js
 	$(UGLIFYJS) dist/_cartodb_noleaflet.js > dist/cartodb.noleaflet.js
 	rm dist/_cartodb_noleaflet.js
 
+dist/cartodb.mod.odyssey.uncompressed.js:
+	grunt dist_js
+
 dist/cartodb.css: css
 	cp themes/css/cartodb.css dist
 
@@ -80,7 +83,7 @@ publish_develop: release
 	#./scripts/publish.sh
 	node scripts/publish.js --current_version
 
-cartodb: dist/cartodb.full.uncompressed.js dist/cartodb.mod.torque.uncompressed.js
+cartodb: dist/cartodb.mod.torque.uncompressed.js dist/cartodb.mod.odyssey.uncompressed.js dist/cartodb.full.uncompressed.js
 
 
 

NEWS

@@ -1,3 +1,136 @@
+3.X ()
+
+3.15.2 (01//09//2015)
+* Take `visible` attribute into account when determining visibility of layers and serializing maps (#546)
+* Only show legends if the layer is visible (#651)
+* Extracted pecan code to separate module, https://github.com/CartoDB/pecan/ (#649,#654)
+* Search control will show the result of the search with a pin and infowindow (cartodb/#4914).
+
+3.15 (24//06//2015)
+* cartodb.js knows how to work with multiple types of sublayers (#508):
+  * cartodb.createLayer accepts a `filter` option to specify wich types of layers must
+    be rendered in the tiles. WARNING: all non-torque layers will be rendered by default.
+  * cartodb.js uses metadata from Windshaft to determine what layers are present in the
+    map and specify the layer indexes in the tile URLs. More about this
+    [here](https://github.com/CartoDB/Windshaft-cartodb/blob/488c2462229474db21ba40b61a93edf83e6493b5/docs/Map-API.md#blending-and-layer-selection)
+  * New subclasses of SubLayer for different types of sublayers.
+* Handle hidden layers properly when fetching attributes from tiler
+* Make the torque slider have the correct range every time it changes
+* Remove check for http-beginng vizjson addresses
+* Use local time in timeslider instead of UTC
+* New sublayer.isVisible() function
+* `cartodb.createLayer` selects the first data layer instead of assuming that it's in position 1
+
+3.14.6 (16//06//2015)
+* Use the right indexes when fetching grids and attributes (#518)
+
+3.14.4 (10//06//2015)
+* Do not enable layer interaction if tooltip is empty (#513)
+* Replaces minified carto.js with uncompressed version (#516)
+
+3.14.3 (29//05//2015)
+* Hide <img> tag of infowindow covers when the url is invalid.
+* Expose legend model in sublayers/layers so that users can customize legends (#480).
+* Handle tooltip overflow (#482).
+* Only show tooltips when they have fields (#486).
+* Updated Torque to 2.11.3
+* Fix scrolling of infowindows with images (#490).
+* Fix dropdown bind events not being unbound on clean (#493)
+
+3.14.2 (06//05//2015)
+* Allow to specify a template for the items of a custom legend.
+* The NOKIA geocoder doesn't encode the whitespaces anymore.
+* Adds documentation for the Static Map API
+
+3.14.1 (30//04//2015)
+* Fixes a bug that prevented setting the maxZoom and minZoom of a map.
+* Updates Torque to 2.11.2
+
+3.14.0 (23//04//2015)
+* Infowindow in anonymous maps are requested by attributes endpoint in maps api so SQL API is not used anymore
+* Changed the way remote host is set for maps and sql API.
+* Fixed error management when map instanciation fails
+* Instead of showing a single date, Torque's timeslider shows the date range that a single step comprises.
+* Fixed enabling or disabling the torque loop property not working from cartodb.js
+* Allows to specify a step when generating a static map of a Torque layer
+* Deprecation warning:
+    - tiler_host, tiler_prototol, tiler_port, sql_api_domain, sql_api_protocol are deprecated, use sql_api_template and maps_api_template instead. https://github.com/CartoDB/cartodb.js/blob/develop/doc/API.md#how-to-set-a-different-host-than-cartodbcom
+
+3.13.3 (09//04//2015)
+* Fixes default styles for header titles in infowindows.
+
+3.13.2 (07//04//2015)
+* Fix double escaping on infowindows
+* Fix a-tag's target attribute not working
+
+3.13.1 (06//04//2015)
+* Allows to request a Static Map of a password protected visualization
+
+3.13.0 (31//03//2015)
+* Breaking Changes
+  - Sanitize output by default (#2972), see doc change and example below how to override:
+    - docs: https://github.com/CartoDB/cartodb.js/blob/v3.13.0/doc/API.md#arguments-11
+    - example: https://github.com/CartoDB/cartodb.js/blob/v3.13.0/examples/infowindow_with_graph.html
+
+3.12.14 (30//03//2015)
+- Fixes fullscreen button is throwing errors (#412)
+- Updates Torque.js to 2.11
+
+3.12.13 (18//03//2015)
+- Changes how infowindows handle null values (#406)
+- Updates the version of wax and upgrades mustache.js to v1.1.0 (403)
+- Fixes a bug with fullscreen in Safari (#361)
+
+3.12.12 (12//03//2015)
+- Fixes a bug that prevented generating previews of torque layers with named maps
+
+3.12.11 (04//03//2015)
+- LayerDefinition now trusts the tiler and uses whatever CDN configuration it gets (or nothing, if cdn_url is empty).
+- Fixes bootstrap collisions (#87, #107)
+
+3.12.10 (02//03//2015)
+- Don't send the urlTemplate to generate a Static Map if we don't have it.
+- Disables the CDN if the server doesn't send us the configuration.
+
+3.12.9 (26//02//2015)
+- Updates Static Map module to use the CDN URL from the layergroup.
+
+3.12.8 (26//02//2015)
+- Allows to override the default use of the bounding box to generate an image, using the center instead.
+- Fixes the static map module to avoid using hidden layers to generate images.
+- Extracts the CDN host configuration from the vizjson.
+- Removes cdbui bower dependency.
+
+3.12.7 (23//02//2015)
+- By default we now serve the Static API images through CartoDB's CDN.
+
+3.12.6 (23//02//2015)
+- Fixes mobile and IE interaction issues (#346, #313, #223, #139).
+
+3.12.5 (20//02/2015)
+- Fixes request to generate an image when the vizjson contains a named map and a torque layer with a named map
+
+3.12.4 (18//02/2015)
+- Fixes leaflet point generation on events when using touch devices
+
+3.12.3 (17//02/2015)
+- Fixes a case were having an empty bbox would end up generatign an erroneous bounding box URL.
+
+3.12.2 (17//02/2015)
+- Fixes error generating a map preview of a visualization with a torque layer.
+- Fixed use of https parameter in torque layer
+- Fixed change of play/pause state in timeslider
+- Fixed legend values named 0 being evaluated as NULL
+
+3.12.1 (13//02/2015)
+- Allows to force the https protocol when requesting a vizjson to generate a static image
+
+3.12.0 (09//02/2015)
+- Added Odyssey support for visualizations
+- Adds new API to generate static images (https://github.com/CartoDB/cartodb.js/wiki/CartoDB-Map-API)
+- Fixes the hiding of the tile loader in mobile
+- Adds heatmap support for torque
+
 3.11.36 (09//02//2014)
 - Fixes slider style problem in narrower devices.
 
@@ -10,13 +143,13 @@
 3.11.33 (05//02//2014)
 - Fixes tooltip style.
 
-3.11.32 (29//01//2014)
+3.11.32 (29//01//2015)
 - Fixed touch events on mobile (Android)
 
-3.11.31 (23//01//2014)
+3.11.31 (23//01//2015)
 - #291 - Removes padding and margin reset for webkit browsers
 
-3.11.30 (13//01//2014)
+3.11.30 (13//01//2015)
 - #264 - Fix addTo (when the second param specifies index)
 
 3.11.29 (30//12//2014)
@@ -27,8 +160,8 @@
 - #255 - Adds new fonts for the overlays
 
 3.11.27 (19//12//2014)
-- #245 - Fixed a bug with error messages named map instantiation 
-- #224 - Public method close infowindow 
+- #245 - Fixed a bug with error messages named map instantiation
+- #224 - Public method close infowindow
 
 3.11.26 (17//12//2014)
 - #235 - Allows to use the input fields in fullscreen on Chrome
@@ -55,7 +188,7 @@
 - fixes a bug that made the hidden Torque layers visible
 
 3.11.21 (24//10//2014)
-- enabled dynamic_cdn to route layergroup calls though the CDN
+- enabled dynamic_cdn to route layergroup calls through the CDN
 
 3.11.20 (24//10//2014)
 - enabled fixed callback for layergroups and infowindows
@@ -109,7 +242,7 @@
 - Fixed problem breaking words in infowindow content.
 
 3.11.06 (12//09/2014)
-- Fixed problem in infowindow showing horizontal scrollbar when it was not needed 
+- Fixed problem in infowindow showing horizontal scrollbar when it was not needed
 - Fixed creating search overlay
 
 3.11.05 (20//08/2014)
@@ -247,9 +380,9 @@
 - fixed problems with infowindow when there are hidden layers
 
 3.7.04 (27//02//2014)
-- fixed layer update in gmaps 
-- when jsonp is used errors are not reported to the layer 
-- updated torque, fix problem with some cartocss options (step) 
+- fixed layer update in gmaps
+- when jsonp is used errors are not reported to the layer
+- updated torque, fix problem with some cartocss options (step)
 
 3.7.03 (25//02//2014)
 - Fixed https in torque tiles