spree 0.10.2 → 0.11.0

data/vendor/plugins/resource_controller/lib/resource_controller/helpers/internal.rb

@@ -39,11 +39,11 @@ module ResourceController
           set_flash_now(action)
         end
   
-        # Sets the regular flash (i.e. flash[:notice] = '...')
+        # Sets the regular flash (i.e. self.notice = '...')
         #
         def set_normal_flash(action)
           if f = options_for(action).flash
-            flash[:notice]     = f.is_a?(Proc) ? instance_eval(&f) : options_for(action).flash
+            self.notice     = f.is_a?(Proc) ? instance_eval(&f) : options_for(action).flash
           end
         end
   

data/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb

@@ -34,32 +34,32 @@ module SslRequirement
       write_inheritable_array(:ssl_allowed_actions, actions)
     end
   end
-  
+
   protected
     # Returns true if the current action is supposed to run as SSL
     def ssl_required?
       (self.class.read_inheritable_attribute(:ssl_required_actions) || []).include?(action_name.to_sym)
     end
-    
+
     def ssl_allowed?
       (self.class.read_inheritable_attribute(:ssl_allowed_actions) || []).include?(action_name.to_sym)
     end
 
   private
     def dvp_mode?
-      ENV['RAILS_ENV'] == 'development' ? true : false
+      ENV['RAILS_ENV'] == 'development'
     end
 
     def test_mode?
-      ENV['RAILS_ENV'] == 'test' ? true : false
+      ENV['RAILS_ENV'] == 'test' || ENV['RAILS_ENV'] == 'cucumber'
     end
 
-    # don't require ssl in development or test mode 
+    # don't require ssl in development or test mode
     def ssl_supported?
       ((dvp_mode? || test_mode?) && Spree::Config[:allow_ssl_in_development_and_test]) ||
       (!dvp_mode? && !test_mode? && Spree::Config[:allow_ssl_in_production]) ? true : false
     end
-  
+
     def ensure_proper_protocol
       return true if ssl_allowed?
 
@@ -73,4 +73,4 @@ module SslRequirement
         return false
       end
     end
-end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 10
-  - 2
-  version: 0.10.2
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Sean Schofield
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 -04:00
+date: 2010-06-11 00:00:00 -04:00
 default_executable: spree
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,8 @@ dependencies:
         segments: 
         - 2
         - 3
-        - 5
-        version: 2.3.5
+        - 8
+        version: 2.3.8
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -54,9 +54,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 0
         - 1
-        version: 1.0.1
+        - 0
+        version: 1.1.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -78,13 +78,13 @@ dependencies:
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 1
-        - 2
-        version: 2.1.2
+        - 3
+        version: 2.1.3
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -256,6 +256,20 @@ dependencies:
         version: 2.3.1.1
   type: :runtime
   version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: ruby-openid
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
+  type: :runtime
+  version_requirements: *id018
 description: The most flexible commerce platform available - designed from the ground up to be as open and extensible as possible.
 email: sean@railsdog.com
 executables: 
@@ -316,6 +330,7 @@ files:
 - app/controllers/content_controller.rb
 - app/controllers/countries_controller.rb
 - app/controllers/line_items_controller.rb
+- app/controllers/locale_controller.rb
 - app/controllers/orders_controller.rb
 - app/controllers/password_resets_controller.rb
 - app/controllers/products_controller.rb
@@ -325,20 +340,14 @@ files:
 - app/controllers/user_sessions_controller.rb
 - app/controllers/users_controller.rb
 - app/helpers/account_helper.rb
-- app/helpers/admin/adjustments_helper.rb
 - app/helpers/admin/base_helper.rb
-- app/helpers/admin/checkouts_helper.rb
 - app/helpers/admin/inventory_settings_helper.rb
-- app/helpers/admin/line_items_helper.rb
 - app/helpers/admin/navigation_helper.rb
 - app/helpers/admin/orders_helper.rb
 - app/helpers/admin/overview_helper.rb
 - app/helpers/admin/payments_helper.rb
 - app/helpers/admin/product_properties_helper.rb
 - app/helpers/admin/products_helper.rb
-- app/helpers/admin/properties_helper.rb
-- app/helpers/admin/prototypes_helper.rb
-- app/helpers/admin/return_authorizations_helper.rb
 - app/helpers/admin/taxons_helper.rb
 - app/helpers/admin/users_helper.rb
 - app/helpers/admin/zones_helper.rb
@@ -421,14 +430,17 @@ files:
 - app/models/zone_member.rb
 - bin/spree
 - config/boot.rb
+- config/cucumber.yml
 - config/database.yml
 - config/database.yml.example
 - config/environment.rb
+- config/environments/cucumber.rb
 - config/environments/development.rb
 - config/environments/production.rb
 - config/environments/staging.rb
 - config/environments/test.rb
 - config/initializers/backtrace_silencers.rb
