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

2 4 stable #4

Open
wants to merge 2,471 commits into
base: 2-3-stable
Choose a base branch
from
Open

2 4 stable #4

wants to merge 2,471 commits into from

Conversation

tomfarm
Copy link

@tomfarm tomfarm commented Nov 21, 2014

No description provided.

reinaris and others added 30 commits September 24, 2014 16:30
Added configuration_menu to 'stock locations new'

Fixes spree#5404
introduce preferences column in spree models

add array and hash to spree preference types
Fixes spree#5410
…action

Add some missing preventDefault() and 'return false'
Fixes spree#5412
… additional_tax_total & included_tax_total on items back to 0.

Fixes spree#5392
Fixes spree#5418
Fixes spree#5125

Conflicts:
	core/lib/spree/core/controller_helpers/auth.rb
(Not solely promotions and taxes.) As per discussion in spree#5415

Fixes spree#5415
Fixes spree#5419
tesserakt and others added 30 commits November 12, 2014 13:28
added test coverage for new rabl fields

fixes spree#5593
…as this should use the simple_current_order helper only

fixes spree#5605
Spree has really useful classification position scores that are adjustable in the Admin. Let's expose this over the Product payload in the API and next taxons under there.

fixes spree#5609
Conflicts:
	.travis.yml
me fail english, that umpossible

change is_removed to is_destroyed

fixes spree#5611
[backend] @option_type.option_values is always set. No need to verify it emptiness

[backend] Hiding the handle of option values if object is not persisted
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.