dinislage/spree_digital
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51 Commits 5 Branches 1 Tag
2a0d165d93df082a2fb2a76c00f239b9f457e2e6
Commit Graph
51 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Bianco 2a0d165d93 Merge branch 'trahfo/master' into spree-1.1 
* trahfo/master:
  specify available attributes for update
  specify available attributes for update
  moved partial into other directory
  specify available attributes for update
  let's see if it also works with spree 1.1.0

Conflicts:
	spree_digital.gemspec
 2012-06-07 10:52:43 -04:00
Michael Bianco 5cfa1175af Updated testing to use spree 1.1 and new factorygirl syntax 2012-06-07 10:50:40 -04:00
Jakob 1fd0cd2916 specify available attributes for update 2012-05-14 15:54:57 +02:00
Jakob 831b513e6f specify available attributes for update 2012-05-14 15:48:00 +02:00
Jakob 3025683638 moved partial into other directory 2012-05-14 15:05:21 +02:00
Jakob b7ef0a5b9d specify available attributes for update 2012-05-14 14:56:38 +02:00
Jakob 9b193c217d let's see if it also works with spree 1.1.0 2012-05-14 10:58:05 +02:00
Michael Bianco a8c27750ef Spree 1.1 compatibility. Minor fix to shipping option filtering in checkout process 2012-05-10 10:18:56 -04:00
funkensturm bafceda467 Merge pull request #15 from iloveitaly/spree-1.0 
Deface Instead of Copied Delivery Partials
 2012-05-04 13:48:29 -07:00
Michael Bianco c5f0c79a03 Present message to user when no shipping methods are available 2012-05-03 10:59:32 -04:00
Michael Bianco 65de5ee7d7 Deleting old delivery partials 2012-05-02 16:09:19 -04:00
Michael Bianco c780e6f756 Replacing _delivery partial overrides with deface 2012-05-02 16:05:12 -04:00
Michael Bianco e737739f51 Removing explicit overrides load. This is done automatically 2012-05-02 16:00:00 -04:00
Michael Bianco 596006e8e1 Updating copied templates from spree 2012-05-01 11:45:53 -04:00
Michael Bianco 648f412ceb Resolving internationalization conflict with spree_essentials 2012-05-01 11:35:43 -04:00
funkensturm 8674cf777f Merge pull request #14 from iloveitaly/spree-1.0 
Remove Assets
 2012-04-11 23:59:23 -07:00
Michael Bianco da1a13f472 Merge branch 'funkensturm/master' into spree-1.0 
* funkensturm/master:
  Ruby 1.9.3 compatibility fix
 2012-04-11 16:26:58 -04:00
Michael Bianco ab049fb4bb Removing unneeded CSS + JS assets 2012-04-11 16:24:56 -04:00
funkensturm 6d57afb194 Merge pull request #13 from wakeless/ruby-1-9-3 
Fixes broken digitals in ruby 1.9.3
 2012-04-09 05:48:29 -07:00
funkensturm 7d7f21b737 Merge pull request #12 from iloveitaly/spree-1.0 
Added preferences for click count and valid days on digital links. Added Authorization Tests
 2012-04-09 05:38:06 -07:00
Michael Gall 8367745433 Ruby 1.9.3 compatibility fix 2012-04-05 12:25:43 +10:00
Michael Bianco e652835a5f Added preferences for click amount and valid days on digital links. Tests for authorization are now running 2012-03-31 11:07:52 -04:00
funkensturm 13f60a6a1f Merge pull request #11 from iloveitaly/spree-1.0 
Spree 1.0 Compatibility + Passing Tests
 2012-03-31 02:31:17 -07:00
Michael Bianco c4a85b71d7 Updating all tests. All tests are passing 2012-03-30 19:25:07 -04:00
Michael Bianco 62082f5a82 Updating Rakefile, Gemfile, etc for Spree 1.0 testing compatibilty 2012-03-30 19:23:58 -04:00
Michael Bianco 7f729bd402 Forgot to save merged changed. Minor deface fix 2012-03-28 21:51:16 -04:00
Michael Bianco f53f2d2c63 Updated Versionfile 2012-03-28 20:29:40 -04:00
Michael Bianco e7a7064aca Updating gemspec 2012-03-28 18:50:45 -04:00
Sam DaviesandMichael Bianco d2923b595f Removed rake tasks. Added generators. Modern engine dir structure 2012-03-28 18:43:27 -04:00
Michael Bianco b7355fded8 Removing old hook 2012-03-28 18:38:57 -04:00
Michael GallandMichael Bianco 76cc733755 Making compatible with later versions of spree 2012-03-28 18:37:13 -04:00
funkensturm ca8d8ed610 Merge pull request #6 from iloveitaly/master 
Adding 0.7.x Repo Reference in Versionfile
 2012-01-02 22:57:36 -08:00
Michael Bianco a8838761e0 Adding 0.7.x git repo reference 2011-12-27 14:51:06 -05:00
Michael Gallandfuture e1b4787988 Search for digitals through variants 2011-12-19 18:46:11 +01:00
Michael Gallandfuture 4ecf99a4ae Using resource controller and namespace 2011-12-19 18:46:11 +01:00
Michael Gallandfuture 02fd4a64d1 inheriting from the correct controller 2011-12-19 18:46:11 +01:00
Michael Gallandfuture c0255bdf87 inheriting from the correct controller 2011-12-19 18:46:11 +01:00
Michael Gallandfuture 414cf485ab Spree namespace changes 2011-12-19 18:46:11 +01:00
Michael Gallandfuture 191158639e Adding namespace support 2011-12-19 18:46:11 +01:00
Michael Gallandfuture eddaea6395 Updating confirm email 2011-12-19 18:46:11 +01:00
funkensturm 20cc654c29 Merge pull request #3 from Genshin/master 
Added Japanese locale
before-rails3-1 		2011-11-21 04:21:30 -08:00
影月 零 cdb10b79dd added japanese locale 2011-11-20 03:15:56 +09:00
funkensturm ab4efeb100 Merge pull request #2 from wakeless/rails3-1 
Compatibility for rails 3-1 - Thanks!
 2011-09-15 00:17:55 -07:00
Michael Gall 37fe9eb5ce Puting the deface in the right spot 2011-09-15 02:38:22 +10:00
Michael Gall 7613f80ad3 Change insert_after to deface hook 2011-09-15 00:10:42 +10:00
David Radcliffeandfunkensturm b442641496 fixed human_name warning 2011-04-29 21:13:05 +08:00
Captain Future ba3042f98b download links should not be in order unless there are digital items :) 2011-04-22 19:16:56 +02:00
Captain Future 0a4db498da some minor fixes 2011-04-22 19:06:33 +02:00
Captain Future eaa34e86d8 minor readme fix 2011-04-18 22:09:17 +02:00
Captain Future 6d3a65900b Readme tweak, deleted textmate project file 2011-04-18 22:03:04 +02:00