Merge remote-tracking branch 'upstream/staging' into staging

Conflicts: Gemfile.lock app/assets/stylesheets/application.css.sass app/assets/stylesheets/themes/default.css.sass app/assets/stylesheets/themes/mixins.default.css.sass app/helpers/resources_helper.rb config/settings.yml
joegattnet · Oct 17, 2013 · 9c1cc22 · 9c1cc22
2 parents b837975 + f55da43
commit 9c1cc22
Show file tree

Hide file tree

Showing 40 changed files with 1,984 additions and 151 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 rvm:
-  - 2.0.0-p195
+  - 2.0.0
 
 script:
   - "rake db:migrate RAILS_ENV=test"

diff --git a/Gemfile b/Gemfile
@@ -33,7 +33,7 @@ gem 'nokogiri'
 gem 'oauth'
 gem 'omniauth'
 gem 'omniauth-evernote'
-gem 'paper_trail', github: 'airblade/paper_trail', branch: 'master'
+gem 'paper_trail', '>= 3.0.0.beta1'
 gem 'pjax_rails'
 gem 'rails-timeago'
 gem 'safe_yaml'
@@ -54,7 +54,7 @@ gem 'wikipedia-client'
 group :development do
   gem 'better_errors'
   gem 'binding_of_caller'
-  gem 'capistrano'
+  gem 'capistrano', '2.15.5'
   gem 'factory_girl_rails'
   gem 'flog'
   gem 'fuubar'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,20 +6,12 @@ GIT
     compass-rails (1.0.3)
       compass (>= 0.12.2, < 0.14)
 
-GIT
-  remote: git://github.com/airblade/paper_trail.git
-  revision: 548577711801af19c31125a0559eeafea2bcd58b
-  branch: master
-  specs:
-    paper_trail (3.0.0.beta1)
-      activerecord (>= 3.0, < 5.0)
-
 GIT
   remote: git://github.com/norman/friendly_id.git
-  revision: 495b5cd0b395a2eabb8b00bd244e589d99de105a
+  revision: 2764077e3af32a88114d68c75e20ef738e4fa829
   branch: master
   specs:
-    friendly_id (5.0.0.rc3)
+    friendly_id (5.0.0)
       activerecord (~> 4.0.0)
 
 GIT
@@ -32,7 +24,7 @@ GIT
 
 GIT
   remote: https://github.com/sferik/twitter.git
-  revision: a5aaf321fcdf40a576d3794aed5921322b87163a
+  revision: 035fe9eaffddca2c1c81b2a3b7c5775c80f762e6
   specs:
     twitter (5.0.0.rc.1)
       buftok (~> 0.1.0)
@@ -91,10 +83,12 @@ GEM
     buftok (0.1)
     builder (3.1.4)
     cancan (1.6.10)
-    capistrano (3.0.0)
-      i18n
-      rake (>= 10.0.0)
-      sshkit (>= 0.0.23)
+    capistrano (2.15.5)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.1.0)
     capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -176,9 +170,9 @@ GEM
       ruby-progressbar (~> 1.0)
     gmaps4rails (1.5.6)
     god (0.13.3)
-    guard (2.0.4)
+    guard (2.1.0)
       formatador (>= 0.2.4)
-      listen (~> 2.0)
+      listen (~> 2.1)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
@@ -192,9 +186,9 @@ GEM
       em-websocket (~> 0.5)
       guard (~> 2.0)
       multi_json (~> 1.8)
-    guard-rspec (3.1.0)
-      guard (>= 1.8)
-      rspec (~> 2.13)
+    guard-rspec (4.0.1)
+      guard (~> 2.0)
+      rspec (~> 2.14)
     guard-rubocop (1.0.0)
       guard (~> 2.0)
       rubocop (~> 0.10)
@@ -206,6 +200,7 @@ GEM
       guard (>= 1.1)
       spork (>= 0.8.4)
     hashie (2.0.5)
+    highline (1.6.20)
     hike (1.2.3)
     http (0.5.0)
       http_parser.rb
@@ -227,7 +222,7 @@ GEM
       addressable (~> 2.3)
     libnotify (0.8.2)
       ffi (>= 1.0.11)
-    listen (2.0.4)
+    listen (2.1.1)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -243,12 +238,16 @@ GEM
       subexec (~> 0.2.1)
     mini_portile (0.5.1)
     minitest (4.7.5)
