Code

[Do Not Merge] 2 2 stable head upgrade#1

Code

Closed

gmacdougall wants to merge 238 commits intosolidusio:rebased-rewritten-bonobos-2-2-devsolidusio/solidus:rebased-rewritten-bonobos-2-2-devfrom gmacdougall:2-2-stable-head-upgradeCopy head branch name to clipboard

+2,643-1,057

Commits

Commits on Feb 23, 2015

• Bump to 2.2.3.beta

  

  radar

  authored and

  Gregor MacDougall

  committed
  6279f07

• Set CreditCard#confirmation_value when reusing cards

  Show description for 7b4e359
  

  huoxito

  authored and

  Gregor MacDougall

  committed
  7b4e359

• Add I18n.locale for views cache

  Show description for f568c90
  

  BGuimberteau

  authored and

  Gregor MacDougall

  committed
  f568c90

• Fix FA class for picture

  Show description for 9a35abb
  

  davekiss

  authored and

  Gregor MacDougall

  committed
  9a35abb

• fix typo in data-hook.

  Show description for 873a2eb
  

  peterberkenbosch

  authored and

  Gregor MacDougall

  committed
  873a2eb

• Add data-hooks to admin/products/new and admin/products/_form

  Show description for 69ffd46
  

  brchristian

  authored and

  Gregor MacDougall

  committed
  69ffd46

• use fa-check since fa-ok is no longer available.

  Show description for 28ddee2
  

  peterberkenbosch

  authored and

  Gregor MacDougall

  committed
  28ddee2

• updated ga snippet

  Show description for ba5cbb7
  

  BrianTheCoder

  authored and

  Gregor MacDougall

  committed
  ba5cbb7

• Always pass currency to Spree::Money for multi-currency.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  25ef0af

• Need to only try specifying currency in case order doesnt exist yet.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  bcee71d

• Update Rails Version in README.md

  Show description for 05b930a
  

  buck3000

  authored and

  Gregor MacDougall

  committed
  05b930a

• make sure we only build the year when it's there. Validtion error otherwise.

  Show description for 8df72b9
  

  peterberkenbosch

  authored and

  Gregor MacDougall

  committed
  8df72b9

• Reorder short circuit evaluation of Estimator#shipping_methods

  

  Senjai

  authored and

  Gregor MacDougall

  committed
  bae24e9

• Changing currency variable according to google analytics docs

  Show description for 79e24ff
  

  tiagoamaro

  authored and

  Gregor MacDougall

  committed
  79e24ff

• add configurable option to clone products without copying original images

  Show description for 726b3db
  

  Michael Tucker

  authored and

  Gregor MacDougall

  committed
  726b3db

• Loosen friendly_id restriction.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  f4ef9c5

• Fix recalculating included tax adjustments. Fixes spree/spree#4671

  Show description for 4f3ac57
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  4f3ac57

• Fix html safe when cart is empty

  

  ddomingues

  authored and

  Gregor MacDougall

  committed
  c84e2d5

• Use the payments currency rather than config for multi-currency.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  2f56faa

• Added data-hooks where values were empty and fixed some repeated ids.

  Show description for a5a5178
  

  richardnuno

  authored and

  Gregor MacDougall

  committed
  a5a5178

• Fix broken cache on api/orders

  Show description for 9a92428
  

  huoxito

  authored and

  Gregor MacDougall

  committed
  9a92428

• Populate Order#shipment_total for users upgrading

  Show description for fe4b981
  

  huoxito

  authored and

  Gregor MacDougall

  committed
  fe4b981

• Fall back to name on CreditCard#to_active_merchant

  Show description for ad1d11f
  

  huoxito

  authored and

  Gregor MacDougall

  committed
  ad1d11f

• handle credit card names with spaces

  Show description for 437707a
  

  jordan-brough

  authored and

  Gregor MacDougall

  committed
  437707a

• Fixes entering localized amounts for payments

  Show description for d20c54a
  

  Daan-

  authored and

  Gregor MacDougall

  committed
  d20c54a

• Add top level rake task to run all tests

  

  Andrew Thal

  authored and

  Gregor MacDougall

  committed
  39c06b8