+- config/initializers/cookie_verification_secret.rb
 - config/initializers/inflections.rb
 - config/initializers/locales.rb
 - config/initializers/mime_types.rb
@@ -438,52 +450,7 @@ files:
 - config/initializers/spree.rb
 - config/initializers/touch.rb
 - config/initializers/workarounds_for_ruby19.rb
-- config/locales/cs-CZ.yml
-- config/locales/cs-CZ_rails.yml
-- config/locales/da.yml
-- config/locales/da_rails.yml
-- config/locales/de-CH.yml
-- config/locales/de-CH_rails.yml
-- config/locales/de.yml
-- config/locales/de_rails.yml
-- config/locales/en-AU.yml
-- config/locales/en-AU_rails.yml
-- config/locales/en-GB.yml
-- config/locales/en-GB_rails.yml
-- config/locales/en-US.yml
-- config/locales/en-US_rails.yml
-- config/locales/es.yml
-- config/locales/es_rails.yml
-- config/locales/fi.yml
-- config/locales/fi_rails.yml
-- config/locales/fr-FR.yml
-- config/locales/fr-FR_rails.yml
-- config/locales/il.yml
-- config/locales/il_rails.yml
-- config/locales/it.yml
-- config/locales/it_rails.yml
-- config/locales/jp.yml
-- config/locales/jp_rails.yml
-- config/locales/mx.yml
-- config/locales/mx_rails.yml
-- config/locales/nb-NO.yml
-- config/locales/nb-NO_rails.yml
-- config/locales/nl-BE.yml
-- config/locales/nl-BE_rails.yml
-- config/locales/nl-NL.yml
-- config/locales/nl-NL_rails.yml
-- config/locales/pl.yml
-- config/locales/pl_rails.yml
-- config/locales/pt-BR.yml
-- config/locales/pt-BR_rails.yml
-- config/locales/pt-PT.yml
-- config/locales/pt-PT_rails.yml
-- config/locales/ru-RU.yml
-- config/locales/ru-RU_rails.yml
-- config/locales/th.yml
-- config/locales/th_rails.yml
-- config/locales/vn.yml
-- config/locales/vn_rails.yml
+- config/locales/en_spree.yml
 - config/routes.rb
 - config/schedule.rb
 - config/spree_permissions.yml
@@ -529,6 +496,14 @@ files:
 - db/migrate/20100224153127_deleted_at_for_payment_methods.rb
 - db/migrate/20100301163454_add_adjustments_index.rb
 - db/migrate/20100306153445_fix_by_popularity.rb
+- db/migrate/20100317120946_add_alt_text_to_images.rb
+- db/migrate/20100427121301_add_display_to_payment_methods.rb
+- db/migrate/20100504142133_add_addresses_checkouts_indexes.rb
+- db/migrate/20100506180619_add_icon_to_taxons.rb
+- db/migrate/20100506185838_add_description_to_taxons.rb
+- db/migrate/20100528155333_index_for_shipments_number.rb
+- db/migrate/20100528185820_add_index_on_users_persistence_token.rb
+- db/migrate/20100605152042_add_default_to_tax_categories.rb
 - db/sample/addresses.yml
 - db/sample/adjustments.yml
 - db/sample/assets.yml
@@ -563,6 +538,24 @@ files:
 - db/sample/variants.yml
 - db/schema.rb
 - db/seeds.rb
+- features/checkout.feature
+- features/create_admin_user.feature
+- features/search.feature
+- features/sign_in.feature
+- features/sign_out.feature
+- features/sign_up.feature
+- features/step_definitions/error_steps.rb
+- features/step_definitions/model_steps.rb
+- features/step_definitions/pickle_steps.rb
+- features/step_definitions/role_steps.rb
+- features/step_definitions/session_steps.rb
+- features/step_definitions/user_steps.rb
+- features/step_definitions/web_steps.rb
+- features/support/create_admin_user.rb
+- features/support/env.rb
+- features/support/paths.rb
+- features/support/pickle.rb
+- features/work_with_cart.feature
 - generate
 - lib/RFC822.rb
 - lib/annotatable.rb
@@ -672,6 +665,7 @@ files:
 - lib/spree/theme_support/hook_modifier.rb
 - lib/spree/theme_support/more_patches.rb
 - lib/tasks/consistency.rake
+- lib/tasks/cucumber.rake
 - lib/tasks/database.rake
 - lib/tasks/environments.rake
 - lib/tasks/extensions.rake
@@ -825,7 +819,6 @@ files:
 - lib/tasks/sample/products/9/product/ror_ringer.jpeg
 - lib/tasks/sample/products/9/small/ror_ringer.jpeg
 - lib/tasks/themes.rake
