Skip to content

Commit

Permalink
Updated gems, changed some bootstrap-files.
Browse files Browse the repository at this point in the history
  • Loading branch information
philipp committed May 7, 2013
1 parent 789f802 commit 1da6eeb
Show file tree
Hide file tree
Showing 21 changed files with 26 additions and 28 deletions.
54 changes: 26 additions & 28 deletions Gemfile.lock
Expand Up @@ -14,9 +14,9 @@ GIT


GIT GIT
remote: git://github.com/ryanb/nested_form.git remote: git://github.com/ryanb/nested_form.git
revision: 731b5b0b83d5eff051ccae65d2eb8c79960bc725 revision: a25eebe8205e4e63899873b716535def6c1f5a9d
specs: specs:
nested_form (0.3.1) nested_form (0.3.2)


GIT GIT
remote: git://github.com/tsujigiri/mendeley.git remote: git://github.com/tsujigiri/mendeley.git
Expand Down Expand Up @@ -75,14 +75,13 @@ GEM
bartt-ssl_requirement (1.4.2) bartt-ssl_requirement (1.4.2)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1)
builder (3.0.4) builder (3.0.4)
capistrano (2.14.2) capistrano (2.15.4)
highline highline
net-scp (>= 1.0.0) net-scp (>= 1.0.0)
net-sftp (>= 2.0.0) net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14) net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0) net-ssh-gateway (>= 1.1.0)
celluloid (0.12.4) celluloid (0.13.0)
facter (>= 1.6.12)
timers (>= 1.0.0) timers (>= 1.0.0)
climate_control (0.0.3) climate_control (0.0.3)
activesupport (>= 3.0) activesupport (>= 3.0)
Expand All @@ -98,13 +97,12 @@ GEM
debugger-ruby_core_source (1.2.0) debugger-ruby_core_source (1.2.0)
dynamic_form (1.1.4) dynamic_form (1.1.4)
erubis (2.7.0) erubis (2.7.0)
facter (1.6.18)
factory_girl (4.2.0) factory_girl (4.2.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
fitgem (0.6.1) fitgem (0.6.1)
oauth oauth
highline (1.6.16) highline (1.6.18)
hike (1.2.1) hike (1.2.2)
i18n (0.6.1) i18n (0.6.1)
journey (1.0.4) journey (1.0.4)
jquery-rails (2.2.1) jquery-rails (2.2.1)
Expand All @@ -119,19 +117,19 @@ GEM
activesupport activesupport
rest-client (>= 1.3.0) rest-client (>= 1.3.0)
metaclass (0.0.1) metaclass (0.0.1)
mime-types (1.22) mime-types (1.23)
minitest (4.3.3) minitest (4.3.3)
mocha (0.13.3) mocha (0.13.3)
metaclass (~> 0.0.1) metaclass (~> 0.0.1)
multi_json (1.7.2) multi_json (1.7.3)
net-scp (1.1.0) net-scp (1.1.0)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-sftp (2.1.1) net-sftp (2.1.1)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
net-ssh (2.6.6) net-ssh (2.6.7)
net-ssh-gateway (1.2.0) net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5) net-ssh (>= 2.6.5)
newrelic_rpm (3.6.0.78) newrelic_rpm (3.6.1.88)
nokogiri (1.5.9) nokogiri (1.5.9)
oauth (0.4.7) oauth (0.4.7)
paperclip (3.4.1) paperclip (3.4.1)
Expand All @@ -140,7 +138,7 @@ GEM
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
cocaine (~> 0.5.0) cocaine (~> 0.5.0)
mime-types mime-types
pg (0.15.0) pg (0.15.1)
polyglot (0.3.3) polyglot (0.3.3)
pr_geohash (1.0.0) pr_geohash (1.0.0)
rack (1.4.5) rack (1.4.5)
Expand Down Expand Up @@ -173,26 +171,26 @@ GEM
rdoc (3.12.2) rdoc (3.12.2)
json (~> 1.4) json (~> 1.4)
recaptcha (0.3.5) recaptcha (0.3.5)
redis (3.0.3) redis (3.0.4)
redis-namespace (1.2.1) redis-namespace (1.3.0)
redis (~> 3.0.0) redis (~> 3.0.0)
rest-client (1.6.7) rest-client (1.6.7)
mime-types (>= 1.16) mime-types (>= 1.16)
rsolr (1.0.9) rsolr (1.0.9)
builder (>= 2.1.2) builder (>= 2.1.2)
rubyzip (0.9.5) rubyzip (0.9.5)
rvm-capistrano (1.2.7) rvm-capistrano (1.3.0)
capistrano (>= 2.0.0) capistrano (>= 2.0.0)
sanitize (2.0.3) sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6) nokogiri (>= 1.4.4, < 1.6)
shoulda-context (1.1.0) shoulda-context (1.1.1)
sidekiq (2.9.0) sidekiq (2.11.2)
celluloid (~> 0.12.0) celluloid (>= 0.13.0)
connection_pool (~> 1.0) connection_pool (>= 1.0.0)
multi_json (~> 1) multi_json
redis (~> 3) redis (>= 3.0)
redis-namespace redis-namespace
sidekiq-limit_fetch (1.4) sidekiq-limit_fetch (1.5)
sidekiq (>= 2.6.5, < 3) sidekiq (>= 2.6.5, < 3)
simplecov (0.7.1) simplecov (0.7.1)
multi_json (~> 1.0) multi_json (~> 1.0)
Expand All @@ -202,9 +200,9 @@ GEM
rack (~> 1.4) rack (~> 1.4)
rack-protection (~> 1.3) rack-protection (~> 1.3)
tilt (~> 1.3, >= 1.3.3) tilt (~> 1.3, >= 1.3.3)
slim (1.3.6) slim (1.0.1)
temple (~> 0.5.5) temple (~> 0.3.0)
tilt (~> 1.3.3) tilt (~> 1.2)
sprockets (2.2.2) sprockets (2.2.2)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
Expand All @@ -217,9 +215,9 @@ GEM
nokogiri nokogiri
sunspot (= 2.0.0) sunspot (= 2.0.0)
sunspot_solr (2.0.0) sunspot_solr (2.0.0)
temple (0.5.5) temple (0.3.5)
thor (0.18.1) thor (0.18.1)
tilt (1.3.6) tilt (1.4.0)
timers (1.1.0) timers (1.1.0)
treetop (1.4.12) treetop (1.4.12)
polyglot polyglot
Expand Down
Empty file modified app/views/news/index.html.erb 100755 → 100644
Empty file.
Empty file modified app/views/static/faq.html.erb 100755 → 100644
Empty file.
Empty file modified beautifier.rb 100755 → 100644
Empty file.
Empty file modified public/stylesheets/images/ui-bg_flat_0_aaaaaa_40x100.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/stylesheets/images/ui-bg_glass_55_fbf9ee_1x400.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/stylesheets/images/ui-bg_glass_65_ffffff_1x400.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/stylesheets/images/ui-bg_glass_75_dadada_1x400.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/stylesheets/images/ui-bg_glass_75_e6e6e6_1x400.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/stylesheets/images/ui-bg_glass_75_ffffff_1x400.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/stylesheets/images/ui-bg_inset-soft_95_fef1ec_1x100.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/stylesheets/images/ui-icons_222222_256x240.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/stylesheets/images/ui-icons_2e83ff_256x240.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/stylesheets/images/ui-icons_454545_256x240.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/stylesheets/images/ui-icons_888888_256x240.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified public/stylesheets/images/ui-icons_cd0a0a_256x240.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified script/rails 100755 → 100644
Empty file.
Empty file modified serverscript 100755 → 100644
Empty file.
Empty file modified testdata/deCODEme_scan.csv 100755 → 100644
Empty file.
Empty file modified turnoffserver 100755 → 100644
Empty file.

0 comments on commit 1da6eeb

Please sign in to comment.