13 commits

Author	SHA1	Message	Date
Gopesh Tulsyan	e1b7067fd9	Adds make_conference_public field to conference model	2014-06-19 21:03:57 +05:30
Gopesh Tulsyan	ad9c0d1012	Adds splash component checkboxes to admin dashboard	2014-06-17 22:42:15 +05:30
Gopesh Tulsyan	f9c4ff1d08	Changed description in lodgings controller and conference#edit	2014-06-16 22:59:21 +05:30
Gopesh Tulsyan	feabc3b954	Adds lodging description to conference	2014-06-16 22:56:12 +05:30
James Mason	3b6fec9cfb	Merge pull request #226 from gopesht/fix_social_media ... Fixed description for social media	2014-06-12 13:41:00 -07:00
Gopesh Tulsyan	2c27119e8e	Added sponsor description and email to conference	2014-06-13 01:34:17 +05:30
Gopesh Tulsyan	6d2576421b	Add social url to conference	2014-06-13 00:28:01 +05:30
Gopesh Tulsyan	6193b623e6	Fixed description for social media	2014-06-12 23:29:34 +05:30
Gopesh Tulsyan	e2fd1bbd69	Add tickets to registration segment	2014-05-30 00:31:12 +05:30
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