9694 Commits

Author	SHA1	Message	Date
summerscope	755adf4287	Index page stop-gap improvements until we get more variables to display in this list. Commented out search field not working	2015-02-06 13:41:58 +11:00
summerscope	9547f91f46	Groups page rejig the layout to make contact column skinnier in most use cases. Obscure email and website with CTA words for fixed width on content. Styling for anchor fix global issue	2015-02-06 13:31:33 +11:00
Maikel Linke	30601b9203	tidy up group contact with helpers	2015-02-05 20:20:28 +11:00
Maikel Linke	504a053693	link_to_ext helper for group pages	2015-02-05 17:21:41 +11:00
summerscope	148333467f	Groups styling and markup - finishing up contact info partial etc	2015-02-05 17:14:56 +11:00
Maikel Linke	242fb49276	checking for undefined phone number in model	2015-02-05 16:17:29 +11:00
Maikel Linke	37dbd376e9	fixing indent	2015-02-05 15:54:53 +11:00
Maikel Linke	b641de6ec9	Merge branch 'group-pages' of github.com:openfoodfoundation/openfoodnetwork into group-pages ... Conflicts: app/views/groups/show.html.haml	2015-02-05 15:52:00 +11:00
Maikel Linke	313843d798	moving contact partial and giving example code	2015-02-05 15:50:33 +11:00
summerscope	1b51ea0e3a	Groups logo default image	2015-02-05 15:42:24 +11:00
summerscope	f2e3d298fa	More styling for responsive sizes groups header	2015-02-05 15:17:50 +11:00
summerscope	e19aaf6be8	Styling tabs for responsive design, improving groups page layout	2015-02-05 14:53:09 +11:00
summerscope	28b2dd40dd	Kill the pad top for Producers tab content too	2015-02-05 12:31:38 +11:00
summerscope	c9bbe80738	Remove padding class to producers tab content	2015-02-05 12:28:24 +11:00
Maikel Linke	0f7b880409	restoring groups hubs tab	2015-02-05 12:23:08 +11:00
Maikel Linke	78a8f8c1bb	Merge remote-tracking branch 'origin/group-pages' into group-pages	2015-02-05 12:07:52 +11:00
summerscope	b1b1aa5b1e	Groups page WIP with mikael and rob	2015-02-05 12:07:11 +11:00
Maikel Linke	a7c2a73fa8	make groups editable by group owners	2015-02-05 12:05:39 +11:00
Rohan Mitchell	fce7714994	Load correct set of variant override producers, use variant_override_enterprises_per_hub, tighten specs	2015-02-04 11:20:08 +11:00
Rohan Mitchell	7ca9670073	Admin can access variant override only when it can add hub to order cycle and it can create variant overrides for the producer of the variant	2015-02-04 11:09:48 +11:00
Rohan Mitchell	22f6ece83f	When fetching products for variant overrides admin, fetch all overridable products	2015-02-04 10:16:34 +11:00
Maikel Linke	91b35d068c	Adding owner to groups ... Groups have owners and users own groups. The owners are displayed and changable on the group's page by admin users.	2015-02-02 15:58:34 +11:00
Maikel Linke	8d9f8beff3	creating facebook url	2015-02-02 10:33:13 +11:00
Rohan Mitchell	c0a7d22a50	Add permitted_by scope to EnterpriseRelationship	2015-01-30 16:36:45 +11:00
summerscope	6fddb491db	New partial for groups contact	2015-01-30 14:07:55 +11:00
summerscope	5ea3733c8a	Groups page styling WIP	2015-01-30 14:07:38 +11:00
Rohan Mitchell	7ac888ae00	Admin can grant create_variant_overrides permission	2015-01-30 11:56:05 +11:00
Rohan Mitchell	ed4d78bca8	Decorators can't be in same file name as original file, otherwise the original file is ignored	2015-01-30 11:23:49 +11:00
summerscope	d99a54accf	WIP groups individual page template markup - still needs alot of love.	2015-01-29 17:43:36 +11:00
summerscope	fd363ff6c2	WIP Groups individual page styling	2015-01-29 17:43:10 +11:00
summerscope	fcd9653a79	Add padding to groups homepage	2015-01-29 15:52:40 +11:00
summerscope	8e42f29bde	WIP groups page styling and markup updates	2015-01-29 15:52:20 +11:00
Rohan Mitchell	a25bf32156	Show extended variant name/unit info for admin variant overrides	2015-01-29 15:15:28 +11:00
Rohan Mitchell	7a5c56cbca	Do not show out of stock lines on order confirmation page	2015-01-29 13:19:04 +11:00
Rob Harrington	fd9f65f1b6	Merge branch 'shopfront-filters' into shop-url	2015-01-28 10:57:11 +11:00
Rob Harrington	713999c1d8	Merge branch 'master' into shop-url	2015-01-28 10:53:42 +11:00
Rob Harrington	adbe127e76	Revert "Update bindonce" ... This reverts commit 48dc85cfc2.	2015-01-25 14:08:29 +11:00
Lynne Davis	3c4ad4121f	LD adding whitespace to get my master version back in line with origin	2015-01-22 14:00:48 +00:00
Lynne Davis	8e8f38e484	app/controllers/spree/admin/reports_controller_decorator.rb	2015-01-22 12:01:20 +00:00
Maikel Linke	d93a8b6428	Enterprise and Group controllers use default country instead of default country id	2015-01-22 16:22:34 +11:00
Rob Harrington	b429be707c	Split out payment and shipping methods from admin enterprises controller as services	2015-01-22 12:19:41 +11:00
Maikel Linke	87b092fdf7	Adding addresses to existing groups and make them changable	2015-01-22 12:10:54 +11:00
Rob Harrington	d12fdd23fb	Fixing navcheck callback	2015-01-22 10:46:01 +11:00
Rob Harrington	0791cc3c2a	Making sure that we have a .path() in HashNavigation	2015-01-22 10:19:47 +11:00
Rob Harrington	76acbb6159	Empty arrays are no longer considered falsy by angular.js parser (see bdfc9c02d0)	2015-01-22 10:19:47 +11:00
Rob Harrington	d7ea81e821	Prevent default form action from submitting ordercycle forms	2015-01-22 10:19:47 +11:00
Rob Harrington	9245af6a8f	Producer properties routes use enterprise permalink	2015-01-22 10:19:47 +11:00
Rob Harrington	36430d3bad	Enterprise permalink generator handles blank permalink case	2015-01-22 10:19:46 +11:00
Rob Harrington	6991e5e6b1	Finally got all callbacks available to all action that need them	2015-01-22 10:19:46 +11:00
Rob Harrington	4d26b3d648	Make unused cart_controller happy	2015-01-22 10:19:45 +11:00