Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Spree 1.0 Compatibility #15

Closed
wants to merge 10 commits into from
Closed

Spree 1.0 Compatibility #15

wants to merge 10 commits into from

Commits on Dec 6, 2011

  1. Namespacing updates 

    Signed-off-by: Chris Boertien <chris.boertien@bz-labs.com>
    @Cluster444
    Cluster444 committed Dec 6, 2011
    Copy the full SHA
    f99c02b View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2011

  1. Merge branch 'master' into namespace 

    Conflicts:
	app/controllers/spree/admin/variants_controller_decorator.rb
    @Cluster444
    Cluster444 committed Dec 7, 2011
    Copy the full SHA
    094c90b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into namespace 

    Conflicts:
	spec/models/spree/volume_price_spec.rb
    @Cluster444
    Cluster444 committed Dec 7, 2011
    Copy the full SHA
    9d2cd36 View commit details
    Browse the repository at this point in the history

  3. namespace new test specs 

    Signed-off-by: Chris Boertien <chris.boertien@bz-labs.com>
    @Cluster444
    Cluster444 committed Dec 7, 2011
    Copy the full SHA
    c7a6798 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2012

  1. fix namespace issues, add range without brackets, add german locale

    @paulsponagl
    paulsponagl committed Jan 26, 2012
    Copy the full SHA
    e55ebaf View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2012

  1. Merge branch 'namespace' into custom 

    * namespace:
  namespace new test specs
  Namespacing updates
    @iloveitaly
    iloveitaly committed Mar 12, 2012
    Copy the full SHA
    e32e6e2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'spree_edge' into custom 

    * spree_edge:
  fix namespace issues, add range without brackets, add german locale
    @iloveitaly
    iloveitaly committed Mar 12, 2012
    Copy the full SHA
    b4203cf View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2012

  1. Adding volume pricing partial

    @iloveitaly
    iloveitaly committed Mar 20, 2012
    Copy the full SHA
    242e6b5 View commit details
    Browse the repository at this point in the history

  2. Adding documentation about volume pricing partial

    @iloveitaly
    iloveitaly committed Mar 20, 2012
    Copy the full SHA
    17b9da7 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2012

  1. Removed comment about master incompatibility

    @iloveitaly
    iloveitaly committed Mar 21, 2012
    Copy the full SHA
    6084ca8 View commit details
    Browse the repository at this point in the history