560 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Cook	a63b8908bb	Moved inline style to stylesheet	2013-06-21 16:12:56 +10:00
David Cook	0525abb084	Test that scopes don't return deleted products	2013-06-21 15:53:12 +10:00
David Cook	250e76c281	Fix incorrect count of enterprises (due to bug in rails issue #5554)	2013-06-21 15:10:21 +10:00
David Cook	7121860416	new view to display all distributors	2013-06-21 10:53:24 +10:00
David Cook	2e6387ac60	test available_on for distributors	2013-06-21 10:52:15 +10:00
David Cook	38c0552362	test 'more' count	2013-06-21 10:47:04 +10:00
David Cook	2d64e257ff	break long lines into two; no functional change	2013-06-21 10:45:11 +10:00
David Cook	d95903a82d	add html output format for all distributors	2013-06-21 10:44:16 +10:00
David Cook	b0e4bef75e	rename sidebar collection variables to avoid clash, fix count to be distinct	2013-06-21 10:42:42 +10:00
David Cook	1a9fd4a9a8	Merge branch 'supplied-active-products-on-hand' of github.com:eaterprises/openfoodweb into supplied-active-products-on-hand	2013-06-14 17:40:12 +10:00
David Cook	7933dea611	WIP: add more tests	2013-06-14 17:38:51 +10:00
David Cook	7ce7107c6c	Add meaningfull ids and classnames	2013-06-14 17:37:44 +10:00
David Cook	1abc0dac68	rename vars again	2013-06-14 17:36:38 +10:00
Rohan Mitchell	063d760047	Merge branch 'master' into supplied-active-products-on-hand	2013-06-14 11:07:24 +10:00
Rohan Mitchell	26c3b80e87	Reverse unintentional changes to database.yml and db/schema.rb	2013-06-14 11:05:56 +10:00
Rohan Mitchell	1e94f88c5e	Ensure order decorator is required, fix test fragility	2013-06-07 15:40:03 +10:00
David Cook	423bd52fd6	rename _count vars to _total	2013-05-22 14:03:51 +10:00
vagrant	4e7f966429	add suppliers scope, limit by 5, test	2013-05-22 13:07:30 +10:00
vagrant	aa85d20173	add suppliers scope, limit by 5, test	2013-05-22 13:06:24 +10:00
Rohan Mitchell	fa11ff8982	Remove more spork-specific things, remove unused cuc config from zeus	2013-04-05 15:25:46 +11:00
Rohan Mitchell	ed7bded642	Remove spork	2013-04-05 15:16:54 +11:00
Rob H	5544ccb94e	Merge branch 'master', remote-tracking branch 'origin'	2013-03-27 10:42:05 +11:00
Rohan Mitchell	3e6c56a638	Add turbo sprockets for faster asset precompile	2013-03-16 13:08:14 +11:00
Rohan Mitchell	5089d3bb22	Add simplecov	2013-03-11 10:57:14 +11:00
Rohan Mitchell	bd5533e2b1	Revert "Add a failing test to test travis" ... This reverts commit 72aa8fe5e5.	2013-02-24 20:22:37 +11:00
Rohan Mitchell	72aa8fe5e5	Add a failing test to test travis	2013-02-24 19:57:57 +11:00
Rohan Mitchell	cdc3ab09a1	Set up xvfb for Travis	2013-02-24 19:42:32 +11:00
Rohan Mitchell	b030793f15	Fix migrations that fail because of coupling to changed/removed models	2013-02-24 19:09:43 +11:00
Rohan Mitchell	3a441cd7d9	Configure travis for postgres	2013-02-24 18:46:31 +11:00
Rohan Mitchell	2b19253895	Attempt 2	2013-02-24 18:17:46 +11:00
Rohan Mitchell	d60935c800	Exclude pry from CI build	2013-02-24 18:05:11 +11:00
Rohan Mitchell	4bcd55959a	spree-last-address repo deleted - use mirror	2013-02-24 17:51:46 +11:00
Rohan Mitchell	719ef386bf	Only build on Ruby 1.9.3	2013-02-24 17:51:20 +11:00
Rohan Mitchell	e3fdb12289	Add travis config	2013-02-24 17:36:19 +11:00
Rohan Mitchell	b0a665aef7	Update ransack (rubygems could not find previous version)	2013-02-20 15:44:21 +11:00
Rohan Mitchell	3982b2a690	Merge branch 'new-spree' ... Conflicts: Gemfile.lock	2013-02-20 15:24:27 +11:00
Rob H	a59b136864	Spree 1.3 upgrade: fix final failing tests	2013-02-20 15:16:43 +11:00
Rob H	055c07a466	Add before_payment method to checkout controller (fixes issues with spree_paypal_express)	2013-02-20 14:04:10 +11:00
Rohan Mitchell	8903c13c84	Bugsnag uses SSL, notify on staging as well as production	2013-02-20 10:09:43 +11:00
Rob H	046eb256ff	Fix issues causing enterprise fee tests to break	2013-02-15 14:10:56 +11:00
Rob H	68246e08d2	Fix stack overflow error in admin shipping method test	2013-02-15 10:34:17 +11:00
Rob H	1ded1bac3f	Lengthen Capybara.default_wait_time for tests that fail due to long load time	2013-02-15 10:31:41 +11:00
Rob H	2f1a9094bf	Fix StaleObjectError in order model test	2013-02-14 16:49:28 +11:00
Rob H	2cdf458d6a	Move additional of tabs to main nav bar to defaces, rather than overriding view directly	2013-02-14 15:42:47 +11:00
Rob H	9e9199643e	Remove unneeded :partial from override	2013-02-14 15:35:50 +11:00
Rob H	c956706d78	Move set_current_order override to new location in lib (Spree 1.3 Upgrade), and update home controller test	2013-02-14 15:12:50 +11:00
Rob H	290f2276cd	Update cms_admin spec work after Spree 1.3 upgrade broke it	2013-02-14 14:03:14 +11:00
Rob H	b924b0c817	Remove unnecessary include of Spree::Core::CurrentOrder (helper is now accessible by all controllers in Spree 1.3)	2013-02-14 12:24:01 +11: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
Rob H	a3746c6c59	Add analytics helper to Enterprises Controller	2013-02-14 12:10:31 +11:00