-    multi_json (1.8.1)
+    multi_json (1.8.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
     net-ssh (2.7.0)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     oauth (0.4.7)
@@ -263,6 +262,8 @@ GEM
       oauth
       omniauth (~> 1.0)
     orm_adapter (0.4.0)
+    paper_trail (3.0.0.beta1)
+      activerecord (>= 3.0, < 5.0)
     parser (2.0.0)
       ast (~> 1.1)
       slop (~> 3.4, >= 3.4.5)
@@ -316,11 +317,11 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
+    rspec-core (2.14.6)
     rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-instafail (0.2.4)
-    rspec-mocks (2.14.3)
+    rspec-mocks (2.14.4)
     rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -337,8 +338,8 @@ GEM
       sexp_processor (~> 4.1)
     safe_yaml (0.9.7)
     sass (3.2.12)
-    sass-rails (4.0.0)
-      railties (>= 4.0.0.beta, < 5.0)
+    sass-rails (4.0.1)
+      railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
     settingslogic (2.0.9)
@@ -367,15 +368,11 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.0)
+    sprockets-rails (2.0.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     sqlite3 (1.3.8)
-    sshkit (1.0.0)
-      net-scp
-      net-ssh
-      term-ansicolor
     subexec (0.2.3)
     susy (1.0.9)
       compass (>= 0.12.2)
@@ -409,7 +406,7 @@ GEM
     vcr (2.6.0)
     warden (1.2.3)
       rack (>= 1.0)
-    webmock (1.14.0)
+    webmock (1.15.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
     whenever (0.8.4)
@@ -429,7 +426,7 @@ DEPENDENCIES
   binding_of_caller
   breadcrumbs_on_rails
   cancan
-  capistrano
+  capistrano (= 2.15.5)
   capybara
   coffee-rails
   compass-h5bp
@@ -470,7 +467,7 @@ DEPENDENCIES
   oauth
   omniauth
   omniauth-evernote
-  paper_trail!
+  paper_trail (>= 3.0.0.beta1)
   pg
   pjax_rails
   rails (= 4.0.0)

diff --git a/app/assets/javascripts/head_scripts.js b/app/assets/javascripts/head_scripts.js
@@ -0,0 +1,7 @@
+// This is a manifest for javascripts that need to be in the head section of your layouts.
+// Only modernizr and polyfills should be here. Anything else should delay initialization until after window.onload.
+//
+//  modernizer.minimal or modernizer.dev or customise your own at http://modernizr.com/download
+//= require modernizr.minimal
+//= require gmaps4rails/gmaps4rails.base
+//= require gmaps4rails/gmaps4rails.googlemaps
diff --git a/app/assets/javascripts/nembrot.document.js.coffee b/app/assets/javascripts/nembrot.document.js.coffee
@@ -38,7 +38,7 @@ _place_annotations_do = () ->
   annotations.each (i) ->
     new_top = $('a[id=annotation-mark-' + (i + 1) + ']').offset().top
     corrected_top = (if new_top <= minimum then minimum else new_top)
-    minimum = new_top + $(this).outerHeight(true)
+    minimum = corrected_top + $(this).outerHeight(true)
     $(this).offset top: corrected_top
 
   maximum = $('#text').offset().top + $('#text').outerHeight(false)
@@ -58,13 +58,24 @@ _media_query = (media_query_string) ->
     style = style.content.replace /"/g, ''
   style is media_query_string
 
+reload_shares = () ->
+  FB.XFBML.parse()
+  gapi.plusone.go()
+  twttr.widgets.load()
+
+fix_facebook_dialog = () ->
+  $('.fb-like span').css('width', $('.fb-like').data('width'))
+  alert('innit')
+
+
 # Document hooks ******************************************************************************************************
 
 $ ->
   document_initializers()
 
 $(document).on 'pjax:end', ->
   content_initializers()
+  content_initializers_reload_only()
 
 $(window).on 'resize', ->
   resize_initializers()
@@ -83,6 +94,9 @@ document_initializers = () ->
   $(document).on 'mousedown', "a[href$='.pdf'], a[href$='.zip']", (event) ->
     track_download(this.href.toString().replace(/^https?:\/\/([^\/?#]*)(.*$)/, '$2'), 'Download', this.text, event.which)
 
+  $(document).on 'click', '.fb-like', ->
+    fix_facebook_dialog()
+
   content_initializers()
 
 content_initializers = () ->
@@ -91,5 +105,8 @@ content_initializers = () ->
   track_page_view()
   resize_initializers()
 
+content_initializers_reload_only = () ->
+  reload_shares()
+
 resize_initializers = () ->
   place_annotations()
diff --git a/app/assets/javascripts/polyfills.js b/app/assets/javascripts/polyfills.js