Commit Graph

9 Commits

Author SHA1 Message Date
summerscope
15cde6c372 Merge branch 'laura_and_will' into icon_font
Conflicts:
	app/views/groups/index.html.haml
	app/views/modals/_producers.html.haml
2014-05-30 12:12:07 +10:00
Will Marshall
d5a652182e Scrolling to groups when hotlinked 2014-05-29 16:31:12 +10:00
summerscope
81f51e734c Add groups icon to listings on page 2014-05-29 11:07:43 +10:00
Will Marshall
98b4fe27f6 Hiding group logo if not present 2014-05-28 16:12:13 +10:00
Will Marshall
9bb059493e Fixing the image render 2014-05-28 16:03:42 +10:00
summerscope
2130470eaf Styling for groups page 2014-05-27 17:11:42 +10:00
Will Marshall
e7f6a9badf Adding data to groups page 2014-05-20 12:18:28 +10:00
Will Marshall
0958602418 Starting on migrations and admin forms 2014-05-20 12:18:27 +10:00
Will Marshall
eab9c28d2e Adding groups to this branch, also tidying up the shop stuff for Laura 2014-05-16 14:00:33 +10:00