raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,219 Commits 18 Branches 452 Tags
9587b2a2edef544ef1dc86085aef69c3dfd24d66
Commit Graph

3219 Commits

This Branch
This Branch
All Branches
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
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
summerscope
56a1a66d3f Styling for big sexy search bar 2014-07-04 17:00:03 +10:00
summerscope
b50541fd15 Less padding below search bar 2014-07-04 15:50:00 +10:00
summerscope
8186773adb Adjustments to filters markup 2014-07-04 15:49:23 +10:00
summerscope
7f00f66e82 Styling for filter systems against search 2014-07-04 15:47:51 +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
f8572db683 Install and configure dalli for staging and production environments 2014-07-04 14:39:27 +10:00
Rohan Mitchell
8b67fc4d61 Make DSM timestamp columns NOT NULL 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
Rohan Mitchell
da4a00c720 Remove ruby- prefix from .ruby-version, turn off Travis email notifications 2014-07-04 14:39:27 +10:00
Rohan Mitchell
8f6a2575b7 Minor code formatting changes 2014-07-04 14:39:26 +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
0177a56408 Caching address and touching enterprise on save 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
74f29f8c74 Tweaking spec names 2014-07-04 14:39:26 +10:00
Will Marshall
1f6641766d Restoring Producers page 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
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
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
8b439c4e69 Temporary/demonstration caching behaviour, INCOMPLETE 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