-- lib/tasks/translation.rake
 - lib/tasks/upgrade.rake
 - lib/validation_group.rb
 - log/README
@@ -1258,6 +1251,8 @@ files:
 - public/images/steps/6_small.png
 - public/images/sxsw-ribbon-v1.png
 - public/images/tab_bottom.gif
+- public/images/tile-header.png
+- public/images/tile-slider.png
 - public/images/top-shine.png
 - public/images/tree-nav-icons/bullet.gif
 - public/images/tree-nav-icons/minus.gif
@@ -1385,6 +1380,7 @@ files:
 - script/autospec
 - script/breakpointer
 - script/console
+- script/cucumber
 - script/dbconsole
 - script/destroy
 - script/extension
@@ -1503,6 +1499,7 @@ files:
 - test/unit/factories_test.rb
 - test/unit/flat_percent_item_total_test.rb
 - test/unit/flat_rate_calculators_test.rb
+- test/unit/flexi_rate_calculator_test.rb
 - test/unit/has_calculator_test.rb
 - test/unit/helpers/admin/adjustments_helper_test.rb
 - test/unit/helpers/admin/credits_helper_test.rb
@@ -1537,14 +1534,16 @@ files:
 - vendor/extensions/api/api_extension.rb
 - vendor/extensions/api/api_hooks.rb
 - vendor/extensions/api/app/controllers/api/base_controller.rb
+- vendor/extensions/api/app/controllers/api/countries_controller.rb
 - vendor/extensions/api/app/controllers/api/inventory_units_controller.rb
 - vendor/extensions/api/app/controllers/api/line_items_controller.rb
 - vendor/extensions/api/app/controllers/api/orders_controller.rb
 - vendor/extensions/api/app/controllers/api/products_controller.rb
 - vendor/extensions/api/app/controllers/api/shipments_controller.rb
+- vendor/extensions/api/app/controllers/api/states_controller.rb
 - vendor/extensions/api/app/helpers/api/shipments_helper.rb
 - vendor/extensions/api/app/views/admin/users/_api_fields.html.erb
-- vendor/extensions/api/config/locales/en-US.yml
+- vendor/extensions/api/config/locales/en.yml
 - vendor/extensions/api/config/locales/ru-RU.yml
 - vendor/extensions/api/config/routes.rb
 - vendor/extensions/api/db/migrate/20100107141738_add_api_key_to_users.rb
@@ -1558,271 +1557,6 @@ files:
 - vendor/extensions/api/test/unit/user_test.rb
 - vendor/extensions/calculators/README.markdown
 - vendor/extensions/calculators/calculators_extension.rb
