fix issue #48

Gemfile

@@ -20,7 +20,7 @@ gem 'inherited_resources', '~> 1.1.2'
 gem 'rmagick', '2.12.2'
 gem 'locomotive_carrierwave', '0.5.0.1.beta3', :require => 'carrierwave'
 
-gem 'custom_fields', '1.0.0.beta.5'
+gem 'custom_fields', '1.0.0.beta.6'
 gem 'fog', '0.3.7'
 gem 'mimetype-fu'
 gem 'actionmailer-with-request'

Gemfile.lock

@@ -77,7 +77,7 @@ GEM
     cucumber-rails (0.3.2)
       cucumber (>= 0.8.0)
     culerity (0.2.15)
-    custom_fields (1.0.0.beta.5)
+    custom_fields (1.0.0.beta.6)
       activesupport (>= 3.0.4)
       locomotive_carrierwave
       mongoid (~> 2.0.0.rc.7)
@@ -264,7 +264,7 @@ DEPENDENCIES
   capybara
   cucumber (= 0.8.5)
   cucumber-rails
-  custom_fields (= 1.0.0.beta.5)
+  custom_fields (= 1.0.0.beta.6)
   database_cleaner
   delayed_job (= 2.1.4)
   delayed_job_mongoid (= 1.0.2)

doc/TODO

@@ -1,8 +1,9 @@
 BOARD:
 
-- pull request #44
-- integrate new home
-- editable_elements: inheritable: false (Mattias) => seems to be fixed by Dirk's last pull request (#44)
+x pull request #44
+~ editable_elements: inheritable: false (Mattias) => seems to be fixed by Dirk's last pull request (#44) => content tag
+x bug on dates (https://github.com/locomotivecms/engine/issues#issue/48)
+- integrate new locomotivecms home
 - duostack version
 - 2 different sites on the same main domain (one in www, the other one in something else) (Raphael Costa)
 - seo section for the page form: seo title, seo keywords, seo description

locomotive_cms.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rmagick", "2.12.2"
   s.add_dependency "locomotive_carrierwave", "0.5.0.1.beta3"
 
-  s.add_dependency "custom_fields", "1.0.0.beta.5"
+  s.add_dependency "custom_fields", "1.0.0.beta.6"
   s.add_dependency "fog", "0.3.7"
   s.add_dependency "mimetype-fu"
   s.add_dependency "actionmailer-with-request"