• remove reference to shipment.adjustment

  Show description for 71f50a8
  

  Clarke Brunsdon

  authored and

  Gregor MacDougall

  committed
  71f50a8

• Add spec for overriding order token

  

  huoxito

  authored and

  Gregor MacDougall

  committed
  92e3fa7

• check_authorization should use params token first

  Show description for 86b7b4f
  

  wuboy0307

  authored and

  Gregor MacDougall

  committed
  86b7b4f

• Refactor stock transfers variant select JS - Allow user to search for a variant by name or SKU, rather than just returning the first 25 items from a stock location

  Show description for d55dafe
  

  LBRapid

  authored and

  Gregor MacDougall

  committed
  d55dafe

• update the default email template to include all the proper taxes, shipments and adjustments

  Show description for 743b98b
  

  peterberkenbosch

  authored and

  Gregor MacDougall

  committed
  743b98b

• Update payment risk assessment, and fix broken specs. Fixes spree/spree#4630

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  75775c2

• Ensure shipments are also destroyed when the order is emptied.

  Show description for ac01ce1
  

  Senjai

  authored and

  Gregor MacDougall

  committed
  ac01ce1

• Payments with a cvv_response_message are not necessarily risky.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  3682622

• Remove defunkt spec that's no longer true.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  46698f1

• Use permitted_option_value_attributes instead of permitted_option_type_attributes

  Show description for 4ae9d6a
  

  iwano

  authored and

  Gregor MacDougall

  committed
  4ae9d6a

• [api] Ensure order ids are ordered in orders_controller_spec

  

  radar

  authored and

  Gregor MacDougall

  committed
  a75af02

• Include sample in top level rake test and test_app

  Show description for 38611fb
  

  jhawthorn

  authored and

  Gregor MacDougall

  committed
  38611fb

• Fixes an issue where entering 30.49 would preauthorize 3049$.

  Show description for b1b19fa
  

  Jim

  authored and

  Gregor MacDougall

  committed
  b1b19fa

• Pagination and search in property list

  Show description for ee79c55
  

  Willianvdv

  authored and

  Gregor MacDougall

  committed
  ee79c55

• make sure we fail fast and exit when a spec fails

  Show description for 3efe643
  

  peterberkenbosch

  authored and

  Gregor MacDougall

  committed
  3efe643

• Javascript fixes for IE8.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  763331e

• Update backends adjustments controller to fix order.update! call.

  Show description for 3027233
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  3027233

• Fixes receiving RMA's when inventory tracking is turned off.

  Show description for 7232ca9
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  7232ca9

• Fix broken spec.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  6cd7827

Commits on Feb 24, 2015

• Dont destroy all order payments in api/checkouts

  Show description for 1f289b2
  

  huoxito

  authored and

  Gregor MacDougall

  committed
  1f289b2

• Improving performance of migration add_line_item_id_to_spree_inventory_units

  Show description for b3cda2c
  

  brchristian

  authored and

  Gregor MacDougall

  committed
  b3cda2c

• Adding data-hooks to search results header

  Show description for 4ca432c
  

  brchristian

  authored and

  Gregor MacDougall

  committed
  4ca432c

• Fixes Zone #contains? n+1 query performance.

  Show description for 5ce1fe3
  

  mtomov

  authored and

  Gregor MacDougall

  committed
  5ce1fe3

• fix permalink handling to force uniqueueness and rename on product destroy

  Show description for 13ac43f
  

  Michael Tucker

  authored and

  Gregor MacDougall

  committed
  13ac43f

• Make migration more tolerant of deleted Variants

  Show description for 58b8008
  

  brchristian

  authored and

  Gregor MacDougall

  committed
  58b8008

• Don't assume default variant in JS. Let this be controlled by HTML markup.

  Show description for 0c108c0
  

  shopjoy

  authored and

  Gregor MacDougall

  committed
  0c108c0

• Downcasing locale for jquery.validate i18n messages

  Show description for 50550cb
  

  tiagoamaro

  authored and

  Gregor MacDougall

  committed
  50550cb