-- vendor/extensions/localization/README.rdoc
-- vendor/extensions/localization/Rakefile
-- vendor/extensions/localization/app/controllers/admin/localization_controller.rb
-- vendor/extensions/localization/app/controllers/locale_controller.rb
-- vendor/extensions/localization/app/helpers/locale_helper.rb
-- vendor/extensions/localization/app/helpers/localization_helper.rb
-- vendor/extensions/localization/app/views/shared/_language_bar.html.erb
-- vendor/extensions/localization/config/routes.rb
-- vendor/extensions/localization/lib/localization/user_preferences.rb
-- vendor/extensions/localization/lib/tasks/localization_extension_tasks.rake
-- vendor/extensions/localization/localization_extension.rb
-- vendor/extensions/localization/public/images/flags/ad.png
-- vendor/extensions/localization/public/images/flags/ae.png
-- vendor/extensions/localization/public/images/flags/af.png
-- vendor/extensions/localization/public/images/flags/ag.png
-- vendor/extensions/localization/public/images/flags/ai.png
-- vendor/extensions/localization/public/images/flags/al.png
-- vendor/extensions/localization/public/images/flags/am.png
-- vendor/extensions/localization/public/images/flags/an.png
-- vendor/extensions/localization/public/images/flags/ao.png
-- vendor/extensions/localization/public/images/flags/ar.png
-- vendor/extensions/localization/public/images/flags/as.png
-- vendor/extensions/localization/public/images/flags/at.png
-- vendor/extensions/localization/public/images/flags/au.png
-- vendor/extensions/localization/public/images/flags/aw.png
-- vendor/extensions/localization/public/images/flags/ax.png
-- vendor/extensions/localization/public/images/flags/az.png
-- vendor/extensions/localization/public/images/flags/ba.png
-- vendor/extensions/localization/public/images/flags/bb.png
-- vendor/extensions/localization/public/images/flags/bd.png
-- vendor/extensions/localization/public/images/flags/be.png
-- vendor/extensions/localization/public/images/flags/bf.png
-- vendor/extensions/localization/public/images/flags/bg.png
-- vendor/extensions/localization/public/images/flags/bh.png
-- vendor/extensions/localization/public/images/flags/bi.png
-- vendor/extensions/localization/public/images/flags/bj.png
-- vendor/extensions/localization/public/images/flags/bm.png
-- vendor/extensions/localization/public/images/flags/bn.png
-- vendor/extensions/localization/public/images/flags/bo.png
-- vendor/extensions/localization/public/images/flags/br.png
-- vendor/extensions/localization/public/images/flags/bs.png
-- vendor/extensions/localization/public/images/flags/bt.png
-- vendor/extensions/localization/public/images/flags/bv.png
-- vendor/extensions/localization/public/images/flags/bw.png
-- vendor/extensions/localization/public/images/flags/by.png
-- vendor/extensions/localization/public/images/flags/bz.png
-- vendor/extensions/localization/public/images/flags/ca.png
-- vendor/extensions/localization/public/images/flags/catalonia.png
-- vendor/extensions/localization/public/images/flags/cc.png
-- vendor/extensions/localization/public/images/flags/cd.png
-- vendor/extensions/localization/public/images/flags/cf.png
-- vendor/extensions/localization/public/images/flags/cg.png
-- vendor/extensions/localization/public/images/flags/ch.png
-- vendor/extensions/localization/public/images/flags/ci.png
-- vendor/extensions/localization/public/images/flags/ck.png
-- vendor/extensions/localization/public/images/flags/cl.png
-- vendor/extensions/localization/public/images/flags/cm.png
-- vendor/extensions/localization/public/images/flags/cn.png
-- vendor/extensions/localization/public/images/flags/co.png
-- vendor/extensions/localization/public/images/flags/cr.png
-- vendor/extensions/localization/public/images/flags/cs.png
-- vendor/extensions/localization/public/images/flags/cu.png
-- vendor/extensions/localization/public/images/flags/cv.png
-- vendor/extensions/localization/public/images/flags/cx.png
-- vendor/extensions/localization/public/images/flags/cy.png
-- vendor/extensions/localization/public/images/flags/cz.png
-- vendor/extensions/localization/public/images/flags/da.png
-- vendor/extensions/localization/public/images/flags/de.png
-- vendor/extensions/localization/public/images/flags/de_CH.png
-- vendor/extensions/localization/public/images/flags/dj.png
-- vendor/extensions/localization/public/images/flags/dm.png
-- vendor/extensions/localization/public/images/flags/do.png
-- vendor/extensions/localization/public/images/flags/dz.png
-- vendor/extensions/localization/public/images/flags/ec.png
-- vendor/extensions/localization/public/images/flags/ee.png
-- vendor/extensions/localization/public/images/flags/eg.png
-- vendor/extensions/localization/public/images/flags/eh.png
-- vendor/extensions/localization/public/images/flags/england.png
-- vendor/extensions/localization/public/images/flags/er.png
-- vendor/extensions/localization/public/images/flags/es.png
-- vendor/extensions/localization/public/images/flags/et.png
-- vendor/extensions/localization/public/images/flags/europeanunion.png
-- vendor/extensions/localization/public/images/flags/fam.png
-- vendor/extensions/localization/public/images/flags/fi.png
-- vendor/extensions/localization/public/images/flags/fj.png
-- vendor/extensions/localization/public/images/flags/fk.png
-- vendor/extensions/localization/public/images/flags/fm.png
-- vendor/extensions/localization/public/images/flags/fo.png
-- vendor/extensions/localization/public/images/flags/fr.png
-- vendor/extensions/localization/public/images/flags/ga.png
-- vendor/extensions/localization/public/images/flags/gb.png
-- vendor/extensions/localization/public/images/flags/gd.png
-- vendor/extensions/localization/public/images/flags/ge.png
-- vendor/extensions/localization/public/images/flags/gf.png
-- vendor/extensions/localization/public/images/flags/gh.png
-- vendor/extensions/localization/public/images/flags/gi.png
-- vendor/extensions/localization/public/images/flags/gl.png
-- vendor/extensions/localization/public/images/flags/gm.png
-- vendor/extensions/localization/public/images/flags/gn.png
-- vendor/extensions/localization/public/images/flags/gp.png
-- vendor/extensions/localization/public/images/flags/gq.png
-- vendor/extensions/localization/public/images/flags/gr.png
-- vendor/extensions/localization/public/images/flags/gs.png
-- vendor/extensions/localization/public/images/flags/gt.png
-- vendor/extensions/localization/public/images/flags/gu.png
-- vendor/extensions/localization/public/images/flags/gw.png
-- vendor/extensions/localization/public/images/flags/gy.png
-- vendor/extensions/localization/public/images/flags/hk.png
-- vendor/extensions/localization/public/images/flags/hm.png
-- vendor/extensions/localization/public/images/flags/hn.png
-- vendor/extensions/localization/public/images/flags/hr.png
-- vendor/extensions/localization/public/images/flags/ht.png
-- vendor/extensions/localization/public/images/flags/hu.png
-- vendor/extensions/localization/public/images/flags/id.png
-- vendor/extensions/localization/public/images/flags/ie.png
-- vendor/extensions/localization/public/images/flags/il.png
-- vendor/extensions/localization/public/images/flags/in.png
-- vendor/extensions/localization/public/images/flags/io.png
-- vendor/extensions/localization/public/images/flags/iq.png
-- vendor/extensions/localization/public/images/flags/ir.png
-- vendor/extensions/localization/public/images/flags/is.png
-- vendor/extensions/localization/public/images/flags/it.png
-- vendor/extensions/localization/public/images/flags/jm.png
-- vendor/extensions/localization/public/images/flags/jo.png
-- vendor/extensions/localization/public/images/flags/jp.png
-- vendor/extensions/localization/public/images/flags/ke.png
-- vendor/extensions/localization/public/images/flags/kg.png
-- vendor/extensions/localization/public/images/flags/kh.png
-- vendor/extensions/localization/public/images/flags/ki.png
-- vendor/extensions/localization/public/images/flags/km.png
-- vendor/extensions/localization/public/images/flags/kn.png
-- vendor/extensions/localization/public/images/flags/kp.png
-- vendor/extensions/localization/public/images/flags/kr.png
-- vendor/extensions/localization/public/images/flags/kw.png
-- vendor/extensions/localization/public/images/flags/ky.png
-- vendor/extensions/localization/public/images/flags/kz.png
-- vendor/extensions/localization/public/images/flags/la.png
-- vendor/extensions/localization/public/images/flags/lb.png
-- vendor/extensions/localization/public/images/flags/lc.png
-- vendor/extensions/localization/public/images/flags/li.png
-- vendor/extensions/localization/public/images/flags/lk.png
-- vendor/extensions/localization/public/images/flags/lr.png
-- vendor/extensions/localization/public/images/flags/ls.png
-- vendor/extensions/localization/public/images/flags/lt.png
-- vendor/extensions/localization/public/images/flags/lu.png
-- vendor/extensions/localization/public/images/flags/lv.png
-- vendor/extensions/localization/public/images/flags/ly.png
-- vendor/extensions/localization/public/images/flags/ma.png
-- vendor/extensions/localization/public/images/flags/mc.png
-- vendor/extensions/localization/public/images/flags/md.png
-- vendor/extensions/localization/public/images/flags/me.png
-- vendor/extensions/localization/public/images/flags/mg.png
-- vendor/extensions/localization/public/images/flags/mh.png
-- vendor/extensions/localization/public/images/flags/mk.png
-- vendor/extensions/localization/public/images/flags/ml.png
-- vendor/extensions/localization/public/images/flags/mm.png
-- vendor/extensions/localization/public/images/flags/mn.png
-- vendor/extensions/localization/public/images/flags/mo.png
-- vendor/extensions/localization/public/images/flags/mp.png
-- vendor/extensions/localization/public/images/flags/mq.png
-- vendor/extensions/localization/public/images/flags/mr.png
-- vendor/extensions/localization/public/images/flags/ms.png
-- vendor/extensions/localization/public/images/flags/mt.png
-- vendor/extensions/localization/public/images/flags/mu.png
-- vendor/extensions/localization/public/images/flags/mv.png
-- vendor/extensions/localization/public/images/flags/mw.png
-- vendor/extensions/localization/public/images/flags/mx.png
-- vendor/extensions/localization/public/images/flags/my.png
-- vendor/extensions/localization/public/images/flags/mz.png
-- vendor/extensions/localization/public/images/flags/na.png
-- vendor/extensions/localization/public/images/flags/nc.png
-- vendor/extensions/localization/public/images/flags/ne.png
-- vendor/extensions/localization/public/images/flags/nf.png
-- vendor/extensions/localization/public/images/flags/ng.png
-- vendor/extensions/localization/public/images/flags/ni.png
-- vendor/extensions/localization/public/images/flags/nl.png
-- vendor/extensions/localization/public/images/flags/no.png
-- vendor/extensions/localization/public/images/flags/np.png
-- vendor/extensions/localization/public/images/flags/nr.png
-- vendor/extensions/localization/public/images/flags/nu.png
-- vendor/extensions/localization/public/images/flags/nz.png
-- vendor/extensions/localization/public/images/flags/om.png
-- vendor/extensions/localization/public/images/flags/pa.png
-- vendor/extensions/localization/public/images/flags/pe.png
-- vendor/extensions/localization/public/images/flags/pf.png
-- vendor/extensions/localization/public/images/flags/pg.png
-- vendor/extensions/localization/public/images/flags/ph.png
-- vendor/extensions/localization/public/images/flags/pk.png
-- vendor/extensions/localization/public/images/flags/pl.png
-- vendor/extensions/localization/public/images/flags/pm.png
-- vendor/extensions/localization/public/images/flags/pn.png
-- vendor/extensions/localization/public/images/flags/pr.png
-- vendor/extensions/localization/public/images/flags/ps.png
-- vendor/extensions/localization/public/images/flags/pt.png
-- vendor/extensions/localization/public/images/flags/pw.png
-- vendor/extensions/localization/public/images/flags/py.png
-- vendor/extensions/localization/public/images/flags/qa.png
-- vendor/extensions/localization/public/images/flags/re.png
-- vendor/extensions/localization/public/images/flags/ro.png
-- vendor/extensions/localization/public/images/flags/rs.png
-- vendor/extensions/localization/public/images/flags/ru.png
-- vendor/extensions/localization/public/images/flags/rw.png
-- vendor/extensions/localization/public/images/flags/sa.png
-- vendor/extensions/localization/public/images/flags/sb.png
-- vendor/extensions/localization/public/images/flags/sc.png
-- vendor/extensions/localization/public/images/flags/scotland.png
-- vendor/extensions/localization/public/images/flags/sd.png
-- vendor/extensions/localization/public/images/flags/se.png
-- vendor/extensions/localization/public/images/flags/sg.png
-- vendor/extensions/localization/public/images/flags/sh.png
-- vendor/extensions/localization/public/images/flags/si.png
-- vendor/extensions/localization/public/images/flags/sj.png
-- vendor/extensions/localization/public/images/flags/sk.png
-- vendor/extensions/localization/public/images/flags/sl.png
-- vendor/extensions/localization/public/images/flags/sm.png
-- vendor/extensions/localization/public/images/flags/sn.png
-- vendor/extensions/localization/public/images/flags/so.png
-- vendor/extensions/localization/public/images/flags/sr.png
-- vendor/extensions/localization/public/images/flags/st.png
-- vendor/extensions/localization/public/images/flags/sv.png
-- vendor/extensions/localization/public/images/flags/sy.png
-- vendor/extensions/localization/public/images/flags/sz.png
-- vendor/extensions/localization/public/images/flags/tc.png
-- vendor/extensions/localization/public/images/flags/td.png
-- vendor/extensions/localization/public/images/flags/tf.png
-- vendor/extensions/localization/public/images/flags/tg.png
-- vendor/extensions/localization/public/images/flags/th.png
-- vendor/extensions/localization/public/images/flags/tj.png
-- vendor/extensions/localization/public/images/flags/tk.png
-- vendor/extensions/localization/public/images/flags/tl.png
-- vendor/extensions/localization/public/images/flags/tm.png
-- vendor/extensions/localization/public/images/flags/tn.png
-- vendor/extensions/localization/public/images/flags/to.png
-- vendor/extensions/localization/public/images/flags/tr.png
-- vendor/extensions/localization/public/images/flags/tt.png
-- vendor/extensions/localization/public/images/flags/tv.png
-- vendor/extensions/localization/public/images/flags/tw.png
-- vendor/extensions/localization/public/images/flags/tz.png
-- vendor/extensions/localization/public/images/flags/ua.png
-- vendor/extensions/localization/public/images/flags/ug.png
-- vendor/extensions/localization/public/images/flags/um.png
-- vendor/extensions/localization/public/images/flags/us.png
-- vendor/extensions/localization/public/images/flags/uy.png
-- vendor/extensions/localization/public/images/flags/uz.png
-- vendor/extensions/localization/public/images/flags/va.png
-- vendor/extensions/localization/public/images/flags/vc.png
-- vendor/extensions/localization/public/images/flags/ve.png
-- vendor/extensions/localization/public/images/flags/vg.png
-- vendor/extensions/localization/public/images/flags/vi.png
-- vendor/extensions/localization/public/images/flags/vn.png
-- vendor/extensions/localization/public/images/flags/vu.png
-- vendor/extensions/localization/public/images/flags/wales.png
-- vendor/extensions/localization/public/images/flags/wf.png
-- vendor/extensions/localization/public/images/flags/ws.png
-- vendor/extensions/localization/public/images/flags/ye.png
-- vendor/extensions/localization/public/images/flags/yt.png
-- vendor/extensions/localization/public/images/flags/za.png
-- vendor/extensions/localization/public/images/flags/zm.png
-- vendor/extensions/localization/public/images/flags/zw.png
-- vendor/extensions/localization/spec/controllers/admin/localization_controller_spec.rb
-- vendor/extensions/localization/spec/controllers/locale_controller_spec.rb
-- vendor/extensions/localization/spec/helpers/locale_helper_spec.rb
-- vendor/extensions/localization/spec/helpers/localization_helper_spec.rb
-- vendor/extensions/localization/spec/spec.opts
-- vendor/extensions/localization/spec/spec_helper.rb
 - vendor/extensions/overview_dashboard/README.markdown
 - vendor/extensions/overview_dashboard/Rakefile
 - vendor/extensions/overview_dashboard/app/controllers/admin/overview_controller.rb
