Rohan Mitchell
faee88c404
Merge branch 'master' into redesign
2015-06-16 16:57:09 +10:00
Rohan Mitchell
bf2a7f12e0
Fix interaction between alert and mobile menu. A bit hack-ish, needs some more love.
2015-06-16 16:28:45 +10:00
Continuous Integration
c76021462c
Auto-merge from CI [skip ci]
2015-06-16 14:12:16 +10:00
Rob Harrington
0e96a23a52
Fixing filters selector directive to that an allSelector watcher isn't required for generation on selectors to work
2015-06-15 12:06:23 +08:00
Rohan Mitchell
662330b222
Alert appears at top of page. It slides in on page load and slides out on close.
2015-06-11 12:10:50 +10:00
Rohan Mitchell
610a4c03fe
Merge branch 'master' into redesign
...
Conflicts:
app/controllers/home_controller.rb
app/views/producers/index.html.haml
app/views/shared/menu/_mobile_menu.html.haml
app/views/shop/products/_form.html.haml
config/routes.rb
spec/controllers/shops_controller_spec.rb
2015-06-10 18:27:50 +10:00
Rohan Mitchell
80834a0c27
Merge branch 'master' into ginerr_bugfixes
2015-06-05 15:49:43 +10:00
Rohan Mitchell
8afffdae9a
Fix error when product does not have a master variant
2015-06-03 12:13:42 +10:00
Rohan Mitchell
6f513fee77
Merge branch 'master' into redesign
2015-05-29 15:20:21 +10:00
Continuous Integration
1d08ae89da
Auto-merge from CI [skip ci]
2015-05-28 14:31:25 +10:00
Maikel Linke
bf9addfa42
Merge branch 'group-custom-url' into group-pages
2015-05-28 13:27:48 +10:00
Maikel Linke
fa87c53777
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into group-pages
2015-05-20 10:22:28 +10:00
Rick Giner
62ae38372e
#541 add "show more" link to producers lists in hub on home page
2015-05-11 20:31:24 +10:00
Rick Giner
b7c1a43125
Issue #540 Fix up hub list navigation
2015-05-10 18:13:30 +10:00
Rick Giner
98c1a95bd1
Issue #531 remove Google map road markers
2015-05-10 16:51:56 +10:00
Rick Giner
9c3ec950fc
Revert "ginerr_#531_remove Google map road markers"
...
This reverts commit 3e2117134f
2015-05-10 16:50:58 +10:00
Rick Giner
3e2117134f
ginerr_#531_remove Google map road markers
2015-05-10 16:50:00 +10:00
Rohan Mitchell
e662aab004
Brand story can be expanded and contracted
2015-05-06 14:54:16 +10:00
Rob Harrington
b1b1bfd8f6
Resolve conflict for overflow dropdown between multiple single-line-selectors on the one page
2015-04-24 16:05:39 +10:00
Rob Harrington
7b83438b5e
Pulling property values into the shopfront
2015-04-23 13:51:49 +10:00
Rob Harrington
e6a98747b4
correction in read only logic for filter selectors
2015-04-23 13:32:56 +10:00
Rob Harrington
3df2720b31
Making filter selectors more flexible, allowing no active-selectors to be passed in, ie. read-only
2015-04-23 12:31:06 +10:00
Maikel Linke
893b743973
tidy (rm comment)
2015-04-17 17:00:18 +10:00
Maikel Linke
03fd148f41
showing profile modals on groups/hubs
2015-04-17 16:58:49 +10:00
Rob Harrington
c43eb9ef72
Merge branch 'email_user' into properties
2015-04-17 15:17:37 +10:00
Rob Harrington
32f14bca00
Preventing fitting of selectors when there are none
2015-04-17 15:10:41 +10:00
Rob Harrington
6d96a7a60b
Specifiy that allSelectors attribute on filterSelectors directive is optional
2015-04-17 14:43:09 +10:00
Rob Harrington
f13b52411d
Merge branch master into properties
2015-04-17 13:23:33 +10:00
Rob Harrington
524f02717b
Don't redirect to root when closing login window on checkout page
2015-04-17 10:25:38 +10:00
Maikel Linke
2fd25f6cc4
Injecting all enterprises into group page
...
The enterprises have related producers and hubs that need to be
dereferenced. Therefore, we need a bigger set of enterprises to be
loaded. Injecting all enterprises is simple and doesn't require changes
if the set of needed enterprise data is growing in future.
2015-04-10 17:42:54 +10:00
Rohan Mitchell
d471368412
Spacing
2015-03-27 13:09:25 +11:00
Rob Harrington
2b32252aff
Filtering between selector lists
2015-03-15 13:25:04 +11:00
Rob Harrington
29c9f70a1c
Rename single line selectors
2015-03-15 12:29:05 +11:00
Rob Harrington
2c1ef4c8c1
Refactoring single line selectors to remove flicker
2015-03-15 12:27:40 +11:00
summerscope
d0f66a6053
Fixing label for cart popover to make it write name of product variant without page load
2015-03-13 18:10:59 +11:00
Rob Harrington
dd8c769ea9
Hiding fee breakdown on cart page for now
2015-03-13 16:50:57 +11:00
summerscope
dc1dd2e243
Changing the class .filter-box for shopfront to .filter-shopfront
...
This prevents the issue with inheritance / styling crossover
2015-03-13 16:06:46 +11:00
Rohan Mitchell
efbf2c7ffa
Display extended variant name in quick cart
2015-03-13 12:58:53 +11:00
Rob Harrington
12c6878cbe
Using vanilla foundation
2015-03-06 19:02:15 +11:00
Rob Harrington
578475a403
Filter products list on shop by active properties
2015-03-06 16:14:11 +11:00
Rob Harrington
06f10398da
Adding product property filter to shop page
2015-03-06 11:22:52 +11:00
Rob Harrington
55b8918ea1
Updating comment
2015-03-05 18:38:01 +11:00
Rob Harrington
c992937608
Moving taxon-selector directive to correct location
2015-03-05 18:28:49 +11:00
Rob Harrington
cb623b75c1
Generalising taxons-selector -> filter-selector
2015-03-05 18:15:14 +11:00
Rob Harrington
e7854bcd8e
Moving single line selectors to template, making sure other users of taxons-selector still work
2015-03-05 16:38:21 +11:00
Rob Harrington
24b40182b5
clearAll for product page also clears any text search filter
2015-03-05 15:34:27 +11:00
Rob Harrington
ed94cf57d3
Adding the 'more' box for single-line-selectors
2015-03-05 15:10:42 +11:00
Rob Harrington
5bddada013
Removing unnecessary setter
2015-03-05 12:18:34 +11:00
Rob Harrington
4afef8215a
Basic implementation of single line selectors
2015-03-05 12:12:36 +11:00
Maikel Linke
3beff77164
Merge remote-tracking branch 'origin/master' into group-pages
2015-02-26 17:22:13 +11:00
