Rafael Schouten 8395dbb3e9 Merge branch 'master' into config ...

Conflicts:
	.gitignore
	Gemfile

2014-10-25 15:29:53 +11:00

..

admin

Only show enterprise partial when no enterprises exist

2014-10-17 17:15:49 +11:00

api

Add fields for variant display name and display as to bpe

2014-06-06 10:10:41 +10:00

checkout

Hide checkout paypal button, remove unneeded frontend JS

2014-07-25 12:44:14 +10:00

layouts/admin

Convert admin login nav to haml

2014-09-05 15:10:16 +10:00

order_mailer

Merge branch 'master' into raf_bugfix

2014-10-02 19:06:30 +10:00

orders

add spree currency helper, fix some typos and specs

2014-09-11 11:47:55 +10:00

products

Remove add to cart distribution selection, remove distribution change functionality from OrderPopulator, remove now-redundant tests

2014-01-08 11:39:05 +11:00

shared

add spree currency helper, fix some typos and specs

2014-09-11 11:47:55 +10:00

user_mailer

add figaro env config

2014-09-16 00:13:43 +10:00

users

Moving User Account to darkswarm

2014-03-28 16:02:32 +11:00

_sidebar.html.haml

WIP Add hub and order cycle display stub with failing tests

2013-03-08 15:18:52 +11:00