@@ -1853,10 +1587,11 @@ files:
 - vendor/extensions/payment_gateway/app/models/gateway/authorize_net_cim.rb
 - vendor/extensions/payment_gateway/app/models/gateway/beanstream.rb
 - vendor/extensions/payment_gateway/app/models/gateway/bogus.rb
+- vendor/extensions/payment_gateway/app/models/gateway/eway.rb
 - vendor/extensions/payment_gateway/app/models/gateway/linkpoint.rb
 - vendor/extensions/payment_gateway/app/models/gateway/pay_pal.rb
-- vendor/extensions/payment_gateway/app/models/gateway/protx.rb
-- vendor/extensions/payment_gateway/config/locales/en-US.yml
+- vendor/extensions/payment_gateway/app/models/gateway/sage_pay.rb
+- vendor/extensions/payment_gateway/config/locales/en.yml
 - vendor/extensions/payment_gateway/config/locales/ru-RU.yml
 - vendor/extensions/payment_gateway/config/routes.rb
 - vendor/extensions/payment_gateway/db/migrate/20091008091614_move_to_configurable_gateways.rb
@@ -2039,8 +1774,6 @@ files:
 - vendor/extensions/theme_default/app/views/admin/taxonomies/_form.html.erb
 - vendor/extensions/theme_default/app/views/admin/taxonomies/_js_head.html.erb
 - vendor/extensions/theme_default/app/views/admin/taxonomies/_list.html.erb
