raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,248 Commits 21 Branches 450 Tags
fa337fcd6ea0c3bfcdc60ca910602bdd5e1fa901
Commit Graph

1485 Commits

Author SHA1 Message Date
Rob H
fa337fcd6e Prevent display_as and display_name from being used when blank 2014-07-10 17:04:35 +10:00
Will Marshall
9d519f5f4b Fixing a minor test regression 2014-07-10 11:52:32 +10:00
Will Marshall
c640233ee5 Merge branch 'master' into laura_and_will 
Conflicts:
	app/assets/javascripts/darkswarm/filters/taxons.js.coffee
	app/models/enterprise.rb
	app/serializers/api/enterprise_serializer.rb
	db/migrate/20140702053145_add_fields_to_distributors_shipping_methods.rb
	db/schema.rb
	spec/helpers/shared_helper_spec.rb
	spec/javascripts/unit/darkswarm/filters/shipping_spec.js.coffee
	spec/javascripts/unit/darkswarm/filters/taxons_spec.js.coffee
	spec/javascripts/unit/darkswarm/services/taxon_spec.js.coffee
	spec/models/enterprise_spec.rb
 2014-07-09 11:40:54 +10:00
Will Marshall
30d78c8da3 Adding a spec to test a regression 2014-07-09 11:33:36 +10:00
Rohan Mitchell
ba964d54d9 Update spree and spree_auth_devise 2014-07-04 17:07:58 +10:00
Will Marshall
eb8f59d65b Tests for the taxon filtering 2014-07-04 15:19:45 +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
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
Will Marshall
c57148340c Fixing spec regression 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
74f29f8c74 Tweaking spec names 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
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
f335b6a576 Taxon selectors and show/hide behaviour 2014-07-04 14:09:53 +10:00
Rob H
3da2461af5 Require shipping methods to have at least one distributor 2014-07-04 14:05:44 +10:00
Will Marshall
ca6068c095 Fixing a borked test 2014-07-04 13:51:24 +10:00
Maikel Linke
5459a54ada Adding perftools.rb 
perftools.rb can profile your code. The spec_helper contains comments
about how to activate it.
 2014-07-04 13:51:24 +10:00
Will Marshall
fab96b58a7 Fixing spec regression 2014-07-04 13:51:23 +10:00
Will Marshall
2f98da8eef Caching address and touching enterprise on save 2014-07-04 13:51:23 +10:00
Will Marshall
22b5e152d1 Tweaking spec names 2014-07-04 13:51:23 +10:00
Will Marshall
17612f14f5 Adding tests and full touch behaviour for caching 2014-07-04 13:51:23 +10:00
Will Marshall
487b8616c0 Adding dereferencing to taxons and reducing our data-set 2014-07-04 13:51:22 +10:00
Will Marshall
55bf59ba96 adding by producer id filtering 2014-07-04 13:51:22 +10:00
Will Marshall
1955048502 Moving taxon filter to ID instead of name 2014-07-04 13:51:22 +10:00
Will Marshall
f19a02264e Adding all the Angular filters required to make this work 2014-07-04 13:51:22 +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
f316b8dec5 Adding product modals in new format 2014-06-27 15:15:41 +10:00
Will Marshall
e8ba36041b Tests and patch for group filter 2014-06-27 15:01:12 +10:00
Rohan Mitchell
5a235be110 Fix regressed JS spec 2014-06-27 11:56:09 +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
Will Marshall
f8d51c3105 Fixing intermittent spec failure 2014-06-26 15:43:33 +10:00
Will Marshall
9eb43e6c09 Removing visible scopes from enteprise distributors and producers 2014-06-26 15:26:15 +10:00
Will Marshall
ed6bb2275a Fixing some regressions in tests, switching favicons 2014-06-26 15:04:32 +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
Will Marshall
9667b84c5c Finishing the transition to AMS from RABL 2014-06-26 11:07:53 +10:00
Will Marshall
4f3d468db6 Dereferencing groups and adding modals to page 2014-06-24 17:15:31 +10:00
Will Marshall
369761ccc5 Minor regression bug 2014-06-24 17:15:31 +10:00
Will Marshall
c09555e380 Tab fixes, new tests, reworking modals 2014-06-24 17:15:31 +10:00
Rob H
9099fca11c Merge branch 'bug-herd' into working 2014-06-23 22:01:41 +10:00
Rob H
51d3f65934 Remove spree's product tab for all but admin users 2014-06-23 22:01:19 +10:00
Will Marshall
21589fd5b0 Hack patching home page modals 2014-06-20 16:31:49 +10:00
Will Marshall
1ed634239d Major refactoring 2014-06-20 16:31:49 +10:00