summerscope
4cb0158b21
Add in link for Regional founders user types - to send back to global site
2015-05-02 18:23:42 +10:00
summerscope
53e2bc823d
WIP styling and content for homepage
...
> footer
> alert @ top
> call to action buttons
2015-05-01 18:19:51 +10:00
summerscope
d9fd0b284d
WIP on home panes and layout
2015-05-01 14:52:17 +10:00
summerscope
427f535026
Redesign big chunk of work:
...
> setting up pages for Shops, and shops signup, producers signup
> setting up routes for new pages
> changing fonts to Google Oswald & Roboto
> setting up homepage partials and removing partials no longer required
> changing menu links and labels
2015-04-30 18:20:17 +10:00
Rob Harrington
f13b52411d
Merge branch master into properties
2015-04-17 13:23:33 +10:00
Rohan Mitchell
48bf87ec73
Perpetually updating copyright year
2015-04-16 10:59:15 +10:00
Rob Harrington
d684a88697
Merge branch 'order-confirmation' into ready-to-merge
2015-03-13 18:11:53 +11:00
summerscope
864c9ec1da
This changes the user menu labels to show Account next to user email.
...
Small tweak to user account page to make it less awful.
2015-03-13 16:49:26 +11:00
Rohan Mitchell
efbf2c7ffa
Display extended variant name in quick cart
2015-03-13 12:58:53 +11:00
summerscope
75b0b290ae
More WIP trying to work on the cart template logic with Rohan
2015-03-10 14:12:43 +11:00
summerscope
c7cf9695bc
WIP on cart menu trying to add the master name back in where a product has variante
2015-03-10 11:35:35 +11:00
Rob Harrington
0a300d1802
Rewriting small cart, so that it doesn't break all of the dropdowns on the page (can't use .row within li elements it seems...)
2015-03-06 19:03:46 +11:00
Rob Harrington
3ec3441cfa
Replacing all uses of the old enterprise shop url helper
2015-01-22 10:19:43 +11:00
Rob Harrington
1d80bee595
Cart item total reflects total number of items in the cart
2015-01-16 16:06:51 +11:00
Rob Harrington
2c307f09c3
Changing edit cart button to link
2015-01-16 15:47:56 +11:00
summerscope
3bd77c74a5
Improve logic on shopping cart button to add meaningful labels for various states
2015-01-16 14:57:09 +11:00
summerscope
51687b5c2c
Tweak language and styling for the CTA buttons taking users to shopping cart and checkout pages
2015-01-16 13:27:16 +11:00
Rob Harrington
b3e67fa164
Take two on disabled logic
2015-01-15 17:34:04 +11:00
Rohan Mitchell
0431e0048c
Merge branch 'master' into variant-overrides-frontend
...
Conflicts:
app/controllers/shop_controller.rb
app/views/shop/products/_form.html.haml
spec/controllers/shop_controller_spec.rb
2015-01-12 16:48:51 +11:00
summerscope
e8c5af004f
Add another class so we can see which row is clear filters
2014-12-19 13:01:49 +11:00
summerscope
b55bced488
Put show hide animation back in for clear button
2014-12-19 12:53:48 +11:00
summerscope
08d37b955a
Refactoring filter feature for shopfront page - show by default, hide on click. WIP.
2014-12-19 12:22:04 +11:00
Rohan Mitchell
b0f5d0170c
Spec that overridden price with fees appears in quick cart
2014-12-18 13:32:28 +11:00
Rohan Mitchell
3358fb3d73
Name based on meaning instead of context
2014-12-03 09:39:36 +11:00
Paul Mackay
26bca0faf8
Localize more strings on home page.
2014-12-03 09:39:36 +11:00
Rob Harrington
15d157abc0
Stripping out inline styles from email templates
2014-11-20 15:42:03 +11:00
Rob Harrington
d182bb7bf7
Add signoff partial for mailer templates
2014-11-14 18:09:48 +11:00
Rob Harrington
27d1886d53
Fix mailto link
2014-11-14 17:58:13 +11:00
summerscope
2166fbc8a0
Tweak wording for kirsten
2014-11-07 13:56:07 +11:00
summerscope
9a2e510f2c
Add Producers register link to footer
2014-11-07 08:48:37 +11:00
Rob Harrington
70c4b7082d
Split ent confirmation email out into layout and partial
2014-11-06 21:19:21 +11:00
Rohan Mitchell
900a98b4bb
Display errors on checkout State field
2014-11-06 18:29:48 +11:00
Rohan Mitchell
98f434dad3
Merge branch 'i18n' of https://github.com/folklabs/openfoodnetwork into folklabs-i18n
2014-11-05 11:54:42 +11:00
Paul Mackay
543368169f
#254 : Localisation of home page and welcome email.
2014-10-31 06:59:43 +00:00
summerscope
799c894bd3
Tweak logo embedding to use new version, and use srcset with src as a fallback
2014-10-30 17:03:08 +11:00
Rafael Schouten
425105174e
return space remover
2014-10-16 16:26:50 +11:00
Rafael Schouten
881e82e825
add some angular documentation
2014-10-06 22:59:06 +11:00
Rafael Schouten
01063367c4
clickable show profiles label
2014-10-04 00:59:17 +10:00
summerscope
a6e8d6906f
Tweak message on profile label
2014-09-26 11:20:09 +10:00
Rob Harrington
33dff551c7
Removing 'show profiles' from producer and shop pages
2014-09-25 17:19:57 +10:00
Rafael Schouten
abc5a215a2
add map modals, profile filters and bugfixes
2014-09-19 17:07:07 +10:00
summerscope
24ca1b064a
Tweak language for help popover
2014-09-18 15:34:56 +10:00
summerscope
0b59ca2dc1
Turning Show Profiles checkbox back on ready for logic
2014-09-18 15:33:44 +10:00
Rafael Schouten
01c98bf6e4
refactor and bugfix for tests
2014-09-17 01:07:34 +10:00
Rafael Schouten
1aa80e53b1
Merge branch 'master' into currency
...
Conflicts:
app/helpers/injection_helper.rb
db/suburb_seeds.rb
2014-09-16 10:25:22 +10:00
summerscope
94165f17e4
Merging master into this branch to keep repository up to date
2014-09-11 16:33:44 +10:00
summerscope
24507c6c0a
turn off Profile filter again until ready to support this
2014-09-11 16:29:38 +10:00
summerscope
71918539b8
Undo changing name Hubs to Shops, for the moment
2014-09-11 15:40:35 +10:00
summerscope
997479f5be
Change label on mobile menu
2014-09-11 13:05:21 +10:00
Rafael Schouten
0fa4540cec
Merge branch 'master' into currency
2014-09-11 12:09:18 +10:00