3160 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Will Marshall	30d78c8da3	Adding a spec to test a regression	2014-07-09 11:33:36 +10:00
Will Marshall	7d39c30dbd	Fixing a taxon bug	2014-07-09 10:54:40 +10:00
Rohan Mitchell	ba964d54d9	Update spree and spree_auth_devise	2014-07-04 17:07:58 +10:00
Rohan Mitchell	470ae7e729	Fix unreliable spec	2014-07-04 14:39:27 +10:00
Rohan Mitchell	30262e1969	Clean up specs, fix broken spec, remove JS log	2014-07-04 14:39:27 +10:00
Rohan Mitchell	f8572db683	Install and configure dalli for staging and production environments	2014-07-04 14:39:27 +10:00
Rohan Mitchell	8b67fc4d61	Make DSM timestamp columns NOT NULL	2014-07-04 14:39:27 +10:00
Rohan Mitchell	ae0392b383	Fix spec fail with taxons by id	2014-07-04 14:39:27 +10:00
Rohan Mitchell	94902268e2	Initialise enterprise country in controller, not model. Fixes address SQL load every time an enterprise is instanciated.	2014-07-04 14:39:27 +10:00
Rohan Mitchell	206275b794	Code cleanups	2014-07-04 14:39:27 +10:00
Rohan Mitchell	da4a00c720	Remove ruby- prefix from .ruby-version, turn off Travis email notifications	2014-07-04 14:39:27 +10:00
Rohan Mitchell	8f6a2575b7	Minor code formatting changes	2014-07-04 14:39:26 +10:00
Will Marshall	c57148340c	Fixing spec regression	2014-07-04 14:39:26 +10:00
Will Marshall	6d4dfad336	OK address no longer being lazy-loaded	2014-07-04 14:39:26 +10:00
Will Marshall	0177a56408	Caching address and touching enterprise on save	2014-07-04 14:39:26 +10:00
Will Marshall	61d8be3ddc	Removing old file, renaming one to match naming conventions	2014-07-04 14:39:26 +10:00
Will Marshall	74f29f8c74	Tweaking spec names	2014-07-04 14:39:26 +10:00
Will Marshall	1f6641766d	Restoring Producers page	2014-07-04 14:39:26 +10:00
Will Marshall	23034a55d4	Adding tests and full touch behaviour for caching	2014-07-04 14:39:26 +10:00
Will Marshall	3195e20b65	cleaning up touches	2014-07-04 14:38:27 +10:00
Will Marshall	24d3abf6d5	Adding dereferencing to taxons and reducing our data-set	2014-07-04 14:38:27 +10:00
Will Marshall	4a116570d1	adding by producer id filtering	2014-07-04 14:38:27 +10:00
Will Marshall	e858c0d434	Moving taxon filter to ID instead of name	2014-07-04 14:38:27 +10:00
Will Marshall	8b98c72336	Adding all the Angular filters required to make this work	2014-07-04 14:38:27 +10:00
Will Marshall	8b439c4e69	Temporary/demonstration caching behaviour, INCOMPLETE	2014-07-04 14:38:27 +10:00
Rob H	3da2461af5	Require shipping methods to have at least one distributor	2014-07-04 14:05:44 +10:00
Rob H	6a1f8dccfb	Merge branch 'master' into working	2014-07-04 12:03:23 +10:00
Maikel Linke	ac54bf6b22	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork	2014-07-03 14:32:06 +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
Rob H	29fde37ba3	Merge branch 'bug-herd' into working	2014-07-03 14:24:39 +10:00
Rob H	569327ecce	Merge branch 'master' into working	2014-07-03 10:15:45 +10:00
Rohan Mitchell	570a33db5f	Revert "install script". Prototype script should not yet be on master. ... This reverts commit 39012388a2.	2014-07-02 14:54:13 +10:00
summerscope	75f3358e2a	Adding CTA button for crowdfunding site to homepage & countdown timer directive	2014-07-02 14:44:46 +10:00
Maikel Linke	35bcebc823	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork	2014-06-28 19:43:01 +10:00
Maikel Linke	39012388a2	install script	2014-06-28 19:41:45 +10:00
Will Marshall	ce3cb7890b	Removing old product modal	2014-06-27 15:16:08 +10:00
Will Marshall	f316b8dec5	Adding product modals in new format	2014-06-27 15:15:41 +10:00
Will Marshall	7b673870cd	Adding bulk icons	2014-06-27 15:04:56 +10:00
Will Marshall	e8ba36041b	Tests and patch for group filter	2014-06-27 15:01:12 +10:00
Will Marshall	8bd8d811b1	Unbreaking the groups page	2014-06-27 14:51:55 +10:00
Will Marshall	e4c8c19fea	Tweaking the producer modal	2014-06-27 14:39:50 +10:00
Will Marshall	03c84cbfe5	Fixing missing taxon icons	2014-06-27 14:39:50 +10:00
Rohan Mitchell	5a235be110	Fix regressed JS spec	2014-06-27 11:56:09 +10:00
Rohan Mitchell	aa5767cd30	Remove paypal image button from checkout, fix redirect to paypal	2014-06-27 11:52:36 +10:00
Rohan Mitchell	4075854440	Navigation.go supports full URLs	2014-06-27 11:51:53 +10:00
Rohan Mitchell	b678a2f7fd	Move navigation spec to services dir	2014-06-27 11:34:02 +10:00
Rob H	083fda0ad0	Set columns on BPE error messages	2014-06-27 10:46:54 +10:00
Will Marshall	f8d51c3105	Fixing intermittent spec failure	2014-06-26 15:43:33 +10:00
Will Marshall	821724b01e	Merge branch 'master' into laura_and_will	2014-06-26 15:33:51 +10:00
Will Marshall	8480cf7866	Tab fixes, new tests, reworking modals	2014-06-26 15:32:55 +10:00