-- vendor/extensions/theme_default/app/views/admin/taxonomies/_manage_products.rhtml
-- vendor/extensions/theme_default/app/views/admin/taxonomies/_success.rhtml
 - vendor/extensions/theme_default/app/views/admin/taxonomies/_taxon.html.erb
 - vendor/extensions/theme_default/app/views/admin/taxonomies/edit.html.erb
 - vendor/extensions/theme_default/app/views/admin/taxonomies/get_children.json.erb
@@ -2557,6 +2290,8 @@ files:
 - vendor/extensions/theme_default/public/images/steps/6_small.png
 - vendor/extensions/theme_default/public/images/sxsw-ribbon-v1.png
 - vendor/extensions/theme_default/public/images/tab_bottom.gif
+- vendor/extensions/theme_default/public/images/tile-header.png
+- vendor/extensions/theme_default/public/images/tile-slider.png
 - vendor/extensions/theme_default/public/images/top-shine.png
 - vendor/extensions/theme_default/public/images/tree-nav-icons/bullet.gif
 - vendor/extensions/theme_default/public/images/tree-nav-icons/minus.gif
@@ -2695,7 +2430,7 @@ files:
 - vendor/plugins/attribute_fu/lib/attribute_fu.rb
 - vendor/plugins/attribute_fu/lib/attribute_fu/associated_form_helper.rb
 - vendor/plugins/attribute_fu/lib/attribute_fu/associations.rb
