diff --git a/Gemfile b/Gemfile index 29198c44..e59dc86a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.0.5' +gem 'rails', '3.0.18' #gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3' gem 'compass', '~> 0.10.1' diff --git a/Gemfile.lock b/Gemfile.lock index 24a0980d..657d4f1e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,32 +56,32 @@ GEM open4 Platform (0.4.0) abstract (1.0.0) - actionmailer (3.0.5) - actionpack (= 3.0.5) - mail (~> 2.2.15) - actionpack (3.0.5) - activemodel (= 3.0.5) - activesupport (= 3.0.5) + actionmailer (3.0.18) + actionpack (= 3.0.18) + mail (~> 2.2.19) + actionpack (3.0.18) + activemodel (= 3.0.18) + activesupport (= 3.0.18) builder (~> 2.1.2) erubis (~> 2.6.6) - i18n (~> 0.4) - rack (~> 1.2.1) - rack-mount (~> 0.6.13) + i18n (~> 0.5.0) + rack (~> 1.2.5) + rack-mount (~> 0.6.14) rack-test (~> 0.5.7) tzinfo (~> 0.3.23) - activemodel (3.0.5) - activesupport (= 3.0.5) + activemodel (3.0.18) + activesupport (= 3.0.18) builder (~> 2.1.2) - i18n (~> 0.4) - activerecord (3.0.5) - activemodel (= 3.0.5) - activesupport (= 3.0.5) - arel (~> 2.0.2) + i18n (~> 0.5.0) + activerecord (3.0.18) + activemodel (= 3.0.18) + activesupport (= 3.0.18) + arel (~> 2.0.10) tzinfo (~> 0.3.23) - activeresource (3.0.5) - activemodel (= 3.0.5) - activesupport (= 3.0.5) - activesupport (3.0.5) + activeresource (3.0.18) + activemodel (= 3.0.18) + activesupport (= 3.0.18) + activesupport (3.0.18) addressable (2.2.6) arel (2.0.10) bcrypt-ruby (2.1.4) @@ -126,7 +126,7 @@ GEM activesupport builder http_parser.rb (0.5.3) - i18n (0.6.0) + i18n (0.5.0) jammit (0.5.4) closure-compiler (>= 0.1.0) yui-compressor (>= 0.9.1) @@ -137,7 +137,7 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) memcache-client (1.8.5) - mime-types (1.17.2) + mime-types (1.19) mini_magick (3.4) subexec (~> 0.2.1) msgpack (0.4.6) @@ -159,21 +159,24 @@ GEM rack (>= 1.0.0) rack-test (0.5.7) rack (>= 1.0) - rails (3.0.5) - actionmailer (= 3.0.5) - actionpack (= 3.0.5) - activerecord (= 3.0.5) - activeresource (= 3.0.5) - activesupport (= 3.0.5) + rails (3.0.18) + actionmailer (= 3.0.18) + actionpack (= 3.0.18) + activerecord (= 3.0.18) + activeresource (= 3.0.18) + activesupport (= 3.0.18) bundler (~> 1.0) - railties (= 3.0.5) - railties (3.0.5) - actionpack (= 3.0.5) - activesupport (= 3.0.5) + railties (= 3.0.18) + railties (3.0.18) + actionpack (= 3.0.18) + activesupport (= 3.0.18) rake (>= 0.8.7) + rdoc (~> 3.4) thor (~> 0.14.4) - rake (0.9.2.2) + rake (10.0.3) rdiscount (1.6.8) + rdoc (3.12) + json (~> 1.4) redis (2.2.2) redis-namespace (1.1.0) redis (< 3.0.0) @@ -208,7 +211,7 @@ GEM rufus-scheduler (2.0.16) tzinfo (>= 0.3.23) sanitize (2.0.3) - nokogiri (< 1.6, >= 1.4.4) + nokogiri (>= 1.4.4, < 1.6) sinatra (1.2.8) rack (~> 1.1) tilt (>= 1.2.2, < 2.0) @@ -216,10 +219,10 @@ GEM swf_converter (0.0.3) thor (0.14.6) tilt (1.3.3) - treetop (1.4.10) + treetop (1.4.12) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.31) + tzinfo (0.3.35) uniform_notifier (1.0.2) vegas (0.1.8) rack (>= 1.0.0) @@ -263,7 +266,7 @@ DEPENDENCIES openneo-auth-signatory (~> 0.1.0) parallel (~> 0.5.17) rack-fiber_pool - rails (= 3.0.5) + rails (= 3.0.18) rdiscount (~> 1.6.5) resque (~> 1.15.0) resque-retry (~> 0.1.0) diff --git a/public/stylesheets/compiled/print.css b/public/stylesheets/compiled/print.css index f8d70f8e..3f77533a 100644 --- a/public/stylesheets/compiled/print.css +++ b/public/stylesheets/compiled/print.css @@ -1,25 +1,84 @@ -body { line-height: 1.5; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; color: black; background: none; font-size: 10pt; } +/* line 29, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +body { + line-height: 1.5; + font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; + color: black; + background: none; + font-size: 10pt; +} -.container { background: none; } +/* line 52, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +.container { + background: none; +} -hr { background: #cccccc; color: #cccccc; width: 100%; height: 2px; margin: 2em 0; padding: 0; border: none; } -hr.space { background: white; color: white; } +/* line 54, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +hr { + background: #cccccc; + color: #cccccc; + width: 100%; + height: 2px; + margin: 2em 0; + padding: 0; + border: none; +} +/* line 62, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +hr.space { + background: white; + color: white; +} -h1, h2, h3, h4, h5, h6 { font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; } +/* line 65, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +h1, h2, h3, h4, h5, h6 { + font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; +} -code { font-size: 0.9em; font-family: "andale mono", "lucida console", monospace; } +/* line 67, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +code { + font-size: 0.9em; + font-family: "andale mono", "lucida console", monospace; +} -a img { border: none; } -a:link, a:visited { background: transparent; font-weight: 700; text-decoration: underline; } +/* line 72, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +a img { + border: none; +} +/* line 75, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +a:link, a:visited { + background: transparent; + font-weight: 700; + text-decoration: underline; +} -p img.top { margin-top: 0; } +/* line 79, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +p img.top { + margin-top: 0; +} -blockquote { margin: 1.5em; padding: 1em; font-style: italic; font-size: 0.9em; } +/* line 81, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +blockquote { + margin: 1.5em; + padding: 1em; + font-style: italic; + font-size: 0.9em; +} -.small { font-size: 0.9em; } +/* line 86, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +.small { + font-size: 0.9em; +} -.large { font-size: 1.1em; } +/* line 88, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +.large { + font-size: 1.1em; +} -.quiet { color: #999999; } +/* line 90, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +.quiet { + color: #999999; +} -.hide { display: none; } +/* line 92, ../../../../../../.rvm/gems/ruby-1.9.3-p362/gems/compass-0.10.6/frameworks/blueprint/stylesheets/blueprint/_print.scss */ +.hide { + display: none; +} diff --git a/vendor/cache/actionmailer-3.0.18.gem b/vendor/cache/actionmailer-3.0.18.gem new file mode 100644 index 00000000..dcabcecb Binary files /dev/null and b/vendor/cache/actionmailer-3.0.18.gem differ diff --git a/vendor/cache/actionmailer-3.0.5.gem b/vendor/cache/actionmailer-3.0.5.gem deleted file mode 100644 index 2c888330..00000000 Binary files a/vendor/cache/actionmailer-3.0.5.gem and /dev/null differ diff --git a/vendor/cache/actionpack-3.0.18.gem b/vendor/cache/actionpack-3.0.18.gem new file mode 100644 index 00000000..ce68706d Binary files /dev/null and b/vendor/cache/actionpack-3.0.18.gem differ diff --git a/vendor/cache/actionpack-3.0.5.gem b/vendor/cache/actionpack-3.0.5.gem deleted file mode 100644 index cd5328ff..00000000 Binary files a/vendor/cache/actionpack-3.0.5.gem and /dev/null differ diff --git a/vendor/cache/activemodel-3.0.18.gem b/vendor/cache/activemodel-3.0.18.gem new file mode 100644 index 00000000..9484f4d2 Binary files /dev/null and b/vendor/cache/activemodel-3.0.18.gem differ diff --git a/vendor/cache/activemodel-3.0.5.gem b/vendor/cache/activemodel-3.0.5.gem deleted file mode 100644 index 9ef137ad..00000000 Binary files a/vendor/cache/activemodel-3.0.5.gem and /dev/null differ diff --git a/vendor/cache/activerecord-3.0.18.gem b/vendor/cache/activerecord-3.0.18.gem new file mode 100644 index 00000000..b54df7a8 Binary files /dev/null and b/vendor/cache/activerecord-3.0.18.gem differ diff --git a/vendor/cache/activerecord-3.0.5.gem b/vendor/cache/activerecord-3.0.5.gem deleted file mode 100644 index 01ad4ad7..00000000 Binary files a/vendor/cache/activerecord-3.0.5.gem and /dev/null differ diff --git a/vendor/cache/activeresource-3.0.18.gem b/vendor/cache/activeresource-3.0.18.gem new file mode 100644 index 00000000..1a5cdb7b Binary files /dev/null and b/vendor/cache/activeresource-3.0.18.gem differ diff --git a/vendor/cache/activeresource-3.0.5.gem b/vendor/cache/activeresource-3.0.5.gem deleted file mode 100644 index b7746085..00000000 Binary files a/vendor/cache/activeresource-3.0.5.gem and /dev/null differ diff --git a/vendor/cache/activesupport-3.0.18.gem b/vendor/cache/activesupport-3.0.18.gem new file mode 100644 index 00000000..b482fc71 Binary files /dev/null and b/vendor/cache/activesupport-3.0.18.gem differ diff --git a/vendor/cache/activesupport-3.0.5.gem b/vendor/cache/activesupport-3.0.5.gem deleted file mode 100644 index ec3d820c..00000000 Binary files a/vendor/cache/activesupport-3.0.5.gem and /dev/null differ diff --git a/vendor/cache/i18n-0.5.0.gem b/vendor/cache/i18n-0.5.0.gem new file mode 100644 index 00000000..14b157db Binary files /dev/null and b/vendor/cache/i18n-0.5.0.gem differ diff --git a/vendor/cache/i18n-0.6.0.gem b/vendor/cache/i18n-0.6.0.gem deleted file mode 100644 index 1ad8176f..00000000 Binary files a/vendor/cache/i18n-0.6.0.gem and /dev/null differ diff --git a/vendor/cache/mime-types-1.17.2.gem b/vendor/cache/mime-types-1.17.2.gem deleted file mode 100644 index fbb5011f..00000000 Binary files a/vendor/cache/mime-types-1.17.2.gem and /dev/null differ diff --git a/vendor/cache/mime-types-1.19.gem b/vendor/cache/mime-types-1.19.gem new file mode 100644 index 00000000..f2009261 Binary files /dev/null and b/vendor/cache/mime-types-1.19.gem differ diff --git a/vendor/cache/rails-3.0.5.gem b/vendor/cache/rails-3.0.18.gem similarity index 71% rename from vendor/cache/rails-3.0.5.gem rename to vendor/cache/rails-3.0.18.gem index 9fe9a2cf..8a85d8fd 100644 Binary files a/vendor/cache/rails-3.0.5.gem and b/vendor/cache/rails-3.0.18.gem differ diff --git a/vendor/cache/railties-3.0.18.gem b/vendor/cache/railties-3.0.18.gem new file mode 100644 index 00000000..8773d8fd Binary files /dev/null and b/vendor/cache/railties-3.0.18.gem differ diff --git a/vendor/cache/railties-3.0.5.gem b/vendor/cache/railties-3.0.5.gem deleted file mode 100644 index 3ab57494..00000000 Binary files a/vendor/cache/railties-3.0.5.gem and /dev/null differ diff --git a/vendor/cache/rake-0.9.2.2.gem b/vendor/cache/rake-0.9.2.2.gem deleted file mode 100644 index f7239ac2..00000000 Binary files a/vendor/cache/rake-0.9.2.2.gem and /dev/null differ diff --git a/vendor/cache/rake-10.0.3.gem b/vendor/cache/rake-10.0.3.gem new file mode 100644 index 00000000..f645fa9f Binary files /dev/null and b/vendor/cache/rake-10.0.3.gem differ diff --git a/vendor/cache/rdoc-3.12.gem b/vendor/cache/rdoc-3.12.gem new file mode 100644 index 00000000..0c214989 Binary files /dev/null and b/vendor/cache/rdoc-3.12.gem differ diff --git a/vendor/cache/treetop-1.4.10.gem b/vendor/cache/treetop-1.4.10.gem deleted file mode 100644 index 3c98f3d5..00000000 Binary files a/vendor/cache/treetop-1.4.10.gem and /dev/null differ diff --git a/vendor/cache/treetop-1.4.12.gem b/vendor/cache/treetop-1.4.12.gem new file mode 100644 index 00000000..44a88b55 Binary files /dev/null and b/vendor/cache/treetop-1.4.12.gem differ diff --git a/vendor/cache/tzinfo-0.3.31.gem b/vendor/cache/tzinfo-0.3.31.gem deleted file mode 100644 index 7a7d571a..00000000 Binary files a/vendor/cache/tzinfo-0.3.31.gem and /dev/null differ diff --git a/vendor/cache/tzinfo-0.3.35.gem b/vendor/cache/tzinfo-0.3.35.gem new file mode 100644 index 00000000..048897ee Binary files /dev/null and b/vendor/cache/tzinfo-0.3.35.gem differ