raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,291 Commits 18 Branches 451 Tags
75a59eb5ccdf1be448dbebc86c2b2861baa687d0
Commit Graph

1377 Commits

Author SHA1 Message Date
Will Marshall
500e067cfb Performance enhancements 2014-07-11 16:14:44 +10:00
Will Marshall
7bd65d7854 Performance improvements 2014-07-11 15:09:44 +10:00
Will Marshall
c852eefdbc Re-enabling infinite scroll 2014-07-11 15:09:44 +10:00
summerscope
26d6ac5a8d Styling no results message for shopfront 2014-07-11 14:50:40 +10:00
summerscope
23182a9026 Grid system layout for filter buttons for all sizes and breakpoints 2014-07-11 13:10:22 +10:00
Will Marshall
190e320bad Pulling some structure out of directives 2014-07-11 12:45:08 +10:00
Will Marshall
fecc68cff8 Dereferencing product Taxons 2014-07-11 12:40:49 +10:00
Will Marshall
ef55bf97c6 Bunch of small fixes for Laura 2014-07-11 12:37:38 +10:00
summerscope
88b1b8b104 Styling search for shopfront page 2014-07-11 12:27:51 +10:00
Will Marshall
7dde721486 Adding taxon filtering 2014-07-10 15:26:35 +10:00
Will Marshall
932ca95ec5 Sorting hubs by active 2014-07-10 13:04:45 +10:00
summerscope
c8f51ec917 Adjust layout for small views 2014-07-10 12:21:32 +10:00
summerscope
76b25945e9 Adjust layout for small views 2014-07-10 12:21:18 +10:00
Will Marshall
8296a4131e Partializing filter controls 2014-07-10 12:07:21 +10:00
summerscope
3e24e43100 Tweak icons for up / down 2014-07-10 12:05:49 +10:00
Will Marshall
409d647f62 Fixing up hubs page 2014-07-10 11:38:17 +10:00
Will Marshall
0b3b8883cd Disabling infinite scrolling due to bugs on iPad 2014-07-10 11:38:16 +10:00
summerscope
c744c61f25 Styling for shopfront page with search input 2014-07-09 17:35:21 +10:00
summerscope
2c157a939d Tweak markup / filters available for Producers page 2014-07-09 17:24:24 +10:00
summerscope
864df41052 Add filters partial 2014-07-09 17:24:10 +10:00
summerscope
37924c652a Add filters partial for Hubs search 2014-07-09 17:23:30 +10:00
summerscope
eda5119bfc Remove unused styling and unneeded comments 2014-07-09 16:57:33 +10:00
summerscope
0451dbe6b0 More styling to filters and search 2014-07-09 16:55:05 +10:00
summerscope
9474ec49c6 Fix unbalanced brackets issue 2014-07-09 16:21:36 +10:00
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
263060611d Search and filter styling and markup tweaks 2014-07-09 16:13:43 +10:00
Will Marshall
c8ee4a594c Some text changes and similar magic 2014-07-09 16:10:08 +10:00
Will Marshall
242c03e753 Filter text logic 2014-07-09 16:03:20 +10:00
Will Marshall
6f3f40e2e6 Adding query string to search params 2014-07-09 15:45:05 +10:00
Will Marshall
95d519f0f1 No results option 2014-07-09 14:29:07 +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
0b27040dcb Taxon selection finesse 2014-07-09 10:53:52 +10:00
summerscope
a62410389e Producers index markup tweak for new sexy search 2014-07-04 17:38:04 +10:00
summerscope
b0a2dba5e1 Tweaks to markup for new big sexy search 2014-07-04 17:36:56 +10:00
summerscope
72203c0ad0 Refactoring home fat view to make CTA Button more intuitive 2014-07-04 17:34:51 +10:00
summerscope
56a1a66d3f Styling for big sexy search bar 2014-07-04 17:00:03 +10:00
summerscope
8186773adb Adjustments to filters markup 2014-07-04 15:49:23 +10:00
Will Marshall
eb8f59d65b Tests for the taxon filtering 2014-07-04 15:19:45 +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
61d8be3ddc Removing old file, renaming one to match naming conventions 2014-07-04 14:39:26 +10:00
Will Marshall
1f6641766d Restoring Producers page 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
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
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
summerscope
eed39fc971 Filters file in 2014-07-04 13:37:57 +10:00