From d1cb537a6ea57be6e4049bb1527ffcfcfb92a22e Mon Sep 17 00:00:00 2001
From: Stephane Bounmy <stephanebounmy@gmail.com>
Date: Sun, 30 Sep 2012 11:38:15 +0200
Subject: [PATCH 01/25] if ajax request, do not paginate

---
 app/controllers/spree/admin/uploads_controller.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/controllers/spree/admin/uploads_controller.rb b/app/controllers/spree/admin/uploads_controller.rb
index 03b6201..5797253 100644
--- a/app/controllers/spree/admin/uploads_controller.rb
+++ b/app/controllers/spree/admin/uploads_controller.rb
@@ -1,16 +1,20 @@
 class Spree::Admin::UploadsController < Spree::Admin::ResourceController
-  
+
 	def index
 	  render :template => "spree/admin/uploads/#{request.xhr? ? 'picker' : 'index'}", :layout => !request.xhr?
   end
-  
+
   private
-  
+
     def collection
       params[:q] ||= {}
       params[:q][:sort] ||= "created_at.desc"
       @search = Spree::Upload.search(params[:q])
-      @collection = @search.result.page(params[:page]).per(Spree::Config[:orders_per_page])
+      if request.xhr?
+        @collection = @search.result
+      else
+        @collection = @search.result.page(params[:page]).per(Spree::Config[:orders_per_page])
+      end
     end
 
 end

From 109d7ed0c3378ef4d8954b0fd04cb3bfc7deec6f Mon Sep 17 00:00:00 2001
From: Ben-M <ben@maraney.com>
Date: Sun, 21 Oct 2012 16:56:42 +0200
Subject: [PATCH 02/25] Update version, added spree_auth_devise for testing.
 Still need to fix failing integration tests.

---
 Gemfile                                                   | 4 +++-
 Versionfile                                               | 1 +
 spree_essentials.gemspec                                  | 4 ++--
 test/dummy_hooks/before_migrate.rb                        | 8 ++++++--
 .../integration/spree/admin/extension_integration_test.rb | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 18a1a38..b304599 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,5 +2,7 @@ source "http://rubygems.org"
 gemspec
 
 group :development, :test do
+  gem "spree_auth_devise", "~> 1.0.0", :git => "git://github.com/spree/spree_auth_devise"
   gem "spree_essential_example", :path => "test/spree_essential_example"
-end
+  gem 'coffee-rails'
+end
\ No newline at end of file
diff --git a/Versionfile b/Versionfile
index 66b041f..a2a7e9a 100644
--- a/Versionfile
+++ b/Versionfile
@@ -1,3 +1,4 @@
+"1.2.x"  => { :version => "0.6.0" }
 "1.1.x"  => { :version => "0.5.0" }
 "1.0.x"  => { :version => "0.4.0" }
 "0.70.x" => { :version => "0.3.2" }
diff --git a/spree_essentials.gemspec b/spree_essentials.gemspec
index 68f6c01..6dbe067 100644
--- a/spree_essentials.gemspec
+++ b/spree_essentials.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency('spree_core',  '~> 1.1.0')
+  s.add_runtime_dependency('spree',  '~> 1.2.0')
   s.add_runtime_dependency('rdiscount',   '~> 1.6.8')
 
   s.add_development_dependency('shoulda',      '~> 3.0.0')
@@ -29,4 +29,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency('simplecov',    '~> 0.6.1')
   # s.add_development_dependency('turn',         '~> 0.9.3')
   
-end
+end
\ No newline at end of file
diff --git a/test/dummy_hooks/before_migrate.rb b/test/dummy_hooks/before_migrate.rb
index b1a3c33..c3692a4 100644
--- a/test/dummy_hooks/before_migrate.rb
+++ b/test/dummy_hooks/before_migrate.rb
@@ -1,10 +1,14 @@
-# Require spree_essential_example in config/application.rb
+# Require spree_essential_example and spree_atuh in config/application.rb
 gsub_file "config/application.rb", 'require "spree_essentials"', %(require "spree_essentials"
-require "spree_essential_example")
+require "spree_essential_example"
+require "spree_auth_devise")
 
 # Install spree's migrations
 rake "spree:install:migrations"
 
+#Install spree auth migrations
+rake "spree_auth:install:migrations"
+
 # Mount the Spree::Core routes
 insert_into_file File.join('config', 'routes.rb'), :after => "Application.routes.draw do\n" do
   "  # Mount Spree's routes\n  mount Spree::Core::Engine, :at => '/'\n"
diff --git a/test/integration/spree/admin/extension_integration_test.rb b/test/integration/spree/admin/extension_integration_test.rb
index ce4e337..65fabce 100644
--- a/test/integration/spree/admin/extension_integration_test.rb
+++ b/test/integration/spree/admin/extension_integration_test.rb
@@ -7,7 +7,6 @@ class Spree::Admin::ExtensionIntegrationTest < SpreeEssentials::IntegrationCase
   end
   
   context "When no extensions are registered" do
-    
     should "have a contents tab with only uploads in the sub nav" do
       visit spree.admin_orders_path
       within "#admin-menu" do
@@ -33,6 +32,7 @@ class Spree::Admin::ExtensionIntegrationTest < SpreeEssentials::IntegrationCase
     end
     
     should "have a contents tab with examples and uploads in the sub nav" do
+      #Spree::Admin::BaseController.any_instance.stub(:authorize_admin).and_return(false)
       visit spree.admin_orders_path
       within "#admin-menu" do
         assert has_link?("Content")

From a0de02fdbca900f1d3d94ae76a201d1efa15e567 Mon Sep 17 00:00:00 2001
From: Ben-M <ben@maraney.com>
Date: Mon, 22 Oct 2012 12:30:47 +0200
Subject: [PATCH 03/25] complete version bump

---
 lib/spree_essentials/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/spree_essentials/version.rb b/lib/spree_essentials/version.rb
index c40c98c..f6f3522 100644
--- a/lib/spree_essentials/version.rb
+++ b/lib/spree_essentials/version.rb
@@ -1,3 +1,3 @@
 module SpreeEssentials
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

From b033c7b0c5977f66068116b826d78966d16cb643 Mon Sep 17 00:00:00 2001
From: Ben-M <ben@maraney.com>
Date: Mon, 22 Oct 2012 13:18:55 +0200
Subject: [PATCH 04/25] update after_migrate hooks to seed an admin user

---
 test/dummy_hooks/after_migrate.rb.sample | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/dummy_hooks/after_migrate.rb.sample b/test/dummy_hooks/after_migrate.rb.sample
index 941f06b..b0a39a6 100644
--- a/test/dummy_hooks/after_migrate.rb.sample
+++ b/test/dummy_hooks/after_migrate.rb.sample
@@ -1 +1,2 @@
 rake "db:migrate db:seed", :env => "development"
+rake "spree_auth:admin:create"
\ No newline at end of file

From cd352a6fe1c096c8efbb08be89607a972877ce9c Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Wed, 24 Oct 2012 20:29:58 +1100
Subject: [PATCH 05/25] Remove spree_auth_devise dependency

We don't need to care about authenticating as users here, as we can just stub out the API for authorization in admin controllers
---
 Gemfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index b304599..3a588c5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,6 @@ source "http://rubygems.org"
 gemspec
 
 group :development, :test do
-  gem "spree_auth_devise", "~> 1.0.0", :git => "git://github.com/spree/spree_auth_devise"
   gem "spree_essential_example", :path => "test/spree_essential_example"
   gem 'coffee-rails'
 end
\ No newline at end of file

From 0045ea91b4645641f27f601cdf191ee7fd54f8fe Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Wed, 24 Oct 2012 20:31:42 +1100
Subject: [PATCH 06/25] Add stub_authorization! helper and use it in
 extension_integration_test

---
 lib/spree_essentials/testing/integration_case.rb          | 8 ++++++++
 lib/spree_essentials/testing/test_helper.rb               | 1 +
 spree_essentials.gemspec                                  | 2 ++
 test/dummy_hooks/before_migrate.rb                        | 6 +-----
 test/dummy_hooks/templates/spree_user_error_fix.rb        | 4 +---
 .../integration/spree/admin/extension_integration_test.rb | 1 +
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/spree_essentials/testing/integration_case.rb b/lib/spree_essentials/testing/integration_case.rb
index 5fb120c..0942d54 100644
--- a/lib/spree_essentials/testing/integration_case.rb
+++ b/lib/spree_essentials/testing/integration_case.rb
@@ -23,6 +23,14 @@ class SpreeEssentials::IntegrationCase < ActiveSupport::TestCase
   def spree
     Spree::Core::Engine.routes.url_helpers
   end
+
+  # Stub authorization for all admin controllers
+  def stub_authorization!
+    subclasses = Spree::Admin::BaseController.subclasses + Spree::Admin::ResourceController.subclasses
+    subclasses.each do |klass|
+      klass.any_instance.stubs(:authorize!).returns(true)
+    end
+  end
   
   # An assertion for ensuring content has made it to the page.
   #    
