144 Commits

Author	SHA1	Message	Date
Rob Harrington	f13b52411d	Merge branch master into properties	2015-04-17 13:23:33 +10:00
Rohan Mitchell	d1ab2d9dac	Add daemons gem for Delayed::Job	2015-04-16 16:54:43 +10:00
Rohan Mitchell	61cb2514cd	Add Delayed::Job	2015-04-16 16:54:43 +10:00
Rob Harrington	4c4490a9b7	Upgrading foundation-rails and sass	2015-03-06 19:01:39 +11:00
Rohan Mitchell	46aee6f77c	Upgrade Rails to 3.2.21	2015-02-11 14:30:49 +11:00
Rob Harrington	21db56ce6c	Rollback angularjs upgrade	2015-01-28 08:41:14 +11:00
Rohan Mitchell	532041c07b	Use Fuubar formatter for rspec - displays fails as they happen	2015-01-08 12:12:15 +11:00
Paul Mackay	73ece4075c	Add rails-i18n gem.	2014-12-03 09:39:35 +11:00
Rob Harrington	9bd3909449	Merge master into pretty-emails	2014-11-21 14:43:01 +11:00
Rohan Mitchell	8096ca2519	Merge remote-tracking branch 'origin/config' into config	2014-11-20 15:41:15 +11:00
Rob Harrington	ac6a043f40	Add roadie-rails to help with inlining styles for emails	2014-11-20 14:56:35 +11:00
Rohan Mitchell	2ca2d53273	Do not include perftools gem by default - it breaks Travis	2014-11-12 16:25:45 +11:00
Rafael Schouten	8395dbb3e9	Merge branch 'master' into config ... Conflicts: .gitignore Gemfile	2014-10-25 15:29:53 +11:00
Rafael Schouten	412bf8f638	cleanup gemfile	2014-10-01 17:16:09 +10:00
Rafael Schouten	e480d3a135	rearrange admin sidebars	2014-09-26 13:06:29 +10:00
Rob Harrington	d3e72b5a2a	Adding images to registration process	2014-09-19 12:41:24 +10:00
Rafael Schouten	9448e1cbe4	add figaro env config	2014-09-16 00:13:43 +10:00
Rohan Mitchell	cc011f5136	Switch to forked version of better_spree_paypal_express - passes customer email and phone number to paypal. Waiting on PR #117	2014-08-12 12:34:42 +10:00
Rohan Mitchell	e8b409c1f4	Switch from spree_paypal_express to better_spree_paypal_express	2014-07-25 12:44:14 +10:00
Rohan Mitchell	7a3f68ea38	Update Rails to 3.2.19	2014-07-16 09:33:59 +10:00
Rohan Mitchell	f8572db683	Install and configure dalli for staging and production environments	2014-07-04 14:39:27 +10:00
Maikel Linke	e0119a3f1f	Adding perftools.rb ... perftools.rb can profile your code. The spec_helper contains comments about how to activate it.	2014-07-03 14:30:36 +10:00
Will Marshall	33b5359a16	Spiking AMS implementation of data	2014-06-25 15:18:13 +10:00
Rohan Mitchell	9ccdd3b4e0	Add reactive integrity test that soft-deleted variants are removed from order cycles	2014-06-12 14:59:27 +10:00
Rohan Mitchell	e40843bccb	Allow error messages without attribute name. Improve enterprise relationship error message.	2014-05-21 11:29:11 +10:00
Rohan Mitchell	4ebc22f438	Remove capybara-screenshot, which appears to have been slowing down the build dramatically	2014-05-09 08:56:10 +10:00
Rohan Mitchell	db653682b1	Add capybara-screenshot - automatic screenshots for test fails	2014-05-02 14:25:32 +10:00
Rohan Mitchell	c9aefa507a	Remove chili	2014-05-02 14:25:32 +10:00
Rohan Mitchell	d707624525	Fix warnings - faker clash with ffaker, i18n enforce_available_locales	2014-05-02 14:25:32 +10:00
Will Marshall	c33fa03736	Merging into master	2014-04-29 10:35:05 +10:00
Will Marshall	9ef7023600	Adding template cache injection	2014-04-24 17:05:10 +10:00
Rohan Mitchell	f7658ad250	Add foreign keys, sanitising data first	2014-04-24 13:20:15 +10:00
Will Marshall	0479a0a55d	Fixing bugs, improving dates	2014-04-23 15:46:14 +10:00
Rohan Mitchell	566b58f3cb	Fix deployment issue: sass-rails needs to be in default group for application.rb config, and in assets group so that it's required.	2014-04-08 18:06:48 +10:00
Rohan Mitchell	e2fb593baf	Fix deployment issue: sass-rails needs to be in default group for application.rb config, and in assets group so that it's required.	2014-04-02 08:55:25 +11:00
Will Marshall	e1465352d0	Improving the navigation by moving it all to a service, adding a generic icon	2014-03-28 16:02:31 +11:00
Rohan Mitchell	a97f0439e1	Fix 'undefined method sass' - we need sass-rails in production env	2014-03-28 15:57:29 +11:00
Will Marshall	d4f26c9ef1	Moving foundation out of assets group	2014-03-27 13:01:02 +11:00
Will Marshall	e4bb2f1cdf	Keeping Foundation 4 and 5 parallel	2014-03-27 13:01:02 +11:00
Will Marshall	bf7d12b40e	Upgrading Foundation, starting to work through regression issues	2014-03-27 13:01:01 +11:00
Rohan Mitchell	6934cf236f	Update Rails	2014-02-28 14:34:14 +11:00
Will Marshall	b6b5c2889e	Reworking checkout to use f_form_for, show validation, better controller layout	2014-02-21 14:31:03 +11:00
Will Marshall	ece7caa14a	Moving Darkswarm to new Angular version	2014-02-18 14:00:23 +11:00
Will Marshall	1a1057b824	Removing unhelpful gem	2014-01-16 13:04:44 +11:00
Will Marshall	d4d2482927	Adding ng-min	2014-01-16 11:24:53 +11:00
Rohan Mitchell	2f98888acd	Remove active model serializers gem	2014-01-08 11:31:05 +11:00
Will Marshall	c4c5f3a8c7	Merging from master	2013-12-17 14:18:21 +11:00
Will Marshall	843a1133ef	Moving to use custom serializers for ze JSON API	2013-12-17 13:48:08 +11:00
Rohan Mitchell	5c744c7295	Move enterprises_distributor_info_rich_text_feature styles into central files	2013-12-13 16:01:36 +11:00
Will Marshall	12743850b4	Removing a chili, refactoring order mailer	2013-12-13 15:40:22 +11:00