• Set extract first and last name from CreditCard#name

  Show description for 88101a2
  

  huoxito

  authored and

  Gregor MacDougall

  committed
  88101a2

• Fix pagination for taxons

  Show description for e5579f7
  

  frankiek3

  authored and

  Gregor MacDougall

  committed
  e5579f7

• Bump Rails to 4.0.6

  

  radar

  authored and

  Gregor MacDougall

  committed
  7d8b6b9

• Bump to 2.2.3

  

  radar

  authored and

  Gregor MacDougall

  committed
  61eefa3

• Bump to 2.2.4.beta

  

  radar

  authored and

  Gregor MacDougall

  committed
  b94b175

• Fix typo in add_line_item_id_to_spree_inventory_units migration

  Show description for 4cb3271
  

  radar

  authored and

  Gregor MacDougall

  committed
  4cb3271

• Bump to 2.2.4

  

  radar

  authored and

  Gregor MacDougall

  committed
  9e2a218

• Bump to 2.2.5.beta

  

  radar

  authored and

  Gregor MacDougall

  committed
  55c8908

• Clean changelogs

  Show description for 9f54ea9
  

  radar

  authored and

  Gregor MacDougall

  committed
  9f54ea9

• Add Jersey to the default list of countries

  Show description for b9b6c47
  

  oguzcanhuner

  authored and

  Gregor MacDougall

  committed
  b9b6c47

• Lock jquery-rails to 3.1.0 as 3.1.1 breaks data-confirm.

  Show description for 6f72148
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  6f72148

• make incl/excl in ShippingRate#display_price translatable

  Show description for 07b9598
  

  valpackett

  authored and

  Gregor MacDougall

  committed
  07b9598

• make click_and_drag_on_the_products_to_sort_them in spree/admin/taxons/index translatable

  Show description for 7e5dcc7
  

  valpackett

  authored and

  Gregor MacDougall

  committed
  7e5dcc7

• Only destroy tax adjustment for open order when the associated tax rate is deleted. For closed order just nullify the source_id.

  Show description for 4238727
  

  ifan-godaddy

  authored and

  Gregor MacDougall

  committed
  4238727

• Merge pull request spree/spree#4900 from reinaris/patch-3

  Show description for 043990a
  

  huoxito

  authored and

  Gregor MacDougall

  committed
  043990a

• Update shipment in proper chronological order

  Show description for b63d190
  

  huoxito

  authored and

  Gregor MacDougall

  committed
  b63d190

• When creating shipment assign orders shipping address.

  Show description for 91d10a3
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  91d10a3

• Payment methods should be scoped to available.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  aa2bb67

• Bump to Rails 4.0.8

  

  radar

  authored and

  Gregor MacDougall

  committed
  976e0b1

• Added without_children = true in taxon autocomplete API Call

  Show description for cc6aae7
  

  Ishank Gupta

  authored and

  Gregor MacDougall

  committed
  cc6aae7

• Optimize available_countries

  Show description for 716af5f
  

  jhawthorn

  authored and

  Gregor MacDougall

  committed
  716af5f

• Add blank to ShippingMethod's TaxCategory select

  Show description for a30d82c
  

  brchristian

  authored and

  Gregor MacDougall

  committed
  a30d82c

• [api] Convert payment_method_id to string in CheckoutsController

  Show description for 9c3673a
  

  radar

  authored and

  Gregor MacDougall

  committed
  9c3673a

• [api] Do not wrap parameters in OrdersController

  Show description for 1a057e1
  

  radar

  authored and

  Gregor MacDougall

  committed
  1a057e1

• Fix typo in Spree::ReturnAuthorization model

  Show description for 454d38f
  

  Jerrold Thompson

  authored and

  Gregor MacDougall

  committed
  454d38f

• Destroy asocaited adjustments when order is changed to move out of taxable zones.

  Show description for d32b4a8
  

  ifan-godaddy

  authored and

  Gregor MacDougall

  committed
  d32b4a8

• Allow token-based payment sources in Payment::Processing

  Show description for be50f5c
  

  radar

  authored and

  Gregor MacDougall

  committed
  be50f5c