diff --git a/lib/spree_essentials/testing/test_helper.rb b/lib/spree_essentials/testing/test_helper.rb
index 378dc07..bff96de 100644
--- a/lib/spree_essentials/testing/test_helper.rb
+++ b/lib/spree_essentials/testing/test_helper.rb
@@ -13,6 +13,7 @@
 end
 
 require "rails/test_help"
+require "mocha"
 require "shoulda"
 require "paperclip/matchers"
 require "factory_girl"
diff --git a/spree_essentials.gemspec b/spree_essentials.gemspec
index 6dbe067..56a8585 100644
--- a/spree_essentials.gemspec
+++ b/spree_essentials.gemspec
@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('spree',  '~> 1.2.0')
   s.add_runtime_dependency('rdiscount',   '~> 1.6.8')
 
+  s.add_development_dependency 'm'
+  s.add_development_dependency('mocha',        '~> 0.12.7')
   s.add_development_dependency('shoulda',      '~> 3.0.0')
   s.add_development_dependency('dummier',      '~> 0.3.0')
   s.add_development_dependency('factory_girl', '~> 2.6.0')
diff --git a/test/dummy_hooks/before_migrate.rb b/test/dummy_hooks/before_migrate.rb
index c3692a4..64eff72 100644
--- a/test/dummy_hooks/before_migrate.rb
+++ b/test/dummy_hooks/before_migrate.rb
@@ -1,14 +1,10 @@
 # Require spree_essential_example and spree_atuh in config/application.rb
 gsub_file "config/application.rb", 'require "spree_essentials"', %(require "spree_essentials"
-require "spree_essential_example"
-require "spree_auth_devise")
+require "spree_essential_example")
 
 # Install spree's migrations
 rake "spree:install:migrations"
 
-#Install spree auth migrations
-rake "spree_auth:install:migrations"
-
 # Mount the Spree::Core routes
 insert_into_file File.join('config', 'routes.rb'), :after => "Application.routes.draw do\n" do
   "  # Mount Spree's routes\n  mount Spree::Core::Engine, :at => '/'\n"
diff --git a/test/dummy_hooks/templates/spree_user_error_fix.rb b/test/dummy_hooks/templates/spree_user_error_fix.rb
index 86da9db..755687b 100644
--- a/test/dummy_hooks/templates/spree_user_error_fix.rb
+++ b/test/dummy_hooks/templates/spree_user_error_fix.rb
@@ -1,3 +1 @@
-unless Spree::User.const_defined?(:DestroyWithOrdersError)
-  class Spree::User::DestroyWithOrdersError < StandardError; end
-end
+Spree.user_class = "Spree::LegacyUser"
diff --git a/test/integration/spree/admin/extension_integration_test.rb b/test/integration/spree/admin/extension_integration_test.rb
index 65fabce..a3f3817 100644
--- a/test/integration/spree/admin/extension_integration_test.rb
+++ b/test/integration/spree/admin/extension_integration_test.rb
@@ -4,6 +4,7 @@ class Spree::Admin::ExtensionIntegrationTest < SpreeEssentials::IntegrationCase
   
   setup do
     SpreeEssentials.essentials.clear
+    stub_authorization!
   end
   
   context "When no extensions are registered" do

From 7ff346d76060f732e77f792c378e120702f99c72 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Wed, 24 Oct 2012 20:52:11 +1100
Subject: [PATCH 07/25] Require sass-rails and jquery-rails gems as development
 dependencies

---
 spree_essentials.gemspec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spree_essentials.gemspec b/spree_essentials.gemspec
index 56a8585..67a65d0 100644
--- a/spree_essentials.gemspec
+++ b/spree_essentials.gemspec
@@ -29,6 +29,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency('capybara',     '~> 1.1.2')
   s.add_development_dependency('sqlite3',      '~> 1.3.4')
   s.add_development_dependency('simplecov',    '~> 0.6.1')
+  s.add_development_dependency('sass-rails',   '~> 3.2.5')
+  s.add_development_dependency('jquery-rails', '~> 2.1.3')
   # s.add_development_dependency('turn',         '~> 0.9.3')
   
-end
\ No newline at end of file
+end

From f09bd1991bbc6ef9f3811fd33419c3cf6bc2d921 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Wed, 24 Oct 2012 20:52:21 +1100
Subject: [PATCH 08/25] Specify jquery dependencies inside admin/all.js
 template

---
 test/dummy_hooks/templates/admin/all.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/dummy_hooks/templates/admin/all.js b/test/dummy_hooks/templates/admin/all.js
index a3b2c53..7623dee 100644
--- a/test/dummy_hooks/templates/admin/all.js
+++ b/test/dummy_hooks/templates/admin/all.js
@@ -1 +1,5 @@
+//= require jquery
+//= require jquery_ujs
 //= require admin/spree_core
+//= require_tree .
+

From 375da5c9b6238cdc4be78c7d5c821ba6d04082a1 Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Wed, 24 Oct 2012 20:52:35 +1100
Subject: [PATCH 09/25] Remove commented out line from
 extension_integration_test

---
 test/integration/spree/admin/extension_integration_test.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/integration/spree/admin/extension_integration_test.rb b/test/integration/spree/admin/extension_integration_test.rb
index a3f3817..a125adb 100644
--- a/test/integration/spree/admin/extension_integration_test.rb
+++ b/test/integration/spree/admin/extension_integration_test.rb
@@ -33,7 +33,6 @@ class Spree::Admin::ExtensionIntegrationTest < SpreeEssentials::IntegrationCase
     end
     
     should "have a contents tab with examples and uploads in the sub nav" do
-      #Spree::Admin::BaseController.any_instance.stub(:authorize_admin).and_return(false)
       visit spree.admin_orders_path
       within "#admin-menu" do
         assert has_link?("Content")

From d169b9f116ebc3098da282d94f018e7e7c6781de Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Wed, 24 Oct 2012 20:52:54 +1100
Subject: [PATCH 10/25] Stub authorization inside markdown and upload
 integration tests

---
 test/integration/spree/admin/markdown_integration_test.rb | 1 +
 test/integration/spree/admin/upload_integration_test.rb   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/test/integration/spree/admin/markdown_integration_test.rb b/test/integration/spree/admin/markdown_integration_test.rb
index 9e2ffea..b78759b 100644
--- a/test/integration/spree/admin/markdown_integration_test.rb
+++ b/test/integration/spree/admin/markdown_integration_test.rb
@@ -4,6 +4,7 @@ class Spree::Admin::MarkdownIntegrationTest < SpreeEssentials::IntegrationCase
 
   setup do
     SpreeEssentials.register :example, SpreeEssentialExample
+    stub_authorization!
   end
   
   teardown do
diff --git a/test/integration/spree/admin/upload_integration_test.rb b/test/integration/spree/admin/upload_integration_test.rb
index 6517ca3..bd8bb53 100644
--- a/test/integration/spree/admin/upload_integration_test.rb
+++ b/test/integration/spree/admin/upload_integration_test.rb
@@ -6,6 +6,7 @@ def setup
     Spree::Upload.destroy_all
     @image  = File.expand_path("../../../../support/files/1.png", __FILE__)
     @image2 = File.expand_path("../../../../support/files/2.png", __FILE__)
+    stub_authorization!
   end
   
   should "have a contents tab" do

From 4e484cc975ec44fae864cda702a24056a4de7f5f Mon Sep 17 00:00:00 2001
From: Ryan Bigg <radarlistener@gmail.com>
Date: Wed, 24 Oct 2012 20:59:29 +1100
Subject: [PATCH 11/25] Correct tests in upload_integration_test

---
 test/integration/spree/admin/upload_integration_test.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/integration/spree/admin/upload_integration_test.rb b/test/integration/spree/admin/upload_integration_test.rb
index bd8bb53..7c4f493 100644
--- a/test/integration/spree/admin/upload_integration_test.rb
+++ b/test/integration/spree/admin/upload_integration_test.rb
@@ -60,7 +60,7 @@ def setup
       assert_seen "Just an image!", :within => "tr#upload_#{@upload.id}"
       within "td.actions" do
         assert find("a.icon_link").native.attribute("href").include?(spree.edit_admin_upload_path(@upload))
-        assert has_selector?("a[href='#']")
+        assert has_selector?("a.delete-resource")
       end
     end
     
@@ -77,8 +77,9 @@ def setup
   
     should "destroy the upload" do
       visit spree.admin_uploads_path
-      find("a[href='#']").click
-      find_by_id("popup_ok").click              
+      find("a.delete-resource").click
+      page.driver.browser.switch_to.alert.accept
+      assert_seen "Upload has been successfully removed!"
     end
     
   end

From 82aad7606ba6bdbde823a43a2dfa5d6a7963058d Mon Sep 17 00:00:00 2001
From: Stephane Bounmy <stephanebounmy@gmail.com>
Date: Wed, 31 Oct 2012 08:50:27 +0100
Subject: [PATCH 12/25] spree 1-2-stable compliant however integration test
 fails

