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

3248 Commits

This Branch
This Branch
All Branches
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
55bd23f02b Merge branch 'laura_and_will' 2014-07-10 14:18:32 +10:00
Will Marshall
932ca95ec5 Sorting hubs by active 2014-07-10 13:04:45 +10:00
summerscope
6681beae4d Fix spacing for shopfront page search box 2014-07-10 13:04:20 +10:00
Will Marshall
31cf01ba1b Sorting hubs by active 2014-07-10 12:59:59 +10:00
summerscope
0e0cf5576d Restyle big search to make it MORE OBVIOUS. 2014-07-10 12:58:38 +10:00
summerscope
9fa62b39af More styling for filters and search 2014-07-10 12:22:08 +10:00
summerscope
34cb672a8d Adjust column layouts / responsive breakpoints for filter systems 2014-07-10 12:21:54 +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
cf4c51e0d9 STyling taxon filters 2014-07-10 12:05:50 +10:00
summerscope
3e24e43100 Tweak icons for up / down 2014-07-10 12:05:49 +10:00
Will Marshall
da02f9c0b0 Adding icons to shipping selectors 2014-07-10 12:02:34 +10:00
Will Marshall
9d519f5f4b Fixing a minor test regression 2014-07-10 11:52:32 +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
7c1dfa7b23 Add min width to filter button 2014-07-10 10:36:56 +10:00
summerscope
c744c61f25 Styling for shopfront page with search input 2014-07-09 17:35:21 +10:00
summerscope
ac8d3f8c96 Make a static (non animated) version of big input 2014-07-09 17:35:04 +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
11ec596133 Layout adjust for taxon filters 2014-07-09 17:23:58 +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
b43f687cf4 Tweak to producers - turn filters off by default 2014-07-09 16:54:35 +10:00
summerscope
d9a3d22330 Tweak labels for filter button 2014-07-09 16:53:26 +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
a4729a8d12 Tweak layout on taxon filters 2014-07-09 16:15:27 +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
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
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
Will Marshall
0b27040dcb Taxon selection finesse 2014-07-09 10:53:52 +10:00
summerscope
730fbc5e94 New texture for hubs background 2014-07-04 17:41:42 +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
ac5c8ccfd4 Modal styling for active table removing background 2014-07-04 17:34:26 +10:00
summerscope
9ed0ebaa43 Hubs styling for bit sexy search 2014-07-04 17:33:02 +10:00
summerscope
5d2d4fd007 More styling adjustments for big sexy search 2014-07-04 17:32:43 +10:00
Rohan Mitchell
ba964d54d9 Update spree and spree_auth_devise 2014-07-04 17:07:58 +10:00