Commit Graph

10 Commits

Author SHA1 Message Date
Rob H
703f51ac1b WIP (Spree Update): Update reference to current_user -> spree_current_user 2013-07-23 10:43:08 +10:00
Rohan Mitchell
efec0b07d6 Merge branch 'amazon-ec2'
Conflicts:
	Gemfile
	Gemfile.lock
2013-07-22 10:29:11 +10:00
Andrew Spinks
df7dd557b5 Update CMS configuration take S3 details from the spree config. 2013-05-05 14:20:57 +10:00
Rob H
d7c2bdfe22 Change reference to method 'has_role' to 'has_spree_role' in CMS initialiser (required for Spree 1.3) 2013-02-14 12:12:19 +11:00
Rohan Mitchell
4fc7295b97 Use S3 configuration from environment vars instead of s3.yml 2012-10-19 16:40:18 +11:00
Rohan Mitchell
8c7a02ec10 Fix image uploads with CMS 2012-10-18 11:13:40 +11:00
Rohan Mitchell
9fbcd8c01b Display CMS pages with Spree's layout 2012-10-12 10:21:21 +11:00
Rohan Mitchell
28fc16ac66 Create links between Spree and CMS admin sections 2012-10-11 12:50:59 +11:00
Rohan Mitchell
a31c5bbe46 Authorise CMS via Spree login 2012-10-11 10:50:36 +11:00
Rohan Mitchell
b35fb618f3 Add base install of Comfortable Mexican Sofa 2012-10-11 10:50:36 +11:00