Code

2 2 stable#14

Code

Open

gus4no wants to merge 11 commits intospree-contrib:masterspree-contrib/spree_affiliate:masterfrom gus4no:2-2-stablegus4no/spree_affiliate:2-2-stableCopy head branch name to clipboard

+19-14

Commits

Commits on May 8, 2014

• Make compatible with Spree 2.2

  

  mumoc

  authored and

  radar

  committed
  6a27695

  Copy full SHA for 6a27695

Commits on May 14, 2014

• use try to avoid NoMethodError for nil class

  

  Gustavo Robles

  committed
  ebc7dfb

  Copy full SHA for ebc7dfb

• fix referred users association by adding a source

  

  Gustavo Robles

  committed
  0ef4d7d

  Copy full SHA for 0ef4d7d

• Merge branch 'bug/fix_referred_users_association' into 2-2-stable

  Show description for 723728a
  

  Gustavo Robles

  committed
  723728a

  Copy full SHA for 723728a

• Merge branch 'bug/fix-nil-error' into 2-2-stable

  

  Gustavo Robles

  committed
  799949e

  Copy full SHA for 799949e

Commits on May 15, 2014

• use token instead of id

  

  Gustavo Robles

  committed
  5d0b17c

  Copy full SHA for 5d0b17c

• fix typos

  

  Gustavo Robles

  committed
  24bd868

  Copy full SHA for 24bd868

• remove state method, seems useless

  

  Gustavo Robles

  committed
  d91cd03

  Copy full SHA for d91cd03

Commits on May 21, 2014

• add haml dependency to avoid errors

  

  Gustavo Robles

  committed
  36cf525

  Copy full SHA for 36cf525

Commits on Jun 11, 2014

• explicitly require haml in engine definition, wasn't being properly loaded

  

  Gustavo Robles

  committed
  a381b69

  Copy full SHA for a381b69

Commits on Jul 22, 2014

• load right haml dependency

  

  Gustavo Robles

  committed
  ba8790c

  Copy full SHA for ba8790c