3142 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Rob H	934f960336	Add display as to new product page	2014-06-26 15:27:24 +10:00
Will Marshall	9eb43e6c09	Removing visible scopes from enteprise distributors and producers	2014-06-26 15:26:15 +10:00
Will Marshall	9755bd2251	Refactoring slightly	2014-06-26 15:17:19 +10:00
Will Marshall	ed6bb2275a	Fixing some regressions in tests, switching favicons	2014-06-26 15:04:32 +10:00
Will Marshall	0b8ca9af47	Adding visibility filtering to map	2014-06-26 14:49:40 +10:00
Will Marshall	a4e675e675	Refactoring visibility handling	2014-06-26 14:48:46 +10:00
Will Marshall	8862fd555c	Removing ng-animate, changing our enterprise restriction	2014-06-26 14:36:16 +10:00
Rob H	44fb34d7be	Rearrange admin title	2014-06-26 12:20:42 +10:00
Will Marshall	a1789a8058	Removing old serializers	2014-06-26 12:17:38 +10:00
summerscope	fdb1c64c63	Merge branch 'master' into laura_and_will	2014-06-26 11:16:42 +10:00
Will Marshall	9667b84c5c	Finishing the transition to AMS from RABL	2014-06-26 11:07:53 +10:00
Will Marshall	8baf32f926	Merge branch 'master' into enterprise-json-perf	2014-06-25 16:31:16 +10:00
Will Marshall	a49fe2bf65	Fixing a regression bug	2014-06-25 16:30:23 +10:00
summerscope	881c229855	Prevents turquoise color text on red button	2014-06-25 15:21:37 +10:00
Will Marshall	33b5359a16	Spiking AMS implementation of data	2014-06-25 15:18:13 +10:00
Will Marshall	9cb6987645	Refactoring the supplied_taxons query to use SQL	2014-06-25 15:18:00 +10:00
Will Marshall	b1f275dac8	Adding enterprises to cart to prevent errors being thrown	2014-06-25 14:38:16 +10:00
Rohan Mitchell	3687479c22	Fetch distributed_taxons in SQL	2014-06-25 14:33:19 +10:00