540 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Rob H	1d4fbe865b	Finished revision of defaces	2013-02-09 00:40:34 +11:00
Rob H	c517469662	Added down method to remove_display_on_from_payment_methods migration	2013-02-07 22:54:07 +11:00
Rob H	1ead1dadaf	Upgrade database to Spree 1.3	2013-02-07 15:58:15 +11:00
Rob H	109d5cfe67	Upgrade database to Spree 1.2	2013-02-07 15:34:00 +11:00
Rob H	62d6745f02	Rollback all Spree 1.3 migrations (forgot db/schema.rb)	2013-02-07 15:24:59 +11:00
Rob H	bdea85d1b4	Rollback all Spree 1.3 migrations	2013-02-07 15:24:17 +11:00
Rob H	2a07d61e81	Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue	2013-02-07 15:09:25 +11:00
Rob H	99b4530db2	WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name	2013-02-07 13:07:14 +11:00
Rob H	3507c5414d	Changed Sass variable: back to our green colour following upgrade	2013-02-07 09:25:29 +11:00
Rob H	4b254a5529	WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name	2013-02-06 11:25:26 +11:00
Rob H	612017f143	WIP Upgrade to Spree 1.3	2013-02-05 15:01:45 +11:00
Rob H	e559870189	Merge remote-tracking branch 'origin/master'	2013-02-01 13:15:25 +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