Continuous Integration
7a7cd3a937
Merge remote-tracking branch 'origin/master' into HEAD
2016-12-21 14:16:08 +11:00
Matt-Yorkley
7531c8cbc9
Removed dashes
2016-12-19 11:10:12 +00:00
Continuous Integration
72cff0688a
Merge remote-tracking branch 'origin/master' into HEAD
2016-12-16 15:24:52 +11:00
Rohan Mitchell
9793450ed0
Make mobile menu mimic the large menu
2016-12-16 14:40:13 +11:00
Rohan Mitchell
c8f0502e71
Apply connect_learn_homepage feature toggle to mobile menu
2016-12-16 14:32:48 +11:00
Lynne Davis
cad3464f56
Adjusted BOM spec to reflect currency symbol changes
2016-12-09 11:40:55 +00:00
Rohan Mitchell
dabac50128
Replace Enterprise.distributing_product and Enterprise.distributing_any_product_of with Enterprise.distributing_products
2016-11-25 14:14:42 +11:00
Rohan Mitchell
f4f38b4183
Re-apply shop property filters - including performance regression
...
This reverts commit 7d149ed198
2016-11-25 14:14:42 +11:00
Maikel Linke
338d3cbc38
Delete old commented code
2016-11-25 10:27:13 +11:00
Continuous Integration
a115f2a268
Merge remote-tracking branch 'origin/master' into HEAD
2016-11-23 15:00:02 +11:00
Maikel Linke
c0c8b07add
Let shopping tabs listen to URL changes
...
When clicking on a shopping tab like "contact", it changed the URL. But
changing the URL did not change the tab. Listening to URL changes
enables manual manipulation of the URL and simple links to "#/contact"
to open the contact tab.
2016-11-11 17:11:39 +11:00
Rohan Mitchell
d574b8943b
WIP: Cherry-pick b2d82b6 - Using ofnSelect2 instead of plain select on BOM
2016-11-04 09:39:17 +11:00
Rohan Mitchell
3e565ad7cb
Mark admin enterprises form dirty when property removed
2016-11-04 09:39:17 +11:00
Rob Harrington
b59a1cc232
Using true/false instead of YES/NO for address defaults and billing same as shipping
2016-10-21 10:51:36 +11:00
Bing Xie
2f241485a2
Set default addresses for user or customer
2016-10-21 10:51:36 +11:00
Bing Xie
3e590f92ff
Set default billing address and shipping address
2016-10-21 10:51:36 +11:00
Bing Xie
a6cfa061e4
Fix ship_address_same_as_billing checkbox value with string
2016-10-21 10:51:36 +11:00
Maikel Linke
08b9b50f33
Re-phrase shop options
2016-10-07 13:17:28 +11:00
Maikel Linke
7c3968b64e
Hide guest checkout if deactivated
2016-10-05 15:41:09 +11:00
Maikel Linke
c59cd21698
Add option 'allow guest orders' to enterprise
...
An enterprise manager can choose to allow guest orders (default) or
require a valid login for checkout.
2016-10-05 14:04:08 +11:00
Maikel Linke
92694c729f
Move 'shopfront requires login' setting
...
Move 'shopfront requires login' setting to 'shop preferences' tab in
Profile Edit.
Solves issue #901 .
2016-10-05 14:04:08 +11:00
Maikel Linke
caeb8f08e7
Use link_to with mailto attribute to un-reverse email
2016-10-05 12:31:42 +11:00
Continuous Integration
815cf16822
Auto-merge from CI [skip ci]
2016-10-05 01:33:18 +11:00
Lynne Davis
79ea2fd39d
Reverse email address
2016-10-03 16:54:15 +01:00
Lynne Davis
40ca2ccee4
Updating TOS url in confirmation email to refer to content_config
2016-09-25 15:14:44 +01:00
Lynne Davis
84b4a9bcbe
update to internationalise email address in sell page
2016-09-25 14:00:11 +01:00
Rob Harrington
7d149ed198
Revert shop property filters - causing 10x slowdown
...
This commit reverts commits 7eeee78c4ee8f96e4818
2016-09-18 17:46:43 +10:00
Rohan Mitchell
3a2e0b7eff
Fix spacing
2016-09-16 11:36:26 +10:00
Rohan Mitchell
38c63fc88b
Available producer filters update when taxon filter changed
2016-09-16 11:36:26 +10:00
Rohan Mitchell
8ec2ebbf94
Swap to using multi-line selectors for property filters - z-index issues with single-line-selectors
2016-09-16 11:36:26 +10:00
Rohan Mitchell
8339d247f8
Shops on groups page filter by property
2016-09-16 11:36:26 +10:00
Rohan Mitchell
ed2522f6d2
Explicitly specify supplied or distributed properties for ng filters: properties, propertiesOf
2016-09-16 11:36:26 +10:00
Rohan Mitchell
63ef5de0e5
Use short syntax for render partial
2016-09-16 11:28:45 +10:00
Rohan Mitchell
38d5682762
Add property filters for shops
2016-09-16 11:28:45 +10:00
Rohan Mitchell
4c40219352
Move hubs partials from home to shops, their rightful home
2016-09-16 11:28:45 +10:00
Rohan Mitchell
7eeee78c4e
WIP: Move hubs partials from home to shops, their rightful home
2016-09-16 11:28:45 +10:00
Rob Harrington
261a574da9
Tweaking styling on enterprise change form, and dashboard header row
2016-09-07 11:13:48 +10:00
Rob Harrington
da55eb6d27
Form for changing enterprise type specifies trial length
2016-09-07 11:13:05 +10:00
Rob Harrington
be51a55f16
Only display shopfront trial message on dashboard page. Fixes #1120
2016-09-02 13:45:49 +10:00
Rohan Mitchell
58e0b95cf6
Show property badges on shops
2016-08-26 12:13:48 +10:00
Rohan Mitchell
7b5e8fa603
Rename API field properties to supplied_properties
2016-08-26 12:13:47 +10:00
Continuous Integration
88b9514090
Merge remote-tracking branch 'origin/master' into HEAD
2016-08-24 11:18:41 +10:00
Bing Xie
e5d7b545c9
I18n and refactoring
2016-08-24 10:43:50 +10:00
Maikel Linke
c4f81b019e
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into sign_up_email_i18n
2016-08-19 09:27:17 +10:00
Maikel Linke
c34e9c046b
Remove quotes around url
2016-08-17 16:44:27 +10:00
Bing Xie
81d9ec71d9
Front-end updating address function
2016-08-12 14:44:59 +10:00
Bing Xie
5b40c745f3
Add address serializer to customer serializer
2016-08-12 14:44:59 +10:00
Bing Xie
8234956a61
Inject available countries on admin customers page
2016-08-12 14:44:59 +10:00
Bing Xie
225bed9990
Add a simple edit address dialog
2016-08-12 14:44:59 +10:00
Bing Xie
7f203f5491
Show billing address and shipping address on customers index page
2016-08-12 14:44:59 +10:00