---
 spree_essentials.gemspec                           | 7 ++++---
 test/dummy_hooks/before_migrate.rb                 | 5 +----
 test/dummy_hooks/templates/spree_user_error_fix.rb | 3 ---
 3 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 test/dummy_hooks/templates/spree_user_error_fix.rb

diff --git a/spree_essentials.gemspec b/spree_essentials.gemspec
index 68f6c01..e9f308f 100644
--- a/spree_essentials.gemspec
+++ b/spree_essentials.gemspec
@@ -15,18 +15,19 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  
+
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency('spree_core',  '~> 1.1.0')
+  s.add_runtime_dependency('spree_core',  '~> 1.2.0')
   s.add_runtime_dependency('rdiscount',   '~> 1.6.8')
 
   s.add_development_dependency('shoulda',      '~> 3.0.0')
+  s.add_development_dependency('shoulda-context', '1.0.0')
   s.add_development_dependency('dummier',      '~> 0.3.0')
   s.add_development_dependency('factory_girl', '~> 2.6.0')
   s.add_development_dependency('capybara',     '~> 1.1.2')
   s.add_development_dependency('sqlite3',      '~> 1.3.4')
   s.add_development_dependency('simplecov',    '~> 0.6.1')
   # s.add_development_dependency('turn',         '~> 0.9.3')
-  
+
 end
diff --git a/test/dummy_hooks/before_migrate.rb b/test/dummy_hooks/before_migrate.rb
index b1a3c33..596443e 100644
--- a/test/dummy_hooks/before_migrate.rb
+++ b/test/dummy_hooks/before_migrate.rb
@@ -10,10 +10,7 @@
   "  # Mount Spree's routes\n  mount Spree::Core::Engine, :at => '/'\n"
 end
 
-# Fix uninitialized constant Spree::User::DestroyWithOrdersError 
-template "spree_user_error_fix.rb", "config/initializers/spree_user_error_fix.rb"
-
-# remove all stylesheets except core  
+# remove all stylesheets except core
 %w(admin store).each do |ns|
   template "#{ns}/all.js",  "app/assets/javascripts/#{ns}/all.js",  :force => true
   template "#{ns}/all.css", "app/assets/stylesheets/#{ns}/all.css", :force => true
diff --git a/test/dummy_hooks/templates/spree_user_error_fix.rb b/test/dummy_hooks/templates/spree_user_error_fix.rb
deleted file mode 100644
index 86da9db..0000000
--- a/test/dummy_hooks/templates/spree_user_error_fix.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-unless Spree::User.const_defined?(:DestroyWithOrdersError)
-  class Spree::User::DestroyWithOrdersError < StandardError; end
-end

From 711ea78197e91e498e0a19e93120ef5fbd2d1deb Mon Sep 17 00:00:00 2001
From: Stephane Bounmy <stephanebounmy@gmail.com>
Date: Wed, 31 Oct 2012 09:13:57 +0100
Subject: [PATCH 13/25] added legacy user initializer to dummy hook

---
 test/dummy_hooks/before_migrate.rb                    | 3 +++
 test/dummy_hooks/templates/initializers/spree_user.rb | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 test/dummy_hooks/templates/initializers/spree_user.rb

diff --git a/test/dummy_hooks/before_migrate.rb b/test/dummy_hooks/before_migrate.rb
index 596443e..43d927a 100644
--- a/test/dummy_hooks/before_migrate.rb
+++ b/test/dummy_hooks/before_migrate.rb
@@ -5,6 +5,9 @@
 # Install spree's migrations
 rake "spree:install:migrations"
 
+# Copy spree user initializer
+template "initializers/spree_user.rb", "config/initializers/spree_user.rb"
+
 # Mount the Spree::Core routes
 insert_into_file File.join('config', 'routes.rb'), :after => "Application.routes.draw do\n" do
   "  # Mount Spree's routes\n  mount Spree::Core::Engine, :at => '/'\n"
diff --git a/test/dummy_hooks/templates/initializers/spree_user.rb b/test/dummy_hooks/templates/initializers/spree_user.rb
new file mode 100644
index 0000000..4c478cd
--- /dev/null
+++ b/test/dummy_hooks/templates/initializers/spree_user.rb
@@ -0,0 +1 @@
+Spree.user_class = "Spree::LegacyUser"
\ No newline at end of file

From b3a79535fe53584ea1cc94eef126b14ed57300d5 Mon Sep 17 00:00:00 2001
From: Stephane Bounmy <stephanebounmy@gmail.com>
Date: Wed, 19 Dec 2012 23:45:28 +0100
Subject: [PATCH 14/25] bump spree 1.3

---
 spree_essentials.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spree_essentials.gemspec b/spree_essentials.gemspec
index e9f308f..1daf30d 100644
--- a/spree_essentials.gemspec
+++ b/spree_essentials.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency('spree_core',  '~> 1.2.0')
+  s.add_runtime_dependency('spree_core',  '~> 1.3.0')
   s.add_runtime_dependency('rdiscount',   '~> 1.6.8')
 
   s.add_development_dependency('shoulda',      '~> 3.0.0')

From a05ca0d1a893a4835331df1d9ae0b29ff2ce05b0 Mon Sep 17 00:00:00 2001
From: Stephane Bounmy <stephanebounmy@gmail.com>
Date: Sat, 23 Feb 2013 01:55:42 +0100
Subject: [PATCH 15/25] fix : sorting with ransack and fully support spree 1.3
 new admin

---
 .../spree/admin/uploads_controller.rb         |  2 +-
 app/overrides/admin/spree_essentials.rb       |  2 +-
 .../admin/shared/_contents_sub_menu.html.erb  |  4 +-
 app/views/spree/admin/uploads/_form.html.erb  | 23 ++++--
 app/views/spree/admin/uploads/index.html.erb  | 80 ++++++++++++-------
 app/views/spree/admin/uploads/new.html.erb    |  6 +-
 6 files changed, 71 insertions(+), 46 deletions(-)

diff --git a/app/controllers/spree/admin/uploads_controller.rb b/app/controllers/spree/admin/uploads_controller.rb
index 5797253..ce1ec0f 100644
--- a/app/controllers/spree/admin/uploads_controller.rb
+++ b/app/controllers/spree/admin/uploads_controller.rb
@@ -8,7 +8,7 @@ def index
 
     def collection
       params[:q] ||= {}
-      params[:q][:sort] ||= "created_at.desc"
+      params[:q][:sorts] ||= "attachment_updated_at desc"
       @search = Spree::Upload.search(params[:q])
       if request.xhr?
         @collection = @search.result
diff --git a/app/overrides/admin/spree_essentials.rb b/app/overrides/admin/spree_essentials.rb
index 917fb24..a230cfe 100644
--- a/app/overrides/admin/spree_essentials.rb
+++ b/app/overrides/admin/spree_essentials.rb
@@ -8,6 +8,6 @@
 # Adds the contents menu. Inside the contents sub menu we ensure it's needed
 Deface::Override.new(:virtual_path  => "spree/layouts/admin",
                      :name          => "spree_essential_contents_menu",
-                     :insert_top    => "#sub-menu[data-hook]",
+                     :insert_before => "code[erb-silent]:contains('content_for?(:sub_menu)')",
                      :partial       => "spree/admin/shared/contents_sub_menu",
                      :disabled      => false)
diff --git a/app/views/spree/admin/shared/_contents_sub_menu.html.erb b/app/views/spree/admin/shared/_contents_sub_menu.html.erb
index 2945da6..d9dd65f 100644
--- a/app/views/spree/admin/shared/_contents_sub_menu.html.erb
+++ b/app/views/spree/admin/shared/_contents_sub_menu.html.erb
@@ -1,10 +1,10 @@
 <% if inside_contents_tab? %>
   <% content_for :sub_menu do %>
-    <ul id="sub_nav" data-hook="essentials_sub_nav">
+    <ul id="sub_nav" data-hook="essentials_sub_nav" class="inline-menu">
       <% SpreeEssentials.essentials.each_pair do |name, cls| %>
         <%= tab *cls.sub_tab if defined?(cls.sub_tab) %>
       <% end %>
       <%= tab :uploads, :label => t('spree.admin.subnav.uploads') %>
     </ul>
   <% end %>
