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,219 Commits 21 Branches 450 Tags
9587b2a2edef544ef1dc86085aef69c3dfd24d66
Commit Graph

646 Commits

Author SHA1 Message Date
summerscope
9587b2a2ed Merge branch 'laura_and_will' of github.com:openfoodfoundation/openfoodnetwork into laura_and_will 
Conflicts:
	app/views/producers/_filters.html.haml
 2014-07-09 16:18:41 +10:00
summerscope
a4729a8d12 Tweak layout on taxon filters 2014-07-09 16:15:27 +10:00
Will Marshall
c8ee4a594c Some text changes and similar magic 2014-07-09 16:10:08 +10:00
Will Marshall
6f3f40e2e6 Adding query string to search params 2014-07-09 15:45:05 +10:00
Will Marshall
eb9ec1497c Backwards 2014-07-09 14:26:42 +10:00
Will Marshall
fb8d7907f9 Rearchitecting the thing 2014-07-09 14:07:38 +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
7d39c30dbd Fixing a taxon bug 2014-07-09 10:54:40 +10:00
Will Marshall
0b27040dcb Taxon selection finesse 2014-07-09 10:53:52 +10:00
Will Marshall
eb8f59d65b Tests for the taxon filtering 2014-07-04 15:19:45 +10:00
Rohan Mitchell
30262e1969 Clean up specs, fix broken spec, remove JS log 2014-07-04 14:39:27 +10:00
Will Marshall
6d4dfad336 OK address no longer being lazy-loaded 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
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
Will Marshall
a8fde53715 Removing old file, renaming one to match naming conventions 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
Rob H
29fde37ba3 Merge branch 'bug-herd' into working 2014-07-03 14:24:39 +10:00
summerscope
0301a97bfe Merge branch 'master' into laura_and_will 2014-07-02 14:45:11 +10:00
summerscope
75f3358e2a Adding CTA button for crowdfunding site to homepage & countdown timer directive 2014-07-02 14:44:46 +10:00
Will Marshall
106c9f63bb Adding animation hooks for Laura 2014-07-02 11:33:38 +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
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
Rohan Mitchell
4075854440 Navigation.go supports full URLs 2014-06-27 11:51:53 +10:00
Rob H
934f960336 Add display as to new product page 2014-06-26 15:27:24 +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
Will Marshall
a49fe2bf65 Fixing a regression bug 2014-06-25 16:30:23 +10:00
Will Marshall
2c6e239962 Adding some basic animations, upgrading Angular Foundation 2014-06-25 13:59:22 +10:00
Will Marshall
5f242f9232 Fixing groups page anchor scrolling 2014-06-25 10:46:32 +10:00
Will Marshall
4f3d468db6 Dereferencing groups and adding modals to page 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
Will Marshall
b3f0cb1e74 Bunch of minor bugfixes 2014-06-24 17:14:01 +10:00
Will Marshall
3fc337299b Adding ponies and filtering 2014-06-20 17:14:05 +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
Will Marshall
ba842be5b8 Loading enterprises per-view again 2014-06-20 12:03:51 +10:00
Will Marshall
17521516b4 Patching up some regressions with the tabs 2014-06-20 11:33:30 +10:00
summerscope
a362c2591f Remove parentheses from address on button 2014-06-20 10:42:52 +10:00
summerscope
e4f4db82da Tweak markup for producer modal 2014-06-20 09:58:49 +10:00
summerscope
6d20b16c3c Tweak markup for map modal 2014-06-20 09:58:32 +10:00