Rails4へのVerUpのためのブランチ(v1.2.2)#2

Open

fukajun wants to merge 346 commits into

This pull request is big! We're only showing the most recent 250 commits

Commits on Aug 31, 2012

RUBY_PALTFORM problem

sailtsao
authored and
radar
committed
Fix mis-spelling of prop in checkout.js
radar
committed
Decrease wait-time for customer autocomplete box
radar
committed

Commits on Sep 2, 2012

Rename Spree::InventoryUnit.backorder to backordered
Trung Lê
committed
We only care about shipped units in Spree::LineItem#quantity_no_less_than_shipped
Trung Lê
committed
Add lambda to scopes, see reasons at https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/4960
Trung Lê
committed
Optimize Spree::LineItem#quantity_no_less_than_shipped
Trung Lê
committed

Commits on Sep 3, 2012

Lock all adjustments (not just mandatory ones) on checkout completion
BDQ
committed

Commits on Sep 5, 2012

Target correct form class name in checkout.js

alininja
authored and
radar
committed
Freeze to kaminari 0.13.0 until amatsuda/kaminari#280 is fixed
radar
committed
Fix postgres orphaned preferences SQL

felixbuenemann
authored and
radar
committed
add percent per item calculator to promotions

citrus
authored and
radar
committed
Upcase SQL syntax
Trung Lê
committed

Commits on Sep 7, 2012

Commits on Sep 8, 2012

Fixed order/customer_details_spec
radar
committed

Commits on Sep 10, 2012

disable via js double click on remove link and update button, fixes #1879

kennyadsl
authored and
radar
committed
Fix missing sass-rails dev dependency for extension gemspec
radar
committed
Fix limiting the availability of aShippingMethod to front end or back end

tneems
authored and
radar
committed
DRYed up go_to_state method.

ncolgan
authored and
radar
committed
added tax rate label

yanicklandry
authored and
radar
committed
Tidy up TaxRate#create_label method
radar
committed
added tax rate label

yanicklandry
authored and
radar
committed
Tidy up TaxRate#create_label method
radar
committed
Bump select2-rails to ~> 3.0 and rabl to 0.7.2
radar
committed
Fix product_properties autocomplete (raw output in js)

fabien
authored and
radar
committed
Remove poor man's equivalent of to_json from product_properties/index.html.erb
radar
committed
Update core/db/default/spree/countries.yml

wans
authored and
radar
committed
Correct mistaken check for params[:option_type] introduced with #1859
radar
committed

Commits on Sep 11, 2012

Commits on Sep 13, 2012

Commits on Sep 14, 2012

Prevent double submission of checkout confirm step
BDQ
committed

Commits on Sep 17, 2012

Fixed Product.in_taxon to not return duplicates

laurens
authored and
radar
committed
Fixes encoding problem in admin when using a different locale to :en

Javier Cuevas
authored and
radar
committed
Use display_amount which uses Money

Andrew Hooker
authored and
radar
committed
Revert "Use display_amount which uses Money"
radar
committed
Revert "Fixed Product.in_taxon to not return duplicates"
radar
committed
wrap opts[:ignore_types] in array to properly concatenate

Greg Morrison
authored and
radar
committed
Fix product factory name sequence with Kernel.rand so it is not interpreted as a Spree::Product method

RohanM
authored and
radar
committed

Commits on Sep 18, 2012

Fix issue where states.js was using wrong URL in HTTPS

argami
authored and
radar
committed
adds threading to chain of shipping_method.compute calls

jsqu99
authored and
radar
committed
Changing action to relative path in cart_form

argami
authored and
Trung Lê
committed

Commits on Sep 19, 2012

Commits on Sep 20, 2012

Commits on Sep 24, 2012

Commits on Sep 25, 2012

Commits on Sep 26, 2012

Fix stack level too deep error on Ruby 1.8 builds
radar
committed
Translate jstree labels + JS escape taxonomy names

laurens
authored and
radar
committed

Commits on Sep 27, 2012

allow case insensitive coupon codes

kennyadsl
authored and
radar
committed
Show error message for GET requests to /orders/populate
radar
committed
Return options at end of gateway_options
radar
committed
Referencing Correct I18n string for populate_get_error translation

Andrew Hooker
authored and
radar
committed

Commits on Oct 1, 2012

Fix missing address in gateway profile

zeeyang
authored and
Trung Lê
committed
Mail setting enable_starttls_auto and tls would throw ssl error if all set together

zeeyang
authored and
Trung Lê
committed
Fix preference lookup to use key not deprecated name column.

JDutil
authored and
Trung Lê
committed

Commits on Oct 2, 2012

Commits on Oct 5, 2012

Commits on Oct 8, 2012

Commits on Oct 10, 2012

Commits on Oct 11, 2012

Commits on Oct 14, 2012

Line item quantity validator must be greater than -1
radar
committed

Commits on Oct 15, 2012

Commits on Oct 16, 2012

Go to checkout state page when checkout button is clicked
radar
committed
[promo] Fix references to checkout *button*
radar
committed
Provide the Spree current user to the searcher class

Steve Hoeksema
authored and
radar
committed
Fix price parsing for numeric values

Clemens Kofler
authored and
radar
committed

Commits on Oct 17, 2012

Commits on Oct 18, 2012

Commits on Oct 19, 2012

Remove excessive spacing in JS for products/new.html.erb
radar
committed
capture! now does not operate on 'completed' payments
radar
committed
Localize order adjustements term in orders/_adjustments view

Brice Sanchez
authored and
radar
committed

Commits on Oct 22, 2012

Commits on Oct 24, 2012

Commits on Oct 25, 2012

Commits on Oct 26, 2012

Commits on Oct 28, 2012

[api] Fix zones_controller_spec
radar
committed

Commits on Nov 2, 2012

Only include eligible promotions in promo_total
BDQ
committed

Commits on Nov 4, 2012

Removes deprecation warning during preferable_spec run

camelmasa
authored and
radar
committed
taxon autocomplete display pretty_name instead of name

sbounmy
authored and
radar
committed
orders should only display variant text on order_details page

sbounmy
authored and
radar
committed

Commits on Nov 5, 2012

Commits on Nov 7, 2012

Remove gc_hacks file
radar
committed
Adding return authorization API

GeekOnCoffee
authored and
radar
committed
Restrict admin-y actions on return authorizations to just admins
radar
committed
[api] Restrict all return authorization actions
radar
committed
Adding Notes about Promo Checkout Controller Override

Andrew Hooker
authored and
radar
committed
Refactor out methods to product class that control if a product is on sale or on display.

nickfrandsen
authored and
radar
committed
Adding promotion usage information to the admin

iloveitaly
authored and
radar
committed

Commits on Nov 11, 2012

Various API improvements.

LBRapid
authored and
radar
committed
Require secure connection on OrderController#show

iloveitaly
authored and
radar
committed

Commits on Nov 12, 2012

Commits on Nov 14, 2012

Commits on Nov 15, 2012

Remove testing_support/env
radar
committed
Ignore .sass-cache for extensions.

Jeff Dutil
authored and
radar
committed
Freeze capybara dependency to 1.1.3
radar
committed
Add missing route to api payments capture
BDQ
committed

Commits on Nov 18, 2012

Move OrdersController#accurate_title to private
Trung Lê
committed

Commits on Nov 19, 2012