-- vendor/plugins/attribute_fu/tasks/attribute_fu_tasks.rake
+- vendor/plugins/attribute_fu/lib/tasks/attribute_fu_tasks.rake
 - vendor/plugins/attribute_fu/test/associated_form_helper_test.rb
 - vendor/plugins/attribute_fu/test/comment_test.rb
 - vendor/plugins/attribute_fu/test/db/database.yml
@@ -2761,7 +2496,7 @@ files:
 - vendor/plugins/enumerable_constants/init.rb
 - vendor/plugins/enumerable_constants/install.rb
 - vendor/plugins/enumerable_constants/lib/enumerable_constants.rb
-- vendor/plugins/enumerable_constants/tasks/enumerable_constants_tasks.rake
+- vendor/plugins/enumerable_constants/lib/tasks/enumerable_constants_tasks.rake
 - vendor/plugins/enumerable_constants/test/enumerable_constants_test.rb
 - vendor/plugins/find_by_param/MIT-LICENSE
 - vendor/plugins/find_by_param/README.markdown
@@ -2769,7 +2504,7 @@ files:
 - vendor/plugins/find_by_param/init.rb
 - vendor/plugins/find_by_param/install.rb
 - vendor/plugins/find_by_param/lib/find_by_param.rb
-- vendor/plugins/find_by_param/tasks/find_by_param_tasks.rake
+- vendor/plugins/find_by_param/lib/tasks/find_by_param_tasks.rake
 - vendor/plugins/find_by_param/test/find_by_param_test.rb
 - vendor/plugins/find_by_param/test/schema.rb
 - vendor/plugins/find_by_param/test/test_helper.rb