-<% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/spree/admin/uploads/_form.html.erb b/app/views/spree/admin/uploads/_form.html.erb
index 2c02414..5a14311 100644
--- a/app/views/spree/admin/uploads/_form.html.erb
+++ b/app/views/spree/admin/uploads/_form.html.erb
@@ -1,8 +1,15 @@
-<p>
-  <%= form.label :attachment %>:<br/>
-  <%= form.file_field :attachment %>
-</p>
-<p>
-  <%= form.label :alt, t('description') %>:<br/>
-  <%= form.text_field :alt, :class => 'text' %>
-</p>
+<fieldset data-hook="new_upload">
+
+  <legend align="center"><%= t(:new_upload) %></legend>
+
+  <%= form.field_container :attachment do %>
+    <%= form.label :attachment %> <span class="required">*</span><br />
+    <%= form.file_field :attachment %>
+  <% end %>
+
+  <%= form.field_container :alt do %>
+    <%= form.label :alt, t('description') %>
+    <%= form.text_field :alt, :class => 'text' %>
+  <% end %>
+
+</fieldset>
diff --git a/app/views/spree/admin/uploads/index.html.erb b/app/views/spree/admin/uploads/index.html.erb
index 0508cb8..eb83c2d 100644
--- a/app/views/spree/admin/uploads/index.html.erb
+++ b/app/views/spree/admin/uploads/index.html.erb
@@ -1,5 +1,44 @@
+<% content_for :page_title do %>
+  <%= t('.listing_uploads') %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <div class="toolbar" data-hook="toolbar">
+    <ul class="actions header-action-links inline-menu">
+      <li>
+        <%= button_link_to t(".new_upload"), new_admin_upload_url, :id => "new_image_link", :icon => 'icon-plus' %>
+      </li>
+    </ul>
+  </div>
+<% end %>
+
+<% content_for :table_filter_title do %>
+  <%= t(:search) %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <div data-hool='admin_uploads_sidebar'>
 
-<h1><%= t('.listing_uploads') %></h1>
+    <%= search_form_for [:admin, @search] do |f| %>
+      <div data-hook="admin_uploads_index_search">
+        <div class="alpha nine columns">
+          <div class="field">
+            <%= f.label :alt_cont, t("description") %>
+            <%= f.text_field :alt_cont, :size => 25 %>
+          </div>
+        </div>
+      </div>
+
+      <div class="clear"></div>
+
+      <div class="form-buttons actions filter-actions" data-hook="admin_uploads_index_search_buttons">
+        <%= button t(:search), 'icon-search' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<div id="images"></div>
 
 <table class="index">
 	<tr>
@@ -7,9 +46,9 @@
 	  <th><%= sort_link @search, :attachment_file_name, t("upload.file_name") %></th>
 	  <th><%= sort_link @search, :description, t("description") %></th>
 	  <th><%= sort_link @search, :attachment_file_size, t("upload.size") %></th>
-	  <th><%= t("action") %></th>
+	  <th data-hook="admin_uploads_index_header_actions" class="actions"></th>
 	</tr>
- 
+
   <% @uploads.each do |upload| %>
     <tr id="<%= dom_id(upload) %>">
       <td class="thumbnail">
@@ -21,48 +60,27 @@
       <td><%= upload.alt %></td>
       <td><%= upload.attachment_file_size.to_i / 1024 %> kb</td>
       <td class="actions">
-        <%= link_to_with_icon('edit', t("edit"), edit_admin_upload_url(upload)) %>
+        <%= link_to_edit upload, :no_text => true, :class => 'edit' %>
         &nbsp;
-        <%= link_to_delete upload, {:url => admin_upload_url(upload) }%>
+        <%= link_to_delete upload, :no_text => true %>
       </td>
     </tr>
   <% end %>
- 
+
 </table>
 
 <%= paginate @uploads %>
 
-
-<% content_for :sidebar do %>
-
-<div class="box">
-  <h3><%= t(:search) %></h3>
-  <%= search_form_for [ :admin, @search ] do |f| %>
-    <p>
-      <%= f.label :alt_cont, t("description") %><br />
-      <%= f.text_field :alt_cont, :size => 25 %>
-    </p>
-    <p><%= button t("search") %></p>
-  <% end %>
-</div>
-<% end %>
-
-<div id="images"></div>
-<br/>
-<p>
-  <%= link_to icon('add') + ' ' + t(".new_upload"), new_admin_upload_url, :id => "new_image_link" %>
-</p>
-
 <% content_for :head do %>
   <script type="text/javascript">
