From c5b6cacb42327305c8c91a3317d4502f85c7fb2f Mon Sep 17 00:00:00 2001
From: xavijam <xavijam@gmail.com>
Date: Fri, 11 Oct 2013 17:33:11 +0200
Subject: [PATCH 1/2] fixed pulse animation for safari browser :(

---
 app/assets/stylesheets/common                                 | 2 +-
 .../cartodb/table/header/views/sync_info_content.jst.ejs      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/common b/app/assets/stylesheets/common
index a23895888d87..791e214c1fdc 160000
--- a/app/assets/stylesheets/common
+++ b/app/assets/stylesheets/common
@@ -1 +1 @@
-Subproject commit a23895888d87787161bf89c7fcf62072442d4192
+Subproject commit 791e214c1fdcff465d0c053ac1453c8a79af99ec
diff --git a/lib/assets/javascripts/cartodb/table/header/views/sync_info_content.jst.ejs b/lib/assets/javascripts/cartodb/table/header/views/sync_info_content.jst.ejs
index 8e20ca25da6d..5dc9934ddc14 100644
--- a/lib/assets/javascripts/cartodb/table/header/views/sync_info_content.jst.ejs
+++ b/lib/assets/javascripts/cartodb/table/header/views/sync_info_content.jst.ejs
@@ -1,5 +1,7 @@
 <span class="sync <%= state %>">
-  <span class="circle"></span>
+  <div class="circle">
+    <span class="pulse"></span>
+  </div>
   <p>
     <% if (state != "failure") { %>
       synced

From 3062988b193362808f87e0cf183b94640ee3e761 Mon Sep 17 00:00:00 2001
From: Lorenzo Planas <lorenzo.planas@gmail.com>
Date: Fri, 11 Oct 2013 17:55:47 +0200
Subject: [PATCH 2/2] CDB-210 #resolve Use cookies when downloading files

---
 services/importer/lib/importer/downloader.rb  | 19 +++++++++++++++----
 .../importer/url_translator/google_docs.rb    |  4 ++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/services/importer/lib/importer/downloader.rb b/services/importer/lib/importer/downloader.rb
index 222e2cdcc8f5..9474888ef169 100644
--- a/services/importer/lib/importer/downloader.rb
+++ b/services/importer/lib/importer/downloader.rb
@@ -77,14 +77,25 @@ def raise_if_over_storage_quota(headers, available_quota_in_bytes=nil)
           content_length_from(headers) > available_quota_in_bytes.to_i
       end
 
+      def typhoeus_options
+        {
+          cookiefile:     cookiejar,
+          cookiejar:      cookiejar,
+          followlocation: true
+        }
+      end 
+
       def headers
-        @headers ||=
-          Typhoeus.head(translate(url), followlocation: true).headers
+        @headers ||= Typhoeus.head(translate(url), typhoeus_options).headers
+      end
+
+      def cookiejar
+        repository.fullpath_for("#{seed}_cookiejar")
       end
 
       def download
-        Typhoeus.get(translate(url), followlocation: true)
-       end
+        Typhoeus.get(translate(url), typhoeus_options)
+      end
 
       def name_from(headers, url)
         name_from_http(headers) || name_in(url)
diff --git a/services/importer/lib/importer/url_translator/google_docs.rb b/services/importer/lib/importer/url_translator/google_docs.rb
index 8869b8e10682..997e8a3e4992 100644
--- a/services/importer/lib/importer/url_translator/google_docs.rb
+++ b/services/importer/lib/importer/url_translator/google_docs.rb
@@ -10,8 +10,8 @@ class GoogleDocs
 
         def translate(url)
           return url if !supported?(url) || translated?(url) 
-          return url.gsub(%r{#gid=\d+}, '') 
-            .gsub(%r{spreadsheet/ccc}, 'spreadsheet/pub') + "&output=csv"
+          return url.gsub(%r{#gid=\d+}, '') + "&output=csv"
+          # .gsub(%r{spreadsheet/ccc}, 'spreadsheet/pub') 
         end #translate
 
         def supported?(url)