3509 Commits

Author	SHA1	Message	Date
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
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
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
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
Maikel Linke	d93a8b6428	Enterprise and Group controllers use default country instead of default country id	2015-01-22 16:22:34 +11:00
Maikel Linke	87b092fdf7	Adding addresses to existing groups and make them changable	2015-01-22 12:10:54 +11:00
Maikel Linke	0d9a0919e5	show contact a group's contact footer	2015-01-21 16:39:41 +11:00
Maikel Linke	c1aa2f9b33	Display contact information in the front end	2015-01-21 16:12:28 +11:00
Maikel Linke	650e35c13e	Adding contact information to groups backend	2015-01-21 16:11:55 +11:00
Maikel Linke	71de15b3e4	Contact address for enterprise group	2015-01-21 12:32:07 +11:00
Maikel Linke	4dc0701213	Side menu for enterprise group page	2015-01-15 15:04:21 +11:00
Maikel Linke	3e5dfda324	Removing old link to enterprise groups from configuration menu	2015-01-15 10:53:11 +11:00
Maikel Linke	13cbbcef40	Admin Tab Menu: converting .rb to .html.haml.deface ... Plus a new menu item for enterprise groups.	2015-01-15 10:26:27 +11:00
Maikel Linke	02a276b9c9	Producer and hub lists with search ... Fixing map display as well.	2015-01-14 15:18:46 +11:00
Maikel Linke	9f1a773a58	MapController: copy default config instead of referencing ... Copying makes it possible to have multiple independent maps.	2015-01-14 14:34:31 +11:00
Maikel Linke	0e510998a4	Handling missing options in shipping filter call	2015-01-14 14:33:37 +11:00
Maikel Linke	3b9657eb17	show map of a group's enterprises	2015-01-07 12:00:55 +11:00
Maikel Linke	9956b967f0	Fixing link to group's page	2015-01-07 10:27:08 +11:00
Maikel Linke	9310bc902a	first draft of group page, a lot of TODOs	2015-01-06 22:39:15 +11:00
Maikel Linke	9798b05a24	TabsCtrl can show tabs that don't toggle ... toggle: tabs show on first click and hide on second click select: tabs show on every click, one tab is always active	2015-01-06 22:39:15 +11:00
Maikel Linke	586753015b	Reducing the groups page to a oneline list of groups	2015-01-06 22:39:15 +11:00
Rohan Mitchell	85882a73ff	Merge branch 'lin-d-hop-266reportsbranch'	2014-12-19 16:51:38 +11:00
Rob Harrington	6f95fa8546	Merge remote-tracking branch 'origin/shopfront-filters'	2014-12-19 15:40:01 +11:00
Rob Harrington	a810fc88ac	Dedicated new enterprise form	2014-12-19 14:05:24 +11:00
Rob Harrington	24cf3dee74	Hiding Shop Preferences in enterprise form	2014-12-19 14:05:24 +11:00
Rob Harrington	21e4f40616	Implementing primary taxon ordering on the shopfront	2014-12-19 14:05:23 +11:00
Rob Harrington	0fa289a443	Changing shopfront message into an alert box	2014-12-19 14:04:02 +11:00
Rob Harrington	fcb14f32d2	Validating user input for shopfront taxon order	2014-12-19 14:04:02 +11:00
Rob Harrington	f145a7ed65	Moving taxons into its own module, adding preferred shopfront taxon order to enterprise	2014-12-19 14:04:02 +11:00
Rob Harrington	a38e27e504	Adapting taxon autocompleter to allow multiple selection of taxons	2014-12-19 14:04:02 +11:00
Rob Harrington	4b353fa27b	Ammending comments to make slightly more clear	2014-12-19 14:04:01 +11:00
Rob Harrington	9f086facdb	Hiding link to shopfront for non-distributors	2014-12-19 14:04:01 +11:00
Rob Harrington	c5bf228cb9	Removing hashes from side menu links	2014-12-19 14:04:01 +11:00
Rob Harrington	b18163bfaf	Remove separate long description injection, use full enterprise serializer instead	2014-12-19 14:04:01 +11:00
Rob Harrington	3fa1832e7b	Adding shop closed message preference	2014-12-19 14:04:01 +11:00