raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-15 23:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,460 Commits 17 Branches 453 Tags
c59cd21698a413a547d3723dd72a047ca3d273f0
Commit Graph

2875 Commits

Author SHA1 Message Date
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 7eeee78c4e to e8f96e4818 (inclusive)
 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
Bing Xie
add39f7401 Enterprise user can update customer's name 2016-08-12 14:44:59 +10:00
Rob Harrington
47df8d6d8e Refactoring AngularJS Shop Variant filtering logic for improved speed 2016-08-10 12:08:03 +10:00
Rob Harrington
b957555c82 Adding infinite-scroll to the shopfront 
For performance improvement with large data sets
 2016-08-10 12:08:03 +10:00
Rohan Mitchell
1f5da8699d Build plz 2016-08-05 15:58:00 +10:00
Rohan Mitchell
fcd422c6ce Fix path helper fail in footer 2016-08-05 15:18:29 +10:00
Rohan Mitchell
5eecdb8c9c Update footer: Link to sell instead of individual register links 2016-08-05 15:03:07 +10:00
Rohan Mitchell
3b0084025a Add copy for home page learn and connect panes 2016-08-05 15:02:44 +10:00
Rohan Mitchell
8f4cbf1d9f Update page alert label and background colour 2016-08-05 15:02:10 +10:00
Rohan Mitchell
0dba54a4b8 Update page alert text 2016-08-05 14:43:44 +10:00
Rohan Mitchell
61c9355ffb Fill in sell page copy 2016-08-05 14:40:42 +10:00
Rohan Mitchell
0830a5bd85 Add basic sell page 
Conflicts:
	config/routes.rb
 2016-08-05 12:33:09 +10:00
Rohan Mitchell
0076b1b9a0 Add connect and learn panes to home page 2016-08-03 16:07:15 +10:00
Rohan Mitchell
d3ab9faede Show registration CTA in footer rather than connect and learn CTA 2016-08-03 16:07:15 +10:00
Rohan Mitchell
ee2c1ef195 Extract home page tagline to partial 2016-08-03 16:07:15 +10:00
Rohan Mitchell
57a2f1b339 Simplify, simplify 2016-08-03 16:07:15 +10:00
Rohan Mitchell
1216da38d1 Update menu: [Groups, About] -> [Connect, Learn] 2016-08-03 16:07:15 +10:00
Rohan Mitchell
5b43d7a87a Add connect and learn links to page alert 2016-08-03 16:07:15 +10:00
Rohan Mitchell
e966b474b4 Remove order cycles feature toggle 2016-08-03 16:07:11 +10:00
Rohan Mitchell
d9d3a4a645 Set up producer filters on group producers page 2016-07-29 11:01:52 +10:00