Don't merge - Checking difference between versions #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A payment state could be `failed`. This state was missing from the admin variables. The payment state had no color, it was just a blank circle. I added the red color. I noticed this in spree 2-2-stable. Fixes spree#5378 Conflicts: backend/app/assets/stylesheets/spree/backend/globals/_variables.scss
…rface, and use pluck rather than collect to load the promotion name and id Fixes spree#5379
Conflicts: core/app/models/spree/payment.rb core/spec/spec_helper.rb
Fixes spree#5278 Closes spree#5279 Closes spree#5388 return the new payment state in the update_payment_state, and add some spacing in the spec. remove the stub to make sure this is not always returning "pending" *doh* Conflicts: core/app/models/spree/order.rb
There was no table closing tag in the variants autocomplete. Fixes spree#5396
Fixes spree#5397 Conflicts: backend/app/views/spree/admin/general_settings/edit.html.erb
Deleted the spinner from the states index Fixes spree#5402
Added configuration_menu to 'stock locations new' Fixes spree#5404
Fixes spree#5406 Conflicts: backend/app/views/spree/admin/stock_locations/_form.html.erb
…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
Forgot to squash into bfb5f90 but it's still fixed by having removed cookie session usage that was required to exploit this. Are you sure you JSONP properly? http://homakov.blogspot.com/2013/02/are-you-sure-you-use-jsonp-properly.html Conflicts: api/app/controllers/spree/api/base_controller.rb
Conflicts: backend/app/assets/javascripts/spree/backend/option_value_picker.js
Conflicts: core/spree_core.gemspec
…line item level. Fixes spree#6244
This should allow to create a new project with the `spree_i18n` gem and `Store` translation. During this migration we don't have the store translation table yet, so the `save!` is going to fail. see spree-contrib/spree_i18n#533 Fixes spree#6259
Previously introduced in 681a966 and later removed probably by accident Conflicts: frontend/spec/controllers/spree/checkout_controller_spec.rb
Fixed Hound CI formatting issues Fixes spree#6310
* This method returns true if the payment amount can be edited Change Spree::Api::PaymentsController#update to update editable payments Change payments to be editable when the state is checkout or pending Fixes spree#6393
This reverts commit d1543a9.
Fixes spree#6391 Conflicts: core/app/models/spree/order.rb
…ependency patch level
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.