4 commits

Author	SHA1	Message	Date
Gopesh Tulsyan	abfb0884a1	Added registration segment to display description, period ... Controller test for Conference#show houndci fixes Rebased with single entry for navigation branding Conditional rendering of splash navbar	2014-05-30 00:30:09 +05:30
Gopesh Tulsyan	b3d719829e	Added description to conference and program segment to splash ... removed id from program partial	2014-05-29 23:57:35 +05:30
Chrisbr	dc080705ae	Adds color attribute to conference	2014-05-28 13:40:58 +02:00
Chrisbr	ab4d3021a2	Moves conference show #action to #edit action	2014-05-23 13:01:23 +02:00