Paul Mackay
6dd989484a
Switch to using the Spree GA tracker code
2016-05-10 05:32:40 +01:00
Maikel Linke
97bcbb81b9
Change text of register call in the dropdown
...
Unified code for the dropdown and the footer.
Both contain the register call and are both pointing to the register
path now. The footer still pointed to the global site before.
2016-04-01 14:39:43 +11:00
Maikel Linke
41970ecf07
Use auth directive for Login button
...
Use the auth directive instead of the AuthenticationCtrl for the Login
button in the menu and on checkout.
2016-03-18 17:08:32 +11:00
Maikel Linke
1770cbb6bf
Display footer_email in confirmation emails correctly
...
A bug introduced in a9c37c162e
2016-02-26 16:09:14 +11:00
Maikel Linke
0cb5dfbbe0
delete old sidebar partials
2016-02-19 16:29:19 +11:00
Maikel Linke
6ba534fb58
Show noticeboard in mobile menu
2016-02-19 15:16:24 +11:00
Maikel Linke
38cac3a3c4
Explicitly referencing main_app.discourse_login_path
...
Fixes #830 .
2016-02-19 11:23:38 +11:00
Maikel Linke
82182d24e7
Merge remote-tracking branch 'origin/master' into discourse-sso
2016-02-19 11:02:59 +11:00
Lynne Davis
2d620071f0
Fxing conflicts
2016-02-11 16:14:44 +00:00
Paul Mackay
50c657133a
Change "&" to "and"
...
There are very few places where ampersands are appropriate.
Minor typo in footer.
2016-02-09 10:01:51 +00:00
Maikel Linke
bd19bf5f3c
Refactoring filter selectors
...
The FilterSelectorsService is now able to create multiple independent
lists of selectors. These lists are explicitly given to the
filter-selector directive.
For example a group's page has one set for the group's producers and one
set for the group's shops.
2016-02-04 16:08:19 +11:00
Lynne Davis
c0afa6be49
Bug fix
2016-01-29 17:57:10 +00:00
Maikel Linke
d0cb9008a2
Delete unused shopfront haml
2016-01-29 16:09:34 +11:00
Lynne Davis
02616a8ac7
Updates based on testing on staging
2016-01-27 18:43:01 +00:00
Lynne Davis
a9c37c162e
Update email footer to use instance email and social media contacts
2016-01-26 13:14:29 +00:00
Maikel Linke
217fa9a57c
UI integration of Discourse login
2016-01-07 19:01:09 +11:00
Maikel Linke
229070a76b
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n
2015-11-13 15:20:58 +11:00
Maikel Linke
8bfe459241
i18n fixes of html display
2015-11-13 14:22:17 +11:00
Rohan Mitchell
bb6fb2f5e8
Merge branch 'sell-food-link' into combined/add-to-cart-speed_and_sell-food-link
2015-11-13 14:03:32 +11:00
Rohan Mitchell
6de44877c8
Update link for uber-style sell food dropdown
2015-11-13 14:03:14 +11:00
Rohan Mitchell
888e4d80ef
Add reliable way to check if cart is dirty. Previous way returned true when cart empty.
2015-11-13 14:03:07 +11:00
Maikel Linke
4eed222f18
Fixed several i18n issues reported by Myriam
2015-10-29 14:55:38 +11:00
Maikel Linke
0b4a43d77a
Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views
...
Conflicts:
app/views/shared/menu/_cart.html.haml
app/views/spree/order_mailer/confirm_email_for_shop.html.haml
2015-09-16 16:32:16 +10:00
Maikel Linke
e25805aa78
Restoring all changes of the last combined branch
...
This reverts commit 1e55e8a907
2015-09-10 15:03:13 +10:00
Maikel Linke
1e55e8a907
Reverting all changes of the last combined branch
...
The production server hangs on certain requests. To rule out a code bug,
we revert to the last deployed version.
2015-09-10 12:50:40 +10:00
Maikel Linke
2e3ff8f5c6
doubling cart buttons
2015-09-03 15:52:54 +10:00
Maikel Linke
85c99102dd
i18n: Replacing all language strings in app/view/
...
Languages strings were moved to config/locale/en.yml. All views contain
according calls to t() now.
2015-08-28 16:59:23 +10:00
Rohan Mitchell
ec908fce92
Make TOS URL configurable
2015-07-31 14:51:17 +10:00
Rohan Mitchell
5fd3dc1d28
Customise footer logo
2015-07-17 16:24:07 +10:00
Rohan Mitchell
74f90dada3
Allow overriding mobile logo (raster and SVG) and home hero image
2015-07-17 16:06:50 +10:00
Rohan Mitchell
1d67e3b2b8
Fix image update, display logo on frontend
2015-07-17 16:06:50 +10:00
Rohan Mitchell
4887871474
Remove SVG TODOs - we'll ask admins to upload double-sized images for retina instead
2015-07-17 16:06:49 +10:00
Rohan Mitchell
372b17703a
Remove unused content fields and partial
2015-07-17 16:06:49 +10:00
Rohan Mitchell
dcf98ee29f
Fix enterprises no results for producers
2015-07-10 17:45:16 +10:00
Rohan Mitchell
673635fdcb
Show no results message at correct times
2015-07-10 17:45:16 +10:00
Rohan Mitchell
744beaa26a
Perform shops search by proximity instead of plain string match
2015-07-10 17:45:15 +10:00
Rohan Mitchell
eef302635b
Fix alert overflow on mobile
2015-06-26 15:54:26 +10:00
Rohan Mitchell
c97ed026d0
Make room in menu for shopping@ text
2015-06-26 15:54:25 +10:00
Rohan Mitchell
4da367a94b
Put OFN logo in top bar of mobile site
2015-06-26 15:54:25 +10:00
Rohan Mitchell
fd41003fb7
Change all global links to www
2015-06-16 14:47:40 +10:00
Rohan Mitchell
846f4bb4b1
Tweak menu responsiveness: Fix items covering country name, fix ul.right dropping down to next line
2015-06-16 13:02:43 +10: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
f4e0baa56a
Basic click-to-close for sell-food alert
2015-06-10 19:03:40 +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
Continuous Integration
a1425c5e07
Auto-merge from CI [skip ci]
2015-06-04 07:22:43 +10:00
Rohan Mitchell
0569ef0505
Only record analytics in production. Also record them in admin backend.
2015-06-03 16:36:31 +10:00
Rohan Mitchell
50ae331d94
ng-cloak mobile menu
2015-05-29 16:03:16 +10:00
Rohan Mitchell
c75e14b383
Small edits
2015-05-29 09:55:40 +10:00
Rohan Mitchell
8a79741c0e
Update pricing tables and detail formatting
2015-05-28 14:58:46 +10:00
Continuous Integration
1d08ae89da
Auto-merge from CI [skip ci]
2015-05-28 14:31:25 +10:00
