7241 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rob Harrington	dcb24cf06c	Controller method to allow enterprise users to search for other users which share management of their enterprises	2015-02-12 11:34:58 +11:00
Rob Harrington	b73619d168	Adding known_users method to Spree::User	2015-02-12 11:34:58 +11:00
Rob Harrington	dde1a27d3a	Adding ability to search for known users	2015-02-12 11:34:57 +11:00
Maikel Linke	57e838898f	Update documentation of database setup ... db:setup is doing db:schema and db:seed already	2015-02-12 11:05:21 +11:00
Maikel Linke	773a5480e9	Activate search input for groups again	2015-02-12 10:44:20 +11:00
Maikel Linke	0fdf313424	Fixing img display of producers if no logo present	2015-02-12 10:31:13 +11:00
Rohan Mitchell	46aee6f77c	Upgrade Rails to 3.2.21	2015-02-11 14:30:49 +11:00
Rohan Mitchell	ca558a4ecc	Fix admin tab to check correct permission	2015-02-11 11:55:48 +11:00
Maikel Linke	edcef02017	link_to_service helper deals with nil	2015-02-07 19:40:59 +11:00
Maikel Linke	211e9c33a7	Fixing link to group website	2015-02-07 19:31:16 +11:00
Maikel Linke	2293623d2c	Display default group logo if no logo was uploaded	2015-02-07 19:24:36 +11:00
Maikel Linke	9e51b19f98	right mapping of contributer's names in git	2015-02-07 18:12:34 +11:00
summerscope	90ba1d2198	Updating the groups header to behave better with a square thumbnail logo image. ... Intention is for a square image constrained by PaperClip as per enterprise logos (later down the track)	2015-02-06 17:15:40 +11:00
summerscope	78877f591b	Fix template so website links work to push to external pages	2015-02-06 13:58:04 +11:00
summerscope	f292be8c92	Making styling of underlines for contact same color as HRs, bit lighter and brigher	2015-02-06 13:50:34 +11:00
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
Rohan Mitchell	a7bb04b890	Find all producers for which we can create variant overrides	2015-02-04 10:13:35 +11:00
Rohan Mitchell	4c586d1b7e	Fetching enterprises for which hubs can create variant overrides: allow all hubs that we can add to order cycle, find producers via create_variant_overrides permission	2015-02-04 10:04:57 +11:00
Rohan Mitchell	7ea143d19a	Provide AR relation instead of array in stub	2015-02-04 09:42:04 +11:00
Rohan Mitchell	25189d190b	Shift method	2015-02-04 09:30:01 +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
Rohan Mitchell	fafbfe8735	Simplify, simplify	2015-01-30 15:56:10 +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