Commit Graph

522 Commits

Author SHA1 Message Date
Rohan Mitchell
ea0df511cc Enlarge local organics sidebar font 2013-04-26 09:23:42 +10:00
Rohan Mitchell
9909261c8c Update local organics logo 2013-04-26 09:18:47 +10:00
Rohan Mitchell
4730ba0734 Restore display of admin top-right menu 2013-04-25 21:52:10 +10:00
Rohan Mitchell
9f6d1a2f18 Order cycle reports are precise to time of day, not just date 2013-04-25 21:22:26 +10:00
Rohan Mitchell
cea2089768 Add empty admin.js, fixes asset not precompiled error 2013-04-25 15:50:41 +10:00
Rohan Mitchell
bea247e64d Only configure sass load paths if sass defined. Fixes production init. 2013-04-25 15:31:32 +10:00
Rohan Mitchell
0da57f1d6c Remove spree_heroku - S3 support is now built into Spree 2013-04-23 07:32:23 +10:00
Rohan Mitchell
8f6cc361cc Precompile all engine-specific assets 2013-04-22 18:34:11 +10:00
Rohan Mitchell
9e60e6269e Remove unneeded variables override file 2013-04-22 18:33:53 +10:00
Rohan Mitchell
139188e021 Turn on asset init on precompile - now precompile can find assets stored in engines (lib/chili/...), but this breaks Heroku deployment 2013-04-22 17:37:02 +10:00
Rohan Mitchell
3df2207664 Remove non-present files from gemspecs 2013-04-22 17:36:18 +10:00
Rohan Mitchell
7bee04e5f6 Update selenium-webdriver, test with eaterprises deployment settings by default 2013-04-22 16:48:49 +10:00
Rohan Mitchell
3db23393d2 Scope admin css to admin section, add simple styling for front-end 2013-04-22 16:23:30 +10:00
Rohan Mitchell
27d7a2c6c2 Remove example deface, update README with licence 2013-04-22 16:14:52 +10:00
Rohan Mitchell
3dd4e074fc Split spree variable changes into per-feature files, add an eaterprises feature for default layout 2013-04-22 16:12:50 +10:00
Rohan Mitchell
a90f060b28 Add local organics logo 2013-04-22 10:49:37 +10:00
Rohan Mitchell
3bd766eab9 Update local organics feature readme 2013-04-22 10:32:23 +10:00
Rohan Mitchell
3d8d8ecd49 Move assets deface to correct directory 2013-04-22 10:32:09 +10:00
Rohan Mitchell
a4bdea4d5c Add chili feature for local organics 2013-04-22 10:29:05 +10:00
Rohan Mitchell
cbef31f619 Install chili for feature toggles 2013-04-22 10:24:17 +10:00
Rohan Mitchell
dc54be992b Require spree support file that provides a default shipping method for ProductDistributions when building from factory - fixes product seeds 2013-04-21 08:54:32 +10:00
Rohan Mitchell
8f682a6d07 Unicorn handle forked db connections - fixes PG::Error SSL SYSCALL error: EOF detected 2013-04-19 09:52:16 +10:00
Rohan Mitchell
c5e8ac6fd1 Newrelic unicorn compatibility 2013-04-19 09:39:54 +10:00
Rohan Mitchell
3e2d31d432 spree-last-address repo deleted - use mirror
Conflicts:

	Gemfile
	Gemfile.lock
2013-04-19 09:27:40 +10:00
Rohan Mitchell
4ce7525748 Configure newrelic for performance monitoring 2013-04-19 09:20:59 +10:00
Rohan Mitchell
7cc1c97c53 Upgrade spree to 1.1.6beta 2013-02-12 09:18:50 +11:00
Rohan Mitchell
ccfe6bc0b3 Update bugsnag 2013-02-12 09:11:38 +11:00
Andrew Spinks
5e2fbcb874 Add script to sanitize order and user data. 2013-02-10 16:54:39 +11:00
Rohan Mitchell
5b22cce950 Remove sleeps from specs 2013-01-22 12:12:29 +11:00
Rohan Mitchell
fec81b7ed4 Fix failing specs after merge 2013-01-22 11:34:43 +11:00
Rohan Mitchell
f2f3bbd3ed Merge branch 'order-cycles-exchange-products'
Conflicts:
	Gemfile.lock
2013-01-22 10:40:56 +11:00
Rohan Mitchell
83e3c6815d Merge branch 'checkout-changes'
Conflicts:
	.rvmrc
	app/helpers/application_helper.rb
2013-01-22 10:30:51 +11:00
Rohan Mitchell
3f71655bd1 Test updating collection details 2013-01-22 09:44:19 +11:00
Rohan Mitchell
662aaf75bf When editing an order cycle, distributor collection details are loaded 2013-01-22 09:34:07 +11:00
Rob H
f7890bd94d Fixes following code review for checkout changes 2013-01-18 19:17:55 +11:00
Rob H
6a45e8be3b Make tests pass after changes to checkout broke them all 2013-01-18 15:29:36 +11:00
Rohan Mitchell
c75738893e Display supplier name on products for distribution 2013-01-18 14:35:06 +11:00
Rohan Mitchell
074d5715e7 Only provide distributors as coordinating enterprises. Order by name. 2013-01-18 14:26:56 +11:00
Rohan Mitchell
87d5ffeee2 Add fields for outgoing exchange collection details 2013-01-18 14:24:17 +11:00
Rohan Mitchell
9a03a58d9e Change exchange pickup time from datetime to string 2013-01-18 14:23:58 +11:00
Rohan Mitchell
ae93d02c9c OrderCycleFormApplicator applies outgoing exchange collection details 2013-01-18 14:23:42 +11:00
Rohan Mitchell
d8a7570a61 Display accurate counts for distributed products 2013-01-18 12:21:35 +11:00
Rohan Mitchell
a293ea54f9 Update saves distributors and distributed products 2013-01-18 12:13:13 +11:00
Rohan Mitchell
33b9d45f43 Distributors and products displayed on edit 2013-01-18 11:59:32 +11:00
Rohan Mitchell
0a2ce30bb6 Only show variants for distribution that are supplied to the order cycle 2013-01-18 11:52:01 +11:00
Rohan Mitchell
1a0ef85030 Test distributor exchanges are created with order cycles 2013-01-18 11:40:36 +11:00
Rohan Mitchell
983ba92dea OrderCycleFormApplicator deals with outgoing exchanges 2013-01-18 11:22:42 +11:00
Rohan Mitchell
487247f6e7 Upgrade selenium-webdriver, fixes testing in new firefox 2013-01-18 09:35:29 +11:00
Rohan Mitchell
05c9a189c8 Merge branch 'email-changes' 2013-01-17 16:09:25 +11:00
Rohan Mitchell
43a1cf7779 Merge branch 'product-quantity-fix' 2013-01-17 16:07:55 +11:00