Code

Catch 2-4-stable up with Master#94

Code

Open

davekiss wants to merge 42 commits intospree-contrib:2-4-stablespree-contrib/spree_digital:2-4-stablefrom davekiss:2-4-stabledavekiss/spree_digital:2-4-stableCopy head branch name to clipboard

+335-288

Commits

Commits on Dec 2, 2014

• Spree master moved on to 3.0.0.beta

  Show description for 1a38e34
  

  future

  committed
  1a38e34

  Copy full SHA for 1a38e34

Commits on Dec 3, 2014

• Merge pull request spree-contrib#77 from halo/spree-core-3-beta

  Show description for be4d5a5
  halo

  committed
  be4d5a5

  Copy full SHA for be4d5a5

Commits on Apr 7, 2015

• Fix specs.

  

  Jeff Dutil

  authored and

  Jeff Dutil

  committed
  9370bc8

  Copy full SHA for 9370bc8

• updated views for spree 3.0, use force_ssl as per release notes: https://github.com/spree/spree/blob/3d45e72c73aa5af64f608c429aa766658c85f01d/guides/content/release_notes/3_0_0.md

  jspizziri

  committed
  099df12

  Copy full SHA for 099df12

• get specs to run

  jspizziri

  committed
  b3ec3cc

  Copy full SHA for b3ec3cc

• update ruby version

  jspizziri

  committed
  4dca39c

  Copy full SHA for 4dca39c

• factory_girl version upgraded for updates to spree rpsec support

  jspizziri

  committed
  0dbf8c5

  Copy full SHA for 0dbf8c5

• update gemspec

  jspizziri

  committed
  812c8bb

  Copy full SHA for 812c8bb

• Convert specs to RSpec 2.99.2 syntax with Transpec

  Show description for 91d665a
  jspizziri

  committed
  91d665a

  Copy full SHA for 91d665a

• update rspec

  jspizziri

  committed
  1cfc9f7

  Copy full SHA for 1cfc9f7

• Convert specs to RSpec 3.0.4 syntax with Transpec

  Show description for 1d843f8
  jspizziri

  committed
  1d843f8

  Copy full SHA for 1d843f8

• fix fake secret for updated route constraints

  jspizziri

  committed
  f9dca38

  Copy full SHA for f9dca38

• conditional force_ssl

  jspizziri

  committed
  dc6e368

  Copy full SHA for dc6e368

Commits on Apr 8, 2015

• Use config.disable_monkey_patching in Rspec

  halo

  committed
  1e4a8ee

  Copy full SHA for 1e4a8ee

• Fixed the force_ssl conditional

  halo

  committed
  18b2686

  Copy full SHA for 18b2686

• Fixed a Spree::Order ActiveRecord stub

  halo

  committed
  dcde059

  Copy full SHA for dcde059

• Merge pull request spree-contrib#1 from halo/78-3-stable

  Show description for 469f654
  jspizziri

  committed
  469f654

  Copy full SHA for 469f654

• Update readme.md

  jspizziri

  committed
  44ae277

  Copy full SHA for 44ae277

• Bump versionfile

  jspizziri

  committed
  fe1f47c

  Copy full SHA for fe1f47c

• Update readme.md

  jspizziri

  committed
  0221865

  Copy full SHA for 0221865

Commits on Apr 10, 2015

• Merge pull request spree-contrib#78 from jspizziri/3-0-stable

  Show description for e15a489
  halo

  committed
  e15a489

  Copy full SHA for e15a489

• Readme tweaks

  halo

  committed
  20e9a72

  Copy full SHA for 20e9a72

• More readme simplifications

  halo

  committed
  0ac4021

  Copy full SHA for 0ac4021

Commits on Apr 16, 2015

• Update badges for new repo

  jspizziri

  committed
  3e4b279

  Copy full SHA for 3e4b279

• Update badges for new repo

  jspizziri

  committed
  8dae4ed

  Copy full SHA for 8dae4ed

Commits on Apr 17, 2015

• Merge pull request spree-contrib#81 from jspizziri/patch-1

  Show description for 2ccfe13
  JDutil

  committed
  2ccfe13

  Copy full SHA for 2ccfe13

• Merge pull request spree-contrib#83 from jspizziri/patch-2

  Show description for 8a3c68c
  JDutil

  committed
  8a3c68c

  Copy full SHA for 8a3c68c

Commits on Apr 20, 2015

• updates from davekiss

  jspizziri

  committed
  0f4bb29

  Copy full SHA for 0f4bb29

• Merge pull request spree-contrib#86 from jspizziri/master

  Show description for cdb4f09
  halo

  committed
  cdb4f09

  Copy full SHA for cdb4f09

• redirect on validation error

  jspizziri

  committed
  3cd169c

  Copy full SHA for 3cd169c

• added spec, updated validation on digital model

  jspizziri

  committed
  2b135f6

  Copy full SHA for 2b135f6

Commits on Apr 21, 2015

• Test that the flash message really is set spree-contrib#80

  halo

  committed
  4472570

  Copy full SHA for 4472570

• redirect on validation error

  jspizziri

  committed
  53f4f69

  Copy full SHA for 53f4f69

• added spec, updated validation on digital model

  jspizziri

  committed
  7ee37d9

  Copy full SHA for 7ee37d9

• Merge pull request spree-contrib#87 from jspizziri/master-redirect

  Show description for 0359c5c
  halo

  committed
  0359c5c

  Copy full SHA for 0359c5c

Commits on Aug 2, 2015

• Update gemspec and Gemfile to match Versionfile (spree 3.1.0.beta, current master branch of spree/spree)

  Show description for 3f9d212
  tomash

  committed
  3f9d212

  Copy full SHA for 3f9d212

Commits on Aug 10, 2015

• Merge pull request spree-contrib#93 from tomash/patch-1

  Show description for d9937dc
  halo

  committed
  d9937dc

  Copy full SHA for d9937dc

Commits on Sep 15, 2015

• Merge master into 2-4-stable

  davekiss

  committed
  cd51d42

  Copy full SHA for cd51d42

• Revert changes that break 2.4 compatibility

  davekiss

  committed
  318db41

  Copy full SHA for 318db41

• Merge in 3-0-stable-changes

  davekiss

  committed
  d6bbafb

  Copy full SHA for d6bbafb

• Allow a line item to report as digital if the variant's master is digital

  davekiss

  committed
  d15239e

  Copy full SHA for d15239e

• Revert "Fixed a Spree::Order ActiveRecord stub"

  Show description for f21fa7e
  davekiss

  committed
  f21fa7e

  Copy full SHA for f21fa7e