raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-04-02 06:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,378 Commits 18 Branches 460 Tags
84346c7fbdf83dd67c4fdd0d13bd4aade51f2e69
Commit Graph

92 Commits

Author SHA1 Message Date
Will Marshall
f9a4718bdd Reworking the homepage styles to work on mobile as well as screen 2013-11-06 14:14:55 +11:00
Will Marshall
7d21dd053a Merging 2013-11-01 16:50:28 +11:00
Will Marshall
8f27c7be80 Fixing a clearing bug on the home page 2013-11-01 16:49:28 +11:00
Rohan Mitchell
25b0306a93 Ensure css is precompiled, reformat configs 2013-11-01 16:22:54 +11:00
Rohan Mitchell
eb997c94a2 Mark inactive distributors on supplier distributors list 2013-10-31 14:59:47 +11:00
Rohan Mitchell
758676c1ea When visiting supplier page without selecting a distributor, provide choice of distributors that distribute their products 2013-10-31 14:49:26 +11:00
Rohan Mitchell
32889715f0 Grey out hubs that have no products available for distribution and are not in an order cycle 2013-10-30 16:09:18 +11:00
Rohan Mitchell
647e1d196c Position enterprise groups 2013-10-30 14:46:49 +11:00
Rohan Mitchell
2fe23c53ed Rename region to group 2013-10-30 13:57:33 +11:00
Rohan Mitchell
cbdd8a0091 Fix enterprise admin form style, which was being clobbered by CMS styles 2013-10-30 09:56:44 +11:00
Rohan Mitchell
39c60a84d6 Rename files from OFW to OFN convention 2013-10-18 17:15:21 +11:00
Rohan Mitchell
767478a0ee Add link to change hub 2013-09-23 09:17:17 +10:00
Rohan Mitchell
9811851e29 Comment out order cycles debug styling that breaks tests 2013-09-20 13:08:54 +10:00
Rohan Mitchell
00fe10e847 Reposition order cycle admin debug info 2013-09-20 09:29:26 +10:00
David Cook
e4127358c3 Rearrange admin payment methods table (BH#73) 2013-09-19 12:12:50 +10:00
Rohan Mitchell
dc9206ccf6 Re-arrange top nav area 2013-09-18 16:27:18 +10:00
Rohan Mitchell
315876ca9d Don't display bullets next to variant options 2013-09-10 11:52:04 +10:00
Rohan Mitchell
64a3a309f5 Change 'pick-up date' to 'available on', provide absolute dates in options 2013-09-10 09:16:23 +10:00
alexs333
999bc2697a Implemented simlified shop flow. 2013-09-04 20:33:18 +10:00
alexs
8b4c0682fb Replaced eaterprises logo with the distributor name header. 2013-08-21 16:05:06 +10:00
alexs
f160e051e5 Added new temporary landing page. 2013-08-19 17:37:22 +10:00
Rohan Mitchell
19e7537b64 Style order cycle fees 2013-08-16 10:36:41 +10:00
alexs
0705c7af36 Added vertical separators for search results. 2013-08-15 11:37:50 +10:00
alexs
0c8779041f Slightly increase the top bar height. 2013-08-15 11:35:24 +10:00
alexs
bdc8387346 Added base for shop front (enterprise). 2013-08-14 17:31:25 +10:00
alexs
51c898625e Fixed link colors on map view. 2013-08-14 10:36:04 +10:00
alexs
e1a876a4b5 Added default minimum height for text areas. 2013-08-13 15:19:03 +10:00
alexs
7206bf6393 Re-adjusted vertical positioning of the landing page. 2013-08-13 11:49:04 +10:00
alexs
215d6030d7 Added link to 'About OFN' page (as well as the base for that page). 2013-08-13 11:36:24 +10:00
alexs
f2f507c5c7 Suburb auto-complete functionality for the new landing page. 2013-08-12 17:34:56 +10:00
alexs
71262d3cb3 Base for enterprise search via suburb selector.. 2013-08-11 16:57:00 +10:00
alexs
d3ab78e2c6 Assets for gmap4rails gem. 2013-08-09 13:20:49 +10:00
alexs
b5cc2ab4cf Added postcode search that redirect to page with map view. 2013-08-09 13:20:22 +10:00
alexs
8efc95e095 Separated Foundation powered site from the Spree powered content (for now). 2013-08-07 19:25:48 +10:00
alexs
38b0a581e0 New landing page - initial layout and functionality 2013-08-05 17:04:56 +10:00
Rohan Mitchell
4a893fd548 Style 2013-07-30 13:49:38 +10:00
Andrew Spinks
d107786614 Make sure the payment details are shown prominently in the checkout screen. 2013-07-29 16:29:27 +10:00
Rohan Mitchell
7640eb497a Merge branch 'supplied-active-products-on-hand' 
Conflicts:
	app/controllers/application_controller.rb
	app/models/enterprise.rb
	app/views/spree/products/_source_sidebar.html.haml
	spec/features/consumer/distributors_spec.rb
	spec/models/enterprises_spec.rb
 2013-07-29 11:05:42 +10:00
Rohan Mitchell
dd97768947 Merge branch 'move-save-checkout-button' 
Conflicts:
	spec/features/consumer/checkout_spec.rb
 2013-07-23 17:03:00 +10:00
Rohan Mitchell
638d7b1c33 Stylistic changes, extract commented code to private method 2013-07-23 17:02:06 +10:00
Andrew Spinks
7cb054f430 Merge branch 'master' into order-cycle-selection 
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/spree/orders_controller_decorator.rb
	app/models/enterprise.rb
	app/models/spree/order_decorator.rb
	app/views/spree/checkout/_other_available_distributors.html.erb
	app/views/spree/products/_add_to_cart.html.haml
	lib/open_food_web/distributor_change_validator.rb
	spec/spec_helper.rb
 2013-07-23 14:42:57 +10:00
Rohan Mitchell
fe61cddda6 Merge branch 'local-organics' 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/store/variables.css.scss
	app/overrides/add_feedback_script.rb
	app/views/spree/shared/_order_details_steps_data.html.erb
	db/schema.rb
	script/rails
	spec/spec_helper.rb
 2013-07-23 11:40:03 +10:00
Rob H
f055ece503 WIP (Spree Update): update variables.css.scss 2013-07-23 10:43:08 +10:00
Rob H
23a56ff4f1 BPUR: toggle visbility of columns 2013-07-23 10:37:51 +10:00
Rob H
f750251cb8 BPUR: Visually differentiate products and variants in table 2013-07-23 10:37:51 +10:00
Rob H
b775145b16 BPUR: Add ability to filter by search and toggle variants 2013-07-23 10:37:50 +10:00
David Cook
15c454a0f1 move style to stylesheet 2013-07-19 17:04:04 +10:00
David Cook
a63b8908bb Moved inline style to stylesheet 2013-06-21 16:12:56 +10:00
Rohan Mitchell
54fe63e7f3 User can add subsequent order cycles product to cart, show order cycle selection in page header along with distributor 2013-05-28 16:20:58 +10:00
Rohan Mitchell
3b2508dad3 On local organics checkout, remove distributor change, move save button to top right 2013-05-20 15:29:13 +10:00