raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-02 02:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 17 Branches 455 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

4351 Commits

Author SHA1 Message Date
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
summerscope
698d1d2637 Add space to force line-height trigger on active table skinny view - producers page 2014-07-04 11:33:05 +10:00
summerscope
ae8ae1fe41 Fix styling on hubs list to make accordion icons sit vertically aligned 2014-07-03 15:10:07 +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
434e087a73 Merge branch 'master' into laura_and_will 2014-07-02 11:30:43 +10:00
summerscope
9791374204 Add partial to producers index page 2014-06-27 17:27:46 +10:00
summerscope
9f71ccc3c0 Filters partial for search field 2014-06-27 17:26:52 +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
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
aa5767cd30 Remove paypal image button from checkout, fix redirect to paypal 2014-06-27 11:52:36 +10:00
Rob H
083fda0ad0 Set columns on BPE error messages 2014-06-27 10:46:54 +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
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
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
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