• Avoid name clashing when including modules

  

  Carlos Palhares

  authored and

  Gregor MacDougall

  committed
  bb5844b

• Merge pull request spree/spree#4923 from jordan-brough/fix-order-reload

  Show description for a4bcc77
  

  huoxito

  authored and

  Gregor MacDougall

  committed
  a4bcc77

• Move set_shipments_cost call to Order#update_from_params

  Show description for 97354f8
  

  radar

  authored and

  Gregor MacDougall

  committed
  97354f8

• Shipment cost is now included in spec totals.

  Show description for ba6e76e
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  ba6e76e

• Revert "Add pry and pry debuggers to common spree dependencies"

  Show description for 60fefba
  

  huoxito

  authored and

  Gregor MacDougall

  committed
  60fefba

• Use prepend_before_filter to try calling before apply_coupon_code. refs spree/spree#4926

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  fd17f71

• Added missing translation for back_to_shipping_categories_list

  Show description for 5172e58
  

  Dylan Kendal

  authored and

  Gregor MacDougall

  committed
  5172e58

• Do not blindly accept just any month for CreditCard expiry

  Show description for 93ba97e
  

  radar

  authored and

  Gregor MacDougall

  committed
  93ba97e

• Silence two warnings

  Show description for 3741e94
  

  jordan-brough

  authored and

  Gregor MacDougall

  committed
  3741e94

• Revert "Use prepend_before_filter to try calling before apply_coupon_code. refs spree/spree#4926"

  Show description for f4676d2
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  f4676d2

• Improvements to API performance.

  Show description for ed3fa55
  

  BMorearty

  authored and

  Gregor MacDougall

  committed
  ed3fa55

• More code coverage.

  

  BMorearty

  authored and

  Gregor MacDougall

  committed
  7a499c8

• Reduce the number of cascading touches.

  Show description for bbb7dc1
  

  BMorearty

  authored and

  Gregor MacDougall

  committed
  bbb7dc1

• Fix simple_current_order to not conflict with order.

  Show description for 67c5165
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  67c5165

• make unique SKU for sample data

  

  peterberkenbosch

  authored and

  Gregor MacDougall

  committed
  30f4936

• Order history should be reverse chronological. Fixes spree/spree#5024

  Show description for f792ef2
  

  magnusvk

  authored and

  Gregor MacDougall

  committed
  f792ef2

• Use the proper flash

  Show description for 084500d
  

  Dylan Kendal

  authored and

  Gregor MacDougall

  committed
  084500d

• use the variant_full_price on the product show page so the correct currency settings are used. Fixes spree/spree#4995

  

  peterberkenbosch

  authored and

  Gregor MacDougall

  committed
  037f05d

• Reduce unnecessary DB round-trips.

  Show description for 3a6e682
  

  BMorearty

  authored and

  Gregor MacDougall

  committed
  3a6e682

• fix failing specs with variant price

  

  peterberkenbosch

  authored and

  Gregor MacDougall

  committed
  0a86ca7

• refactor the variant price for product.js.coffee. Thanks gmacdougall

  

  peterberkenbosch

  authored and

  Gregor MacDougall

  committed
  50b4b08

• Wait ajax request a bit for backend spec fix

  

  huoxito

  authored and

  Gregor MacDougall

  committed
  49ad1da

• Validate uniqueness of order numbers... Why was this FIXME never fixed until now... Fixes spree/spree#5102

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  ed7e474

• changed generate_order_number method for insure that generated numbers never finish spree/spree#5102

  

  sanchojaf

  authored and

  Gregor MacDougall

  committed
  4a320d4

• Fix broken specs from order number refactoring, and improve performance. Fixes spree/spree#5102

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  1fecd29

• Fix payment state in order importer. Fixes spree/spree#5109

  Show description for 3775888
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  3775888

• Use rand(10) to cover all digits 0-9. Fixes spree/spree#5113

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  9d829c8

• Calculate tax total correctly which depends on the item that could be an Order or a LineItem. Tax adjustments are stored differently in these two cases.

  Show description for 4a897a0
  

  ifan-godaddy

  authored and

  Gregor MacDougall

  committed
  4a897a0