@@ -2797,8 +2532,8 @@ files:
 - vendor/plugins/jrails/javascripts/sources/jrails.js
 - vendor/plugins/jrails/jrails.gemspec
 - vendor/plugins/jrails/lib/jrails.rb
+- vendor/plugins/jrails/lib/tasks/jrails.rake
 - vendor/plugins/jrails/rails/init.rb
-- vendor/plugins/jrails/tasks/jrails.rake
 - vendor/plugins/jrails_auto_complete/MIT-LICENSE
 - vendor/plugins/jrails_auto_complete/README
 - vendor/plugins/jrails_auto_complete/Rakefile
@@ -2809,7 +2544,7 @@ files:
 - vendor/plugins/jrails_auto_complete/lib/form_helpers.rb
 - vendor/plugins/jrails_auto_complete/lib/jrails_auto_complete.rb
 - vendor/plugins/jrails_auto_complete/lib/jrails_auto_complete_macro_helper.rb
-- vendor/plugins/jrails_auto_complete/tasks/jrails_auto_complete_tasks.rake
+- vendor/plugins/jrails_auto_complete/lib/tasks/jrails_auto_complete_tasks.rake
 - vendor/plugins/jrails_auto_complete/test/jrails_auto_complete_test.rb
 - vendor/plugins/jrails_auto_complete/uninstall.rb
 - vendor/plugins/mail_queue/README
@@ -2818,9 +2553,9 @@ files:
 - vendor/plugins/mail_queue/install.rb
 - vendor/plugins/mail_queue/lib/mail_queue.rb
 - vendor/plugins/mail_queue/lib/queued_mail.rb
+- vendor/plugins/mail_queue/lib/tasks/mailer_queue_tasks.rake
 - vendor/plugins/mail_queue/lib/test_mail_queue_mailer.rb
 - vendor/plugins/mail_queue/lib/test_mail_queue_mailer/notify.rhtml
-- vendor/plugins/mail_queue/tasks/mailer_queue_tasks.rake
 - vendor/plugins/mail_queue/test/mailer_queue_test.rb
 - vendor/plugins/open_id_authentication/CHANGELOG
 - vendor/plugins/open_id_authentication/README
@@ -2836,7 +2571,7 @@ files:
 - vendor/plugins/open_id_authentication/lib/open_id_authentication/nonce.rb
 - vendor/plugins/open_id_authentication/lib/open_id_authentication/request.rb
 - vendor/plugins/open_id_authentication/lib/open_id_authentication/timeout_fixes.rb
-- vendor/plugins/open_id_authentication/tasks/open_id_authentication_tasks.rake
+- vendor/plugins/open_id_authentication/lib/tasks/open_id_authentication_tasks.rake
 - vendor/plugins/open_id_authentication/test/normalize_test.rb
 - vendor/plugins/open_id_authentication/test/open_id_authentication_test.rb
 - vendor/plugins/open_id_authentication/test/status_test.rb
@@ -2917,6 +2652,7 @@ files:
 - vendor/plugins/unobtrusive_date_picker/init.rb
 - vendor/plugins/unobtrusive_date_picker/install.rb
 - vendor/plugins/unobtrusive_date_picker/lib/12_hour_time.rb
+- vendor/plugins/unobtrusive_date_picker/lib/tasks/datepicker_tasks.rake
 - vendor/plugins/unobtrusive_date_picker/lib/unobtrusive_date_picker.rb
 - vendor/plugins/unobtrusive_date_picker/public/images/backstripes.gif
 - vendor/plugins/unobtrusive_date_picker/public/images/bg_header.jpg
@@ -2952,7 +2688,6 @@ files:
 - vendor/plugins/unobtrusive_date_picker/spec/spec_helper.rb
 - vendor/plugins/unobtrusive_date_picker/spec/tag_matcher.rb
 - vendor/plugins/unobtrusive_date_picker/spec/unobtrusive_date_picker_spec.rb
-- vendor/plugins/unobtrusive_date_picker/tasks/datepicker_tasks.rake
 - vendor/plugins/unobtrusive_date_picker/uninstall.rb
 has_rdoc: true
 homepage: http://github.com/railsdog/spree
@@ -2970,10 +2705,14 @@ rdoc_options:
 - --exclude
 - db
 - --exclude
+- features
+- --exclude
 - lib
 - --exclude
 - log
 - --exclude
+- pkg
+- --exclude
 - public
 - --exclude
 - script
@@ -3097,6 +2836,7 @@ test_files:
 - test/unit/factories_test.rb
 - test/unit/flat_percent_item_total_test.rb
 - test/unit/flat_rate_calculators_test.rb
+- test/unit/flexi_rate_calculator_test.rb
 - test/unit/has_calculator_test.rb
 - test/unit/helpers/admin/adjustments_helper_test.rb
 - test/unit/helpers/admin/credits_helper_test.rb