Code

spree-2-2-stable updates#101

Code

Open

chunkerchunker wants to merge 34 commits intojsqu99:masterjsqu99/spree_flexi_variants:masterfrom YesVideo:spree-2-2-stableYesVideo/spree_flexi_variants:spree-2-2-stableCopy head branch name to clipboard

+411-210

Commits

Commits on Oct 15, 2013

• change dependency to allow Spree 2.1

  charredUtensil

  committed
  263525a

• initial 2.0 changes, at least get the app to start

  charredUtensil

  committed
  db4287f

Commits on Oct 19, 2013

• get product customizations working on spree 2.1 / rails 4

  charredUtensil

  committed
  88691e1

Commits on Oct 21, 2013

• get ad hoc options working on spree 2.0 / rails 4

  charredUtensil

  committed
  5aad882

Commits on Oct 22, 2013

• vix ad hoc options

  charredUtensil

  committed
  257dce3

Commits on Nov 1, 2013

• use correct function to draw routes

  charredUtensil

  committed
  0148b00

• use actual correct method this time

  charredUtensil

  committed
  7053116

Commits on Nov 4, 2013

• fix layout of products page

  charredUtensil

  committed
  d979cc8

• fix columns correctly

  charredUtensil

  committed
  5f3a2a8

• fix styling on product cart form

  charredUtensil

  committed
  14e311e

Commits on Nov 7, 2013

• fix crash on engraving calculator cost = 0, use descriptions for customizations, tweak cart presentation

  charredUtensil

  committed
  64b9ed0

• accidentally committed two files

  charredUtensil

  committed
  aa00ceb

Commits on Nov 11, 2013

• protect against nil cost_price

  jsqu99

  committed
  13ba838

Commits on Nov 14, 2013

• Update merge! method within order_decorator to match the syntax of merge! in the order model of spree_core.

  jfields

  committed
  057c2f4

• undoes the undoing of option.presentation for option.description

  jsqu99

  committed
  1b68779

Commits on Nov 15, 2013

• Merge pull request jsqu99#87 from jfields/spree-2-1-wip

  Show description for 64175fa
  jsqu99

  committed
  64175fa

Commits on Nov 16, 2013

• beta work on using the 'new' order populator

  jsqu99

  committed
  3b18014

• Merge branch 'master' of github.com:jsqu99/spree_flexi_variants into spree-2-1-wip

  jsqu99

  committed
  baa18d1

• fixes merge conflict

  jsqu99

  committed
  5124eb8

Commits on Nov 17, 2013

• more versioning to get right w/ spree 2.1. Also, added a no_charge calculator

  jsqu99

  committed
  89c1a94

• adds missing files

  jsqu99

  committed
  af917e0

Commits on Nov 20, 2013

• adds testing improvements

  jsqu99

  committed
  221e3fd

Commits on Nov 21, 2013

• made some possibly-unecessary changes to the way the calculators are set up

  jsqu99

  committed
  b4d1f18

Commits on Jan 21, 2014

• fix Javascript error on engraving calculator

  Show description for 2de9573
  

  charredUtensil

  authored and

  radar

  committed
  2de9573

Commits on Feb 25, 2014

• Updates to support Spree 2.2

  chunkerchunker

  committed
  023a361

• Allow host app to predefine product_customization calculators.

  chunkerchunker

  committed
  ba49995

• Typo in amount_times_constant calculator client js.

  Show description for b802514
  chunkerchunker

  committed
  b802514

• Minor styling cleanup.

  chunkerchunker

  committed
  4d61cbb

Commits on Mar 1, 2014

• typo in order_decorator

  chunkerchunker

  committed
  1dcdd86

Commits on Mar 5, 2014

• Allow product customization pricing based on associated line_item configuration

  Show description for cd0f2a1
  chunkerchunker

  committed
  cd0f2a1

Commits on Mar 6, 2014

• typo in order_contents_decorator

  chunkerchunker

  committed
  be9ff6b

• minor style cleanup

  chunkerchunker

  committed
  fb9404b

Commits on Apr 7, 2014

• line_item validations could lead to unsaved product_customizations

  ssendev

  committed
  e95a76a

Commits on Jun 19, 2014

• Merge remote-tracking branch 'ssendev/spree_flexi_variants/patch-1' into spree-2-2-wip

  chunkerchunker

  committed
  92c4b73