• Speed up rename_adjustment_fields migration

  Show description for 09cc3fa
  

  brchristian

  authored and

  Gregor MacDougall

  committed
  09cc3fa

• Make Shipment.cost default to 0

  Show description for b7e0af7
  

  brchristian

  authored and

  Gregor MacDougall

  committed
  b7e0af7

• Dont advance order state when adding an item to cart

  Show description for 0b4ea1d
  

  huoxito

  authored and

  Gregor MacDougall

  committed
  0b4ea1d

• Update Google Analytics

  Show description for c37877b
  

  ymek

  authored and

  Gregor MacDougall

  committed
  c37877b

• Allow assigning shipped_at to shipments.

  Show description for a47b10d
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  a47b10d

• Merge pull request spree/spree#5101 from themetric/fix-api-custom-template

  Show description for eac78b7
  

  huoxito

  authored and

  Gregor MacDougall

  committed
  eac78b7

• add validation to verify that count_on_hand of backorderable should not go negative if it is not backorderable

  Show description for f1d7073
  

  nishant-cyro

  authored and

  Gregor MacDougall

  committed
  f1d7073

• add a before_transition to verify if order is resumed only if there are no insufficient stock lines

  Show description for 8b4d277
  

  nishant-cyro

  authored and

  Gregor MacDougall

  committed
  8b4d277

• Fix conflict.

  Show description for f8479a8
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  f8479a8

• Reload to make sure shipment.inventory_units have the latest status so that shipment.backordered? return correct value

  Show description for 4b00740
  

  ifan-godaddy

  authored and

  Gregor MacDougall

  committed
  4b00740

• Fix line item proper currency check

  Show description for 079db37
  

  huoxito

  authored and

  Gregor MacDougall

  committed
  079db37

• Fix shipment persistence on order importer

  Show description for e0c1875
  

  huoxito

  authored and

  Gregor MacDougall

  committed
  e0c1875

• Test to see if a better coupon exists already

  Show description for 8633da2
  

  Clarke Brunsdon

  authored and

  Gregor MacDougall

  committed
  8633da2

• Revert "Fix Spree::Promotion not applying all of the time."

  Show description for 63ee863
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  63ee863

• Use rspec-retry to get past random phantomjs failures (turn off by default)

  Show description for 77936cf
  

  ifan-godaddy

  authored and

  Gregor MacDougall

  committed
  77936cf

• Create tax adjustment label with inclusive information if applicable

  Show description for e8a76df
  

  ifan-godaddy

  authored and

  Gregor MacDougall

  committed
  e8a76df

• Change order updater to refresh shipment rates and amounts on change

  Show description for a2138d5
  

  dkubb

  authored and

  Gregor MacDougall

  committed
  a2138d5

• Finally fixes last backend spec.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  9c21a1a

• Fix using check payment method in admin.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  8cd9492

• Add state_text to StockLocation

  Show description for 4e2b5e3
  

  brchristian

  authored and

  Gregor MacDougall

  committed
  4e2b5e3

• Bump version.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  3cc6bc3

• Bump for next beta.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  f095626

• Fix item_adjustment_spec.rb

  Show description for 56065a0
  

  deodad

  authored and

  Gregor MacDougall

  committed
  56065a0

• Allow partial emails when searching for orders

  Show description for 8858f26
  

  bbuchalter

  authored and

  Gregor MacDougall

  committed
  8858f26

• addi18n to prom index

  Show description for 70e22dc
  

  Paveltarno

  authored and

  Gregor MacDougall

  committed
  70e22dc

• Update jquery dep. refs spree/spree#3203

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  dab9287

• RSpec 3.1 support & Fix a couple Rails 4.0.10 regressions.

  Show description for 94e35a7
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  94e35a7

• Use email regex from Devise. Fixes spree/spree#5368

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  afca15d

• Implemented fix for duplicate addresses being created in checkout

  Show description for 61bb3d9
  

  ericsaupe

  authored and

  Gregor MacDougall

  committed
  61bb3d9