-    jQuery(document).ready(function(){  
-      
-      jQuery('#new_image_link').click(function(event) { 
+    jQuery(document).ready(function(){
+
+      jQuery('#new_image_link').click(function(event) {
         event.preventDefault();
         jQuery(this).hide();
         jQuery.ajax({type: 'GET', url: this.href, data: ({authenticity_token: AUTH_TOKEN}), success: function(r){ jQuery('#images').html(r);} });
       });
-      
+
     });
   </script>
 <% end %>
\ No newline at end of file
diff --git a/app/views/spree/admin/uploads/new.html.erb b/app/views/spree/admin/uploads/new.html.erb
index 063674c..2391ccc 100644
--- a/app/views/spree/admin/uploads/new.html.erb
+++ b/app/views/spree/admin/uploads/new.html.erb
@@ -14,9 +14,9 @@
   </p>
 <% end %>
 
-<script type="text/javascript">    
-  jQuery('#cancel_link').click(function (event) { 
+<script type="text/javascript">
+  jQuery('#cancel_link').click(function (event) {
     jQuery('#new_image_link').show();
     jQuery('#images').html('');
-  }); 
+  });
 </script>

From ddb6a04a2d31a4d58492cf13e4655ecc87399ffe Mon Sep 17 00:00:00 2001
From: Stephane Bounmy <stephanebounmy@gmail.com>
Date: Sat, 23 Feb 2013 02:01:17 +0100
Subject: [PATCH 16/25] added icon book

---
 .../spree/admin/spree_essentials_helper.rb    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/helpers/spree/admin/spree_essentials_helper.rb b/app/helpers/spree/admin/spree_essentials_helper.rb
index af98a22..0b6a994 100644
--- a/app/helpers/spree/admin/spree_essentials_helper.rb
+++ b/app/helpers/spree/admin/spree_essentials_helper.rb
@@ -1,18 +1,18 @@
 module Spree::Admin::SpreeEssentialsHelper
-  
+
   def inside_contents_tab?
     @inside_contents_tab ||= !request.fullpath.scan(Regexp.new(extension_routes.join("|"))).empty?
   end
-  
+
   def contents_tab
-    content_tag :li, :class => inside_contents_tab? ? 'selected' : nil do
-      link_to I18n.t('spree.admin.shared.contents_tab.content'), extension_routes.first
+    content_tag :li, :class => inside_contents_tab? ? 'selected tab-with-icon' : 'tab-with-icon' do
+      link_to_with_icon 'icon-book', I18n.t('spree.admin.shared.contents_tab.content'), extension_routes.first
     end
   end
-  
+
   def markdown_helper
     content_tag('em', :class => 'small markdown-helper') do
-      [ 
+      [
         t('essentials.parsed_with'),
         link_to("Markdown", "http://daringfireball.net/projects/markdown/basics", :onclick => 'window.open(this.href); return false')
       ].join(" ").html_safe
@@ -20,12 +20,12 @@ def markdown_helper
   end
 
 private
-  
+
   def extension_routes
     @extension_routes ||= SpreeEssentials.essentials.map { |key, cls|
       route = cls.tab[:route] || "admin_#{key}"
-      send("#{route}_path") rescue "##{key}"      
-    }.push(spree.admin_uploads_path)    
+      send("#{route}_path") rescue "##{key}"
+    }.push(spree.admin_uploads_path)
   end
-  
+
 end

From c5452313b65a6cef8ba5ffce64237111f5f61f42 Mon Sep 17 00:00:00 2001
From: Chen ZhongXue <xmpolaris@gmail.com>
Date: Wed, 17 Apr 2013 10:07:11 +0800
Subject: [PATCH 17/25] fix gem dependency

---
 spree_essentials.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spree_essentials.gemspec b/spree_essentials.gemspec
index 67a65d0..25e4f6e 100644
--- a/spree_essentials.gemspec
+++ b/spree_essentials.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency('spree',  '~> 1.2.0')
+  s.add_runtime_dependency('spree',  '~> 1.3.0')
   s.add_runtime_dependency('rdiscount',   '~> 1.6.8')
 
   s.add_development_dependency 'm'

From 10274cde9e672bd273f32c14ec930f75ad6c145a Mon Sep 17 00:00:00 2001
From: Chen ZhongXue <xmpolaris@gmail.com>
Date: Wed, 17 Apr 2013 14:39:09 +0800
Subject: [PATCH 18/25] fix uploads model sti issue fix views for spree core
 1.3.2

---
 app/models/spree/upload.rb                    |   2 -
 app/overrides/admin/spree_essentials.rb       |   2 +-
 .../admin/shared/_contents_sub_menu.html.erb  |   2 +-
 app/views/spree/admin/uploads/_form.html.erb  |  25 ++--
 app/views/spree/admin/uploads/edit.html.erb   |   1 -
 app/views/spree/admin/uploads/index.html.erb  | 121 +++++++++++-------
 6 files changed, 96 insertions(+), 57 deletions(-)

diff --git a/app/models/spree/upload.rb b/app/models/spree/upload.rb
index e61d093..f1ff891 100644
--- a/app/models/spree/upload.rb
+++ b/app/models/spree/upload.rb
@@ -2,8 +2,6 @@ class Spree::Upload < ::Spree::Asset
   
   attr_accessible :attachment, :alt
   
-  default_scope where(:type => "Upload") if table_exists?
-  
   validate :no_attachement_errors
   
   has_attached_file :attachment,
diff --git a/app/overrides/admin/spree_essentials.rb b/app/overrides/admin/spree_essentials.rb
index 917fb24..a0cf753 100644
--- a/app/overrides/admin/spree_essentials.rb
+++ b/app/overrides/admin/spree_essentials.rb
@@ -8,6 +8,6 @@
 # Adds the contents menu. Inside the contents sub menu we ensure it's needed
 Deface::Override.new(:virtual_path  => "spree/layouts/admin",
                      :name          => "spree_essential_contents_menu",
-                     :insert_top    => "#sub-menu[data-hook]",
+                     :insert_after    => "#admin-menu[data-hook]",
                      :partial       => "spree/admin/shared/contents_sub_menu",
                      :disabled      => false)
diff --git a/app/views/spree/admin/shared/_contents_sub_menu.html.erb b/app/views/spree/admin/shared/_contents_sub_menu.html.erb
index 2945da6..2be3c5c 100644
--- a/app/views/spree/admin/shared/_contents_sub_menu.html.erb
+++ b/app/views/spree/admin/shared/_contents_sub_menu.html.erb
@@ -1,6 +1,6 @@
 <% if inside_contents_tab? %>
   <% content_for :sub_menu do %>
-    <ul id="sub_nav" data-hook="essentials_sub_nav">
+    <ul id="sub_nav" data-hook="essentials_sub_nav" class="inline-menu">
       <% SpreeEssentials.essentials.each_pair do |name, cls| %>
         <%= tab *cls.sub_tab if defined?(cls.sub_tab) %>
       <% end %>
diff --git a/app/views/spree/admin/uploads/_form.html.erb b/app/views/spree/admin/uploads/_form.html.erb
index 2c02414..a5eba50 100644
--- a/app/views/spree/admin/uploads/_form.html.erb
+++ b/app/views/spree/admin/uploads/_form.html.erb
@@ -1,8 +1,17 @@
-<p>
-  <%= form.label :attachment %>:<br/>
-  <%= form.file_field :attachment %>
-</p>
-<p>
-  <%= form.label :alt, t('description') %>:<br/>
-  <%= form.text_field :alt, :class => 'text' %>
-</p>
+<div data-hook="admin_upload_form_fields">
+  <div class="left eight columns alpha" data-hook="admin_product_form_left">
+    <%= form.field_container :attachment do %>
+      <%= form.label :attachment %>
+      <%= form.file_field :attachment %>
+      <%= form.error_message_on :attachment %>
+    <% end %>
+  </div>
+
+  <div class="left eight columns alpha" data-hook="admin_product_form_left">
+    <%= form.field_container :attachment do %>
+      <%= form.label :alt, t('description') %>
+      <%= form.text_field :alt, :class => 'text' %>
+      <%= form.error_message_on :attachment %>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/spree/admin/uploads/edit.html.erb b/app/views/spree/admin/uploads/edit.html.erb
index f5e609f..49f539d 100644
--- a/app/views/spree/admin/uploads/edit.html.erb
+++ b/app/views/spree/admin/uploads/edit.html.erb
@@ -15,7 +15,6 @@
       <% end %>
     </p>
     <%= render "form", :form => f %>
-  </table>
   <p class="form-buttons">
     <%= button t("update") %>
     or <%= link_to t("cancel"), admin_uploads_url, :id => "cancel_link" %>
diff --git a/app/views/spree/admin/uploads/index.html.erb b/app/views/spree/admin/uploads/index.html.erb
index 0508cb8..ac2600a 100644
--- a/app/views/spree/admin/uploads/index.html.erb
+++ b/app/views/spree/admin/uploads/index.html.erb
@@ -1,57 +1,90 @@
+<% content_for :page_title do %>
+  <%= t(:listing_uploads) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <div class="toolbar" data-hook="toolbar">
+    <ul class="actions header-action-links inline-menu">
+      <li id="new_product_link">
+        <%= button_link_to t(".new_upload"), new_object_url, { :icon => 'icon-plus', :id => 'new_image_link' } %>
+      </li>
+    </ul>
+  </div>
+<% end %>
 
-<h1><%= t('.listing_uploads') %></h1>
+<% content_for :table_filter_title do %>
+  <%= t(:search) %>
+<% end %>
 
-<table class="index">
-	<tr>
-	  <th><%= t("thumbnail") %></th>
-	  <th><%= sort_link @search, :attachment_file_name, t("upload.file_name") %></th>
-	  <th><%= sort_link @search, :description, t("description") %></th>
-	  <th><%= sort_link @search, :attachment_file_size, t("upload.size") %></th>
-	  <th><%= t("action") %></th>
-	</tr>
- 
-  <% @uploads.each do |upload| %>
-    <tr id="<%= dom_id(upload) %>">
-      <td class="thumbnail">
-        <% if upload.image_content? %>
-          <%= link_to image_tag(upload.attachment.url(:mini)), upload.attachment.url(:large) %>
-        <% end %>
-      </td>
-      <td><%= link_to upload.attachment_file_name, upload.attachment.url(:original) %></td>
-      <td><%= upload.alt %></td>
-      <td><%= upload.attachment_file_size.to_i / 1024 %> kb</td>
-      <td class="actions">
-        <%= link_to_with_icon('edit', t("edit"), edit_admin_upload_url(upload)) %>
-        &nbsp;
-        <%= link_to_delete upload, {:url => admin_upload_url(upload) }%>
-      </td>
-    </tr>
-  <% end %>
- 
-</table>
+<% content_for :table_filter do %>
+  <div data-hook="admin_uploads_filter_fields">
+    <%= search_form_for [ :admin, @search ] do |f| %>
+      <div class="alpha">
+        <div class="field">
+          <%= f.label :alt_cont, t("description") %><br />
+          <%= f.text_field :alt_cont, :size => 25 %>
+        </div>
+      </div>
 
-<%= paginate @uploads %>
+      <div class="clear"></div>
 
+      <div class="form-buttons actions filter-actions" data-hook="admin_products_index_search_buttons">
+        <%= button t(:search), 'icon-search' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
 
-<% content_for :sidebar do %>
+<% if @uploads.any? %>
+  <table class="index" id="listing_uploads">
+    <colgroup>
+      <col style="width: 15%;">
+      <col style="width: 10%;">
+      <col style="width: 48%;">
+      <col style="width: 10%;">
+      <col style="width: 17%;">
+    </colgroup>
+    <thead>
+      <tr>
+        <th><%= t("thumbnail") %></th>
+        <th><%= sort_link @search, :attachment_file_name, t("upload.file_name") %></th>
+        <th><%= sort_link @search, :description, t("description") %></th>
+        <th><%= sort_link @search, :attachment_file_size, t("upload.size") %></th>
+      </tr>
+    </thead>
 
-<div class="box">
-  <h3><%= t(:search) %></h3>
-  <%= search_form_for [ :admin, @search ] do |f| %>
-    <p>
-      <%= f.label :alt_cont, t("description") %><br />
-      <%= f.text_field :alt_cont, :size => 25 %>
-    </p>
-    <p><%= button t("search") %></p>
-  <% end %>
-</div>
+    <% @uploads.each do |upload| %>
+      <tr id="<%= dom_id(upload) %>">
+        <td class="thumbnail">
+          <% if upload.image_content? %>
+            <%= link_to image_tag(upload.attachment.url(:mini)), upload.attachment.url(:large) %>
+          <% end %>
+        </td>
+        <td><%= link_to upload.attachment_file_name, upload.attachment.url(:original) %></td>
+        <td><%= upload.alt %></td>
+        <td><%= upload.attachment_file_size.to_i / 1024 %> kb</td>
+        <td class="actions">
+          <%= link_to_edit upload, :no_text => true, :class => 'edit' %>
+          &nbsp;
+          <%= link_to_delete upload, :no_text => true %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+
+  <%= paginate @uploads %>
+<% else %>
+  <div class="no-objects-found">
+    <%= t(:no_results) %>
+  </div>
+<% end %>
+
+
+<% content_for :sidebar do %>
 <% end %>
 
 <div id="images"></div>
 <br/>
-<p>
-  <%= link_to icon('add') + ' ' + t(".new_upload"), new_admin_upload_url, :id => "new_image_link" %>
-</p>
 
 <% content_for :head do %>
   <script type="text/javascript">

From 5d7000aebe92021cc9b8ac6da723a1826d471613 Mon Sep 17 00:00:00 2001
From: Stephane Bounmy <stephanebounmy@gmail.com>
Date: Thu, 22 Aug 2013 23:46:43 +0200
Subject: [PATCH 19/25] support spree 2.0.X

---
 Gemfile                                       |  1 -
 .../spree/admin/spree_essentials_helper.rb    |  4 +-
 app/views/spree/admin/uploads/index.html.erb  | 20 +++----
 config/locales/en.yml                         | 53 +++++++++----------
 lib/spree_essentials.rb                       | 17 +++---
 .../testing/integration_case.rb               | 21 ++++++--
 spree_essentials.gemspec                      | 11 ++--
 test/dummy_hooks/templates/admin/all.css      |  2 +-
 test/dummy_hooks/templates/admin/all.js       |  2 +-
 test/dummy_hooks/templates/store/all.css      |  4 +-
 test/dummy_hooks/templates/store/all.js       |  2 +-
 .../spree/admin/extension_integration_test.rb | 22 ++++----
 .../spree/admin/markdown_integration_test.rb  | 14 ++---
 .../spree/admin/upload_integration_test.rb    |  3 +-
 .../views/spree/admin/examples/index.html.erb |  4 +-
 test/test_helper.rb                           |  1 +
 16 files changed, 97 insertions(+), 84 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3a588c5..1c1d1dd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,5 +3,4 @@ gemspec
 
 group :development, :test do
   gem "spree_essential_example", :path => "test/spree_essential_example"
-  gem 'coffee-rails'
 end
\ No newline at end of file
diff --git a/app/helpers/spree/admin/spree_essentials_helper.rb b/app/helpers/spree/admin/spree_essentials_helper.rb
index 0b6a994..d932013 100644
--- a/app/helpers/spree/admin/spree_essentials_helper.rb
+++ b/app/helpers/spree/admin/spree_essentials_helper.rb
@@ -6,14 +6,14 @@ def inside_contents_tab?
 
   def contents_tab
     content_tag :li, :class => inside_contents_tab? ? 'selected tab-with-icon' : 'tab-with-icon' do
-      link_to_with_icon 'icon-book', I18n.t('spree.admin.shared.contents_tab.content'), extension_routes.first
+      link_to_with_icon 'icon-book', Spree.t('admin.shared.contents_tab.content'), extension_routes.first
     end
   end
 
   def markdown_helper
     content_tag('em', :class => 'small markdown-helper') do
       [
-        t('essentials.parsed_with'),
+        Spree.t('essentials.parsed_with'),
         link_to("Markdown", "http://daringfireball.net/projects/markdown/basics", :onclick => 'window.open(this.href); return false')
       ].join(" ").html_safe
     end
diff --git a/app/views/spree/admin/uploads/index.html.erb b/app/views/spree/admin/uploads/index.html.erb
index 8f4fa8d..e80f3b6 100644
--- a/app/views/spree/admin/uploads/index.html.erb
+++ b/app/views/spree/admin/uploads/index.html.erb
@@ -1,19 +1,19 @@
 <% content_for :page_title do %>
-  <%= t('.listing_uploads') %>
+  <%= Spree.t(:'.listing_uploads') %>
 <% end %>
 
 <% content_for :page_actions do %>
   <div class="toolbar" data-hook="toolbar">
     <ul class="actions header-action-links inline-menu">
       <li>
-        <%= button_link_to t(".new_upload"), new_object_url, :id => "new_image_link", :icon => 'icon-plus' %>
+        <%= button_link_to Spree.t(:'.new_upload'), new_object_url, :id => "new_image_link", :icon => 'icon-plus' %>
       </li>
     </ul>
   </div>
 <% end %>
 
 <% content_for :table_filter_title do %>
-  <%= t(:search) %>
+  <%= Spree.t(:search) %>
 <% end %>
 
 <% content_for :table_filter do %>
@@ -23,7 +23,7 @@
       <div data-hook="admin_uploads_index_search">
         <div class="alpha nine columns">
           <div class="field">
-            <%= f.label :alt_cont, t("description") %>
+            <%= f.label :alt_cont, Spree.t(:description) %>
             <%= f.text_field :alt_cont, :size => 25 %>
           </div>
         </div>
@@ -32,7 +32,7 @@
       <div class="clear"></div>
 
       <div class="form-buttons actions filter-actions" data-hook="admin_uploads_index_search_buttons">
-        <%= button t(:search), 'icon-search' %>
+        <%= button Spree.t(:search), 'icon-search' %>
       </div>
     <% end %>
   </div>
@@ -50,10 +50,10 @@
       <col style="width: 17%;">
     </colgroup>
   	<tr>
-  	  <th><%= t("thumbnail") %></th>
-  	  <th><%= sort_link @search, :attachment_file_name, t("upload.file_name") %></th>
-  	  <th><%= sort_link @search, :description, t("description") %></th>
-  	  <th><%= sort_link @search, :attachment_file_size, t("upload.size") %></th>
+  	  <th><%= Spree.t(:thumbnail) %></th>
+  	  <th><%= sort_link @search, :attachment_file_name, Spree.t(:"upload.file_name") %></th>
+  	  <th><%= sort_link @search, :description, Spree.t(:description) %></th>
+  	  <th><%= sort_link @search, :attachment_file_size, Spree.t(:"upload.size") %></th>
   	  <th data-hook="admin_uploads_index_header_actions" class="actions"></th>
   	</tr>
 
@@ -79,7 +79,7 @@
   <%= paginate @uploads %>
 <% else %>
   <div class="no-objects-found">
-    <%= t(:no_results) %>
+    <%= Spree.t(:no_results) %>
   </div>
 <% end %>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 17db655..b0afa8f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,38 +1,37 @@
 en:
+  spree:
+    successfully_created: "%{resource} has been successfully created!"
+    successfully_removed: "%{resource} has been successfully removed!"
+    successfully_updated: "%{resource} has been successfully updated!"
 
-  successfully_created: "%{resource} has been successfully created!"
-  successfully_removed: "%{resource} has been successfully removed!"
-  successfully_updated: "%{resource} has been successfully updated!"
-  
-  essentials:
-    parsed_with: Parsed With
+    essentials:
+      parsed_with: Parsed With
+
+    activerecord:
+      attributes:
+        order:
+          completed_at: Completed At
+      errors:
+        messages:
+          invalid_date_time: is an invalid date.
+
+    upload:
+      model_name: Upload
+      file_name: File Name
+      size: Size
+
+    # spree hack
+    first_name_start: "First Name starts with"
+    last_name_start: "Last Name starts with"
 
-  activerecord:
-    attributes:
-      order:
-        completed_at: Completed At
-    errors:
-      messages:
-        invalid_date_time: is an invalid date.
-           
-  upload:
-    model_name: Upload
-    file_name: File Name
-    size: Size
-    
-  # spree hack  
-  first_name_start: "First Name starts with"
-  last_name_start: "Last Name starts with"
-  
-  spree:
     admin:
       shared:
         contents_tab:
           content: Content
-        
+
       subnav:
-        uploads: Uploads      
-                  
+        uploads: Uploads
+
       uploads:
         new:
           new_upload: New Upload
diff --git a/lib/spree_essentials.rb b/lib/spree_essentials.rb
index 4f32787..82fa237 100644
--- a/lib/spree_essentials.rb
+++ b/lib/spree_essentials.rb
@@ -1,28 +1,31 @@
 require "spree_core"
+require 'spree_api'
+require "spree_frontend"
+require "spree_backend"
 require "rdiscount"
 
 require "spree_essentials/version"
 require "spree_essentials/engine"
 
 module SpreeEssentials
-  
+
   class << self
-  
+
     # Stores an essential-aware extension for use later
     def register(key, extension)
       essentials[key] = extension
     end
-        
-    # Looks up an extension name 
+
+    # Looks up an extension name
     def has?(essential)
       essentials.keys.include?(essential.to_sym)
     end
-    
+
     # Returns the array of essential-aware extensions
     def essentials
       @essentials ||= {}
     end
-    
+
   end
-  
+
 end
diff --git a/lib/spree_essentials/testing/integration_case.rb b/lib/spree_essentials/testing/integration_case.rb
index 8b9cd4c..7638090 100644
--- a/lib/spree_essentials/testing/integration_case.rb
+++ b/lib/spree_essentials/testing/integration_case.rb
@@ -1,6 +1,15 @@
 require "capybara/rails"
 require "selenium/webdriver"
 
+class SuperAbility
+  include CanCan::Ability
+
+  def initialize(user)
+    # allow anyone to perform anything on anything
+    can :manage, :all
+  end
+end
+
 class SpreeEssentials::IntegrationCase < ActiveSupport::TestCase
 
   include Capybara::DSL
@@ -25,10 +34,14 @@ def spree
   end
 
   # Stub authorization for all admin controllers
-  def stub_authorization!
-    subclasses = Spree::Admin::BaseController.subclasses + Spree::Admin::ResourceController.subclasses
-    subclasses.each do |klass|
-      klass.any_instance.stubs(:authorize!).returns(true)
+  def self.stub_authorization!
+    #   SpreeEssentials.essentials.clear
+    setup do
+      Spree::Ability.register_ability(SuperAbility)
+    end
+
+    teardown do
+      Spree::Ability.remove_ability(SuperAbility)
     end
   end
 
diff --git a/spree_essentials.gemspec b/spree_essentials.gemspec
index 0b8ca83..1f68a22 100644
--- a/spree_essentials.gemspec
+++ b/spree_essentials.gemspec
@@ -18,11 +18,13 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency('spree_core',  '~> 1.3.0')
+  s.add_runtime_dependency('spree_core',  '~> 2.0')
+  s.add_runtime_dependency('spree_frontend',  '~> 2.0')
+  s.add_runtime_dependency('spree_backend',  '~> 2.0')
   s.add_runtime_dependency('rdiscount',   '~> 1.6.8')
 
   s.add_development_dependency 'm'
-  s.add_development_dependency('mocha',        '~> 0.12.7')
+  s.add_development_dependency('mocha',        '0.13.3')
   s.add_development_dependency('shoulda',      '~> 3.0.0')
   s.add_development_dependency('shoulda-context', '1.0.0')
   s.add_development_dependency('dummier',      '~> 0.3.0')
@@ -31,8 +33,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency('selenium-webdriver', '2.35.0')
   s.add_development_dependency('sqlite3',      '~> 1.3.4')
   s.add_development_dependency('simplecov',    '~> 0.6.1')
-  s.add_development_dependency('sass-rails',   '~> 3.2.5')
-  s.add_development_dependency('jquery-rails', '~> 2.1.3')
+  s.add_development_dependency('sass-rails',   '~> 3.2')
+  s.add_development_dependency('jquery-rails', '~> 3.0.0')
+  s.add_development_dependency('coffee-rails', '~> 3.2')
   # s.add_development_dependency('debugger')
 
 end
diff --git a/test/dummy_hooks/templates/admin/all.css b/test/dummy_hooks/templates/admin/all.css
index df30420..8f3863e 100644
--- a/test/dummy_hooks/templates/admin/all.css
+++ b/test/dummy_hooks/templates/admin/all.css
@@ -1,3 +1,3 @@
 /*
-*= require admin/spree_core
+*= require admin/spree_backend
 */
diff --git a/test/dummy_hooks/templates/admin/all.js b/test/dummy_hooks/templates/admin/all.js
index 7623dee..7fdf131 100644
--- a/test/dummy_hooks/templates/admin/all.js
+++ b/test/dummy_hooks/templates/admin/all.js
@@ -1,5 +1,5 @@
 //= require jquery
 //= require jquery_ujs
-//= require admin/spree_core
+//= require admin/spree_backend
 //= require_tree .
 
diff --git a/test/dummy_hooks/templates/store/all.css b/test/dummy_hooks/templates/store/all.css
index f65b933..1d0063e 100644
--- a/test/dummy_hooks/templates/store/all.css
+++ b/test/dummy_hooks/templates/store/all.css
@@ -1,3 +1,3 @@
 /*
-*= require store/spree_core
-*/  
+*= require store/spree_frontend
+*/
diff --git a/test/dummy_hooks/templates/store/all.js b/test/dummy_hooks/templates/store/all.js
index d5cb5c7..d10fba7 100644
--- a/test/dummy_hooks/templates/store/all.js
+++ b/test/dummy_hooks/templates/store/all.js
@@ -1 +1 @@
-//= require store/spree_core
+//= require store/spree_frontend
diff --git a/test/integration/spree/admin/extension_integration_test.rb b/test/integration/spree/admin/extension_integration_test.rb
index a125adb..461397c 100644
--- a/test/integration/spree/admin/extension_integration_test.rb
+++ b/test/integration/spree/admin/extension_integration_test.rb
@@ -1,12 +1,8 @@
 require "integration_test_helper"
 
 class Spree::Admin::ExtensionIntegrationTest < SpreeEssentials::IntegrationCase
-  
-  setup do
-    SpreeEssentials.essentials.clear
-    stub_authorization!
-  end
-  
+  stub_authorization!
+
   context "When no extensions are registered" do
     should "have a contents tab with only uploads in the sub nav" do
       visit spree.admin_orders_path
@@ -19,19 +15,19 @@ class Spree::Admin::ExtensionIntegrationTest < SpreeEssentials::IntegrationCase
       end
       assert has_css?("#sub-menu li", :count => 1)
     end
-  
+
   end
-  
+
   context "When an extension is registered" do
-    
+
     setup do
       SpreeEssentials.register :example, SpreeEssentialExample
     end
-    
+
     teardown do
       SpreeEssentials.essentials.clear
     end
-    
+
     should "have a contents tab with examples and uploads in the sub nav" do
       visit spree.admin_orders_path
       within "#admin-menu" do
@@ -44,7 +40,7 @@ class Spree::Admin::ExtensionIntegrationTest < SpreeEssentials::IntegrationCase
       end
       assert has_css?("#sub-menu li", :count => 2)
     end
-    
+
   end
-  
+
 end
diff --git a/test/integration/spree/admin/markdown_integration_test.rb b/test/integration/spree/admin/markdown_integration_test.rb
index b78759b..8d414df 100644
--- a/test/integration/spree/admin/markdown_integration_test.rb
+++ b/test/integration/spree/admin/markdown_integration_test.rb
@@ -1,16 +1,16 @@
 require "integration_test_helper"
 
 class Spree::Admin::MarkdownIntegrationTest < SpreeEssentials::IntegrationCase
+  stub_authorization!
 
   setup do
     SpreeEssentials.register :example, SpreeEssentialExample
-    stub_authorization!
   end
-  
+
   teardown do
     SpreeEssentials.essentials.clear
   end
-  
+
   MARKDOWN = <<MD
 
 ### OMG
@@ -22,7 +22,7 @@ class Spree::Admin::MarkdownIntegrationTest < SpreeEssentials::IntegrationCase
 [just a link](http://example.com)
 
 MD
-  
+
   def assert_markdown_renders
     assert_seen "OMG",    :within => "h3"
     assert_seen "item 1", :within => "ul li"
@@ -30,14 +30,14 @@ def assert_markdown_renders
     assert_seen "italic", :within => "em"
     assert has_link?("just a link", :href => "http://example.com")
   end
-   
+
   should "render have markdown editor and render it's result" do
     visit spree.new_admin_example_path
     fill_in "Title", :with => "Just an example"
     fill_in "Body",  :with => MARKDOWN
     within ".markItUpHeader" do
       click_link "Preview"
-    end    
+    end
     within_frame "markItUpPreviewFrame" do
       assert_markdown_renders
     end
@@ -47,5 +47,5 @@ def assert_markdown_renders
       assert_markdown_renders
     end
   end
-  
+
 end
diff --git a/test/integration/spree/admin/upload_integration_test.rb b/test/integration/spree/admin/upload_integration_test.rb
index 891bf21..e21a30b 100644
--- a/test/integration/spree/admin/upload_integration_test.rb
+++ b/test/integration/spree/admin/upload_integration_test.rb
@@ -1,13 +1,12 @@
 require "integration_test_helper"
-require 'debugger'
 
 class Spree::Admin::UploadIntegrationTest < SpreeEssentials::IntegrationCase
+  stub_authorization!
 
   def setup
     Spree::Upload.destroy_all
     @image  = File.expand_path("../../../../support/files/1.png", __FILE__)
     @image2 = File.expand_path("../../../../support/files/2.png", __FILE__)
-    stub_authorization!
   end
 
   should "have a contents tab" do
diff --git a/test/spree_essential_example/app/views/spree/admin/examples/index.html.erb b/test/spree_essential_example/app/views/spree/admin/examples/index.html.erb
index 9e7e0cb..d0942a7 100644
--- a/test/spree_essential_example/app/views/spree/admin/examples/index.html.erb
+++ b/test/spree_essential_example/app/views/spree/admin/examples/index.html.erb
@@ -12,13 +12,13 @@
 <table class="index">
   <tr>
 	  <th>Title</th>
-	  <th><%= t("action") %></th>
+	  <th><%= Spree.t(:action) %></th>
 	</tr>
   <% @examples.each do |example| %>
     <tr>
       <td><%= link_to example.title, admin_example_url(example) %></td>
       <td class="actions">
-        <%= link_to_with_icon('edit', t("edit"), edit_admin_example_url(example)) %>
+        <%= link_to_with_icon('edit', Spree.t(:edit), edit_admin_example_url(example)) %>
         <%= link_to_delete example, {:url => admin_example_url(example) }%>
       </td>
     </tr>
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 45290e0..82bcb5f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -10,3 +10,4 @@
 
 require "spree_essentials/testing/test_helper"
 require "spree_essential_example"
+# require 'debugger'

From b3c785323fd28182370a70ba94c78aa5cb4dc6bf Mon Sep 17 00:00:00 2001
From: Stephane Bounmy <stephanebounmy@gmail.com>
Date: Fri, 23 Aug 2013 08:29:27 +0200
Subject: [PATCH 20/25] use transaction fixtures with shared connection

---
 lib/spree_essentials/testing/integration_case.rb | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/spree_essentials/testing/integration_case.rb b/lib/spree_essentials/testing/integration_case.rb
index 7638090..0dba720 100644
--- a/lib/spree_essentials/testing/integration_case.rb
+++ b/lib/spree_essentials/testing/integration_case.rb
@@ -10,6 +10,20 @@ def initialize(user)
   end
 end
 
+# In your test_helper.rb
+class ActiveRecord::Base
+  mattr_accessor :shared_connection
+  @@shared_connection = nil
+
+  def self.connection
+    @@shared_connection || retrieve_connection
+  end
+end
+
+# Forces all threads to share the same connection. This works on
+# Capybara because it starts the web server in a thread.
+ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+
 class SpreeEssentials::IntegrationCase < ActiveSupport::TestCase
 
   include Capybara::DSL
@@ -17,7 +31,7 @@ class SpreeEssentials::IntegrationCase < ActiveSupport::TestCase
   Capybara.default_driver   = :selenium
   Capybara.default_selector = :css
 
-  self.use_transactional_fixtures = false
+  self.use_transactional_fixtures = true
 
   # Checks for missing translations after each test
   teardown do

From 8fb594ff16b1d5c5e3db12133199e01407852207 Mon Sep 17 00:00:00 2001
From: Stephane Bounmy <stephanebounmy@gmail.com>
Date: Fri, 23 Aug 2013 08:39:20 +0200
Subject: [PATCH 21/25] removed ruby 1.8.7 from travis ( not supported )

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9345646..959ade8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - ree

From 544b0b0d7f7ebdf3d38a1d6024f83a2dc6562443 Mon Sep 17 00:00:00 2001
From: Stephane Bounmy <stephanebounmy@gmail.com>
Date: Fri, 23 Aug 2013 08:46:53 +0200
Subject: [PATCH 22/25] removed 1.9.2 aswell capybara and spree 2.0.0 >= 1.9.3

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 959ade8..4c52465 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 rvm:
-  - 1.9.2
   - 1.9.3
   - ree
 

From 31ab226675b674b48be57c6c72152474fc3d042d Mon Sep 17 00:00:00 2001
From: Stephane Bounmy <stephanebounmy@gmail.com>
Date: Fri, 23 Aug 2013 08:47:51 +0200
Subject: [PATCH 23/25] removed ree from travis aswell

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4c52465..6492e9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 rvm:
   - 1.9.3
-  - ree
 
 before_script:
   - "sh -e /etc/init.d/xvfb start"

From 4f9f73b5f27c7821df9ecfb64ae3a51ea3db680f Mon Sep 17 00:00:00 2001
From: Stephane Bounmy <stephanebounmy@gmail.com>
Date: Sat, 24 Aug 2013 08:42:17 +0200
Subject: [PATCH 24/25] update readme

---
 README.md | 69 ++++++++++++++++++++++++-------------------------------
 1 file changed, 30 insertions(+), 39 deletions(-)

diff --git a/README.md b/README.md
index af6d955..0741de2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Spree Essentials [![Build Status](https://secure.travis-ci.org/citrus/spree_essentials.png)](http://travis-ci.org/citrus/spree_essentials)
+# Spree Essentials [![Build Status](https://secure.travis-ci.org/sbounmy/spree_essentials.png)](http://travis-ci.org/sbounmy/spree_essentials)
 
 Spree Essentials is the base for many content related extensions for Spree. It doesn't do much on it's own ;)
 
@@ -12,11 +12,15 @@ Spree Essentials provides other extensions with:
 
 Current essential-aware extensions include:
 
-* [spree_essential_cms](https://github.com/citrus/spree_essential_cms): A full featured CMS with pages, contents, images and more
+Maintained by me :
+* [spree_essential_cms](https://github.com/sbounmy/spree_essential_cms): A full featured CMS with pages, contents, images and more
+
+
 * [spree_essential_blog](https://github.com/citrus/spree_essential_blog): A blog complete with archives, categories, tags and related products
 * [spree_essential_press](https://github.com/citrus/spree_essential_press): A simple press page for displaying media related content.
 
 
+
 ------------------------------------------------------------------------------
 Installation
 ------------------------------------------------------------------------------
@@ -24,30 +28,17 @@ Installation
 If you don't already have an existing Spree site, [click here](https://gist.github.com/946719) then come back later... You can also read the Spree docs [here](http://spreecommerce.com/documentation/getting_started.html)...
 
 Spree Essentials can be installed by itself by adding the following to your Gemfile:
-    
-```ruby
-# Spree 1.1.x
-gem 'spree_essentials', '~> 0.5.0'
-
-# Spree 1.0.x
-gem 'spree_essentials', '~> 0.4.0'
 
-# Spree 0.70.x
-gem 'spree_essentials', '~> 0.3.3'
+```ruby
+# Spree 2.0.x
+gem 'spree_essentials', :git => "git://github.com/sbounmy/spree_essentials.git", :branch => 'master'
 
-# Spree 0.60.x
-gem 'spree_essentials', '~> 0.2.3'
+# Spree 1.3.x
+gem 'spree_essentials', :git => "git://github.com/sbounmy/spree_essentials.git", :branch => '1-3-stable'
 ```
 
-This isn't necessary if you're using spree_essentials based extensions. If that's the case, just include the extensions normally:
-
-```ruby  
-gem 'spree_essential_cms'
-gem 'spree_essential_blog'
-```
-    
 Then run:
-    
+
 ```bash
 bundle install
 ```
@@ -55,19 +46,19 @@ bundle install
 Once that's complete, run the migration generator and migrate your database:
 
 To see your available generators run
- 
+
 ```bash
 rails g
 ```
-    
-Now run the generators for extensions you wish to install    
 
-```bash 
+Now run the generators for extensions you wish to install
+
+```bash
 rails g spree_essentials:install
 rails g spree_essentials:cms
 rails g spree_essentials:blog
 ```
-    
+
 Then migrate your database:
 
 ```bash
@@ -150,7 +141,7 @@ If you're using the [CMS](https://github.com/citrus/spree_essential_cms) or [blo
 
 ```ruby
 # app/models/spree/asset_decorator.rb
-[ Spree::Content, Spree::PageImage, Spree::PostImage, Spree::Upload ].each do |cls| 
+[ Spree::Content, Spree::PageImage, Spree::PostImage, Spree::Upload ].each do |cls|
   cls.attachment_definitions[:attachment].merge!(
     :storage        => 's3',
     :s3_credentials => Rails.root.join('config', 's3.yml'),
@@ -169,7 +160,7 @@ Notes
 
 Spree Essentials is under constant development... Development is being done on OSX with Ruby 1.9.3 and usually the latest version of Spree. (currently 1.1.0)
 
-Please let me know if you find any bugs or have feature requests you'd like to see. 
+Please let me know if you find any bugs or have feature requests you'd like to see.
 
 
 ------------------------------------------------------------------------------
@@ -179,22 +170,22 @@ Testing
 The test suite can be run like so:
 
 ```bash
-git clone git://github.com/citrus/spree_essentials.git
+git clone git://github.com/sbounmy/spree_essentials.git
 cd spree_essentials
 bundle install
 bundle exec dummier
-rake
-```    
+rake test
+```
+
 
- 
 ------------------------------------------------------------------------------
 Demo
 ------------------------------------------------------------------------------
 
 You can easily use the test/dummy app as a demo of spree_essentials. Just `cd` to where you develop and run:
-  
-```bash  
-git clone git://github.com/citrus/spree_essentials.git
+
+```bash
+git clone git://github.com/sbounmy/spree_essentials.git
 cd spree_essentials
 cp test/dummy_hooks/after_migrate.rb.sample test/dummy_hooks/after_migrate.rb
 bundle install
@@ -203,7 +194,7 @@ cd test/dummy
 rails s
 ```
 
- 
+
 ------------------------------------------------------------------------------
 To Do
 ------------------------------------------------------------------------------
@@ -217,7 +208,7 @@ Change Log
 
 **0.50.0 - 2012/5/1**
 
-* Depend on Spree 1.1.0 
+* Depend on Spree 1.1.0
 * Remove `add_attachment_file_size_to_assets` migration
 
 
@@ -239,7 +230,7 @@ Change Log
 * Use rails engine conventions for installation
 * Remove shared InstallGenerator class
 * Improved test coverage
-* Added test/spree_essential_example 
+* Added test/spree_essential_example
 
 
 **0.40.0.rc2, 0.3.3 - 2012/1/20**
@@ -261,7 +252,7 @@ Change Log
 **0.3.1 - 2011/12/13**
 
 * Fix broken markitup editor
-* Rework 'selected' class on content tab 
+* Rework 'selected' class on content tab
 
 
 **0.3.0 - 2011/12/13**

From 89711d2e98dcd687335c0fca901b596da8811862 Mon Sep 17 00:00:00 2001
From: Stephane Bounmy <stephanebounmy@gmail.com>
Date: Sat, 24 Aug 2013 08:44:09 +0200
Subject: [PATCH 25/25] update readme

---
 README.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0741de2..50b7184 100644
--- a/README.md
+++ b/README.md
@@ -12,10 +12,7 @@ Spree Essentials provides other extensions with:
 
 Current essential-aware extensions include:
 
-Maintained by me :
-* [spree_essential_cms](https://github.com/sbounmy/spree_essential_cms): A full featured CMS with pages, contents, images and more
-
-
+* [spree_essential_cms](https://github.com/sbounmy/spree_essential_cms): A full featured CMS with pages, contents, images and more (Maintained by me)
 * [spree_essential_blog](https://github.com/citrus/spree_essential_blog): A blog complete with archives, categories, tags and related products
 * [spree_essential_press](https://github.com/citrus/spree_essential_press): A simple press page for displaying media related content.