• Added failed state to the admin variables

  Show description for 792481f
  

  reinaris

  authored and

  Gregor MacDougall

  committed
  792481f

• Fix variable css.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  3450bb4

• add select2 call after loading new images

  Show description for ea481a6
  

  BenMorganIO

  authored and

  Gregor MacDougall

  committed
  ea481a6

• we fixed mail validator.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  6eefeed

• change precision for amount to 10

  Show description for 36e802b
  

  Gonzalo

  authored and

  Gregor MacDougall

  committed
  36e802b

• Bump version.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  136a54d

• bump next beta

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  c16e041

• Close a table in variant autocomplete

  Show description for b65ceaa
  

  reinaris

  authored and

  Gregor MacDougall

  committed
  b65ceaa

• Show line items for orders that have not advanced to delivery state yet.

  Show description for ad0f658
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  ad0f658

• Dont let order import fail silently on bad line items.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  ed128eb

• Fix my mistakes from 933c773 :(

  Show description for a815f76
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  a815f76

• fix user address default user spec.

  

  peterberkenbosch

  authored and

  Gregor MacDougall

  committed
  35419ca

• add more logic to outstancing balance and order updater to set the correct payment_state on the order when the order is canceled.

  Show description for a2f1834
  

  peterberkenbosch

  authored and

  Gregor MacDougall

  committed
  a2f1834

• Touch Adjustment#adjustable, and fix some rspec deprecations.

  Show description for 88663a6
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  88663a6

• Standardizing use of colons in checkout summary

  Show description for 534bf0d
  

  brchristian

  authored and

  Gregor MacDougall

  committed
  534bf0d

• User store location when signing in

  Show description for 5620a1d
  

  marcosteixeira

  authored and

  Gregor MacDougall

  committed
  5620a1d

• Fix specs broken by 09ccf8a

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  3028967

• refactoing code to call find_adjustment in before_action rather than calling it in each menthod

  Show description for f160bf2
  

  abhishek

  authored and

  Gregor MacDougall

  committed
  f160bf2

• Fix db:bootstrap task

  Show description for 7774ba4
  

  hnatt

  authored and

  Gregor MacDougall

  committed
  7774ba4

• Regression spec for 'stack level too deep' spree/spree#5384

  Show description for 0f3f266
  

  andrzejpolis

  authored and

  Gregor MacDougall

  committed
  0f3f266

• Add in fix from andrzejpolis Fixes spree/spree#5384 Fixes spree/spree#5386

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  6a43638

• create proposed shipments if is no shippment data

  Show description for 95ea9f0
  

  peterberkenbosch

  authored and

  Gregor MacDougall

  committed
  95ea9f0

• Fix example to contain expectation

  Show description for 3a7e296
  

  mbj

  authored and

  Gregor MacDougall

  committed
  3a7e296

• allow guests to use the payments api for their orders

  Show description for 68ba38a
  

  pdamer

  authored and

  Gregor MacDougall

  committed
  68ba38a

• Improve localization of stock_locations/_form

  Show description for 6e1a6bf
  

  hnatt

  authored and

  Gregor MacDougall

  committed
  6e1a6bf

• Fix broken rspec.

  Show description for c845fa0
  

  ifan-godaddy

  authored and

  Gregor MacDougall

  committed
  c845fa0

• Remove 'disabled' from inputs in payments

  Show description for b2cdc06
  

  ericsaupe

  authored and

  Gregor MacDougall

  committed
  b2cdc06

• Ignore guides.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  fca9d78

• Make best-promotion query more deterministic

  Show description for 22b3f2d
  

  jordan-brough

  authored and

  Gregor MacDougall

  committed
  22b3f2d

• Fix running just rake for specs.

  Show description for e67f5c0
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  e67f5c0

• Fix rerunning sample specs without new dummy app.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  a9a1aaf

• Check payment method should respond to cancel. Fixes spree/spree#5307

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  41e1abe

• Improve the presentation during creating prototypes. Fixes spree/spree#2526

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  9c2e755

• Use slower but robust ActiveRecord for migration

  Show description for 1e6a1e3
  

  brchristian

  authored and

  Gregor MacDougall

  committed
  1e6a1e3

• No need for partial. Fixes spree/spree#5475

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  02e6063

• Looking up stock location by the admin name as well

  Show description for c798130
  

  alexstoick

  authored and

  Gregor MacDougall

  committed
  c798130

• Add spec for looking up stock location by admin name.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  f066437

• Do not allow leading or trailing dot(.) in the first part of email address

  Show description for fc772b3
  

  ifan-godaddy

  authored and

  Gregor MacDougall

  committed
  fc772b3

• Add inverse_of for more associations involved in cart processing

  Show description for bb9af4e
  

  dkubb

  authored and

  Gregor MacDougall

  committed
  bb9af4e

• remove extra dependent destroy

  Show description for bccc780
  

  Divya Talwar

  authored and

  Gregor MacDougall

  committed
  bccc780

• Fix timecop spec.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  73b1513

• Fixes messaging after applying coupon code promo with CreateLineItems action. Fixes spree/spree#4697

  Show description for 34ba024
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  34ba024

• Refactor Spree::ProductHelper#variant_price_diff

  Show description for a0fabb5
  

  dkubb

  authored and

  Gregor MacDougall

  committed
  a0fabb5

• Add required attributes to required product admin form fields

  Show description for 3dcd551
  

  dkubb

  authored and

  Gregor MacDougall

  committed
  3dcd551

• make bogus gateway match actual gateways. ie. don't assign profile id for failed payments

  Show description for 9f12514
  

  pdamer

  authored and

  Gregor MacDougall

  committed
  9f12514

• Depend on factory_girl_rails 4.5.0

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  5bf39d6

• We need to be more restrictive with factory girl updates.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  dd767e1

• Implement a state lock version to prevent race conditions in checkout controller. refs spree/spree#4190

  Show description for f0d61de
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  f0d61de

• fix specs

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  8d3d7c4

• include option values when loading option values from option types

  Show description for 96034be
  

  BenMorganIO

  authored and

  Gregor MacDougall

  committed
  96034be

• Refactor the duplicate request prevention code ( order.with_lock )

  Show description for 16f70be
  

  DangerDawson

  authored and

  Gregor MacDougall

  committed
  16f70be

• Adds editorConfig.

  Show description for 7037b84
  

  Seb Ashton

  authored and

  Gregor MacDougall

  committed
  7037b84

• Add spec for updating version.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  1ff174f

• add table name for order/line_item association

  Show description for 1a73e80
  

  kennyadsl

  authored and

  Gregor MacDougall

  committed
  1a73e80

• refactor code to follow DRY in zone model

  Show description for acbe625
  

  abhishek

  authored and

  Gregor MacDougall

  committed
  acbe625

• Update generated robots.txt

  Show description for f660d9a
  

  alepore

  authored and

  Gregor MacDougall

  committed
  f660d9a

• Removes redundant closing li

  Show description for 6f6903b
  

  Seb Ashton

  authored and

  Gregor MacDougall

  committed
  6f6903b

• Make email field in admin orders#index link to the customer's account page

  Show description for 20910c5
  

  Andrew Thal

  authored and

  Gregor MacDougall

  committed
  20910c5

• Fix optimistic lock to not revert incremented version.

  Show description for 35de32b
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  35de32b

• Fix pagination in /api/taxons/products

  Show description for a103954
  

  KentoMoriwaki

  authored and

  Gregor MacDougall

  committed
  a103954

• Allow tax categories to be destroyed with proper callback order. Fixes spree/spree#5548 Fixes spree/spree#5549

  Show description for 6d24097
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  6d24097

• Make conditional read nicer.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  bc78664

• Fix Asset position for different viewables.

  Show description for 350171e
  

  mtomov

  authored and

  Gregor MacDougall

  committed
  350171e

• Test latest 2.1.5

  Show description for 5439459
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  5439459

• Give spec correct title.

  Show description for 278eab4
  

  iangreenleaf

  authored and

  Gregor MacDougall

  committed
  278eab4

• set the order#payment_state to the correct state when order is canceled

  Show description for b234e72
  

  peterberkenbosch

  authored and

  Gregor MacDougall

  committed
  b234e72

• Fix specs and update syntax.

  Show description for 038fd8b
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  038fd8b

• [backend] Hiding option values handle if object is not persisted

  Show description for 7cfd857
  

  tiagoamaro

  authored and

  Gregor MacDougall

  committed
  7cfd857

• Bump rails.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  978c7c1

• Bump version

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  2a1fea2

• Bump to beta

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  c465c61

• Added gif to valid icon types

  Show description for 52542bb
  

  Hates

  authored and

  Gregor MacDougall

  committed
  52542bb

• Bump version

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  e5ab60d

• Bump to next beta.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  e8c1833

• Update i18n.

  Show description for 6248ef0
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  6248ef0

• Revert "Update i18n."

  Show description for a593031
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  a593031

• fix handling of credit cards expiring in current month

  Show description for 1ffdb79
  

  pdamer

  authored and

  Gregor MacDougall

  committed
  1ffdb79

• Filter params on api/checkouts_controller#update

  Show description for d426f42
  

  huoxito

  authored and

  Gregor MacDougall

  committed
  d426f42

• Lockdown monetize to fix specs for now.

  Show description for ab7b826
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  ab7b826

• Update ruble symbol.

  Show description for 35f95a4
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  35f95a4

• Bump version.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  8c354cd

• Next beta.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  bcab12d

• Require latest monetize.

  Show description for cce8839
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  cce8839

• Fix payment sample card for 2015

  Show description for 77b8b2c
  

  jhawthorn

  authored and

  Gregor MacDougall

  committed
  77b8b2c

• Fix expiration year.

  Show description for e584d6d
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  e584d6d

• Do not trigger full order update when fulfilling a backordered order

  Show description for cca244d
  

  ifan-godaddy

  authored and

  Gregor MacDougall

  committed
  cca244d

• Fix to payment_spec

  Show description for cdcd6ba
  

  allisonlarson

  authored and

  Gregor MacDougall

  committed
  cdcd6ba

• Fix authorization check. Fixes spree/spree#5624

  Show description for 98f1ae5
  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  98f1ae5

• translate hardcoded strings on cc payment form

  Show description for c1b01d4
  

  alepore

  authored and

  Gregor MacDougall

  committed
  c1b01d4

• JS fix for admin resource destroy success message

  Show description for e5dd414
  

  MattDunbar

  authored and

  Gregor MacDougall

  committed
  e5dd414

• Fix td element to be within conditional block.

  

  Jeff Dutil

  authored and

  Gregor MacDougall

  committed
  1365215

• Adjustments upgrade migration should fail on save / destroy fail

  Show description for c83978f
  

  MattDunbar

  authored and

  Gregor MacDougall

  committed
  c83978f

• Adjustments upgrade migration efficiency improvement.

  Show description for f6ef5f7
  

  MattDunbar

  authored and

  Gregor MacDougall

  committed
  f6ef5f7

• Remove specs from checkout controller.

  Show description for 74f966e
  

  Gregor MacDougall

  committed
  74f966e

• Revert "Allow payments with invalid sources to be invalidated"

  Show description for 150a934
  

  Gregor MacDougall

  committed
  150a934

• Revert "Make update_item_count get called inside updater#update"

  Show description for b51fd37
  

  Gregor MacDougall

  committed
  b51fd37

Commits on Feb 25, 2015

• update_attributes is now update_attributes!

  Show description for 36b7110
  

  Gregor MacDougall

  committed
  36b7110

• Don't pass id in to the API endpoints for address.

  Show description for 2ed26f6
  

  Gregor MacDougall

  committed
  2ed26f6

• Remove check alerts spec.

  

  Gregor MacDougall

  committed
  92f77f9

• 2-2-dev fix for ReimbursementMailer

  Show description for d4c4fa4
  

  jordan-brough

  authored and

  Gregor MacDougall

  committed
  d4c4fa4

• Add ensure_line_item_in_stock method.

  Show description for d410bb2
  

  Gregor MacDougall

  committed
  d410bb2