Commit graph

58 commits

Author SHA1 Message Date
Gopesh Tulsyan
8efcd69f3d Added hints to description fields to use markdown syntax, rendered all description fields in the splash as markdown 2014-07-02 23:23:19 +05:30
Gopesh Tulsyan
74535b4bd8 Adds instagram fontawesome icon to splash and reverting the description for slideshare & speakerdeck to have media ids instead of link
Adds test for instagram url to conference show
2014-07-01 21:25:22 +05:30
Gopesh Tulsyan
6ae845143e Adds instagram url to conference 2014-07-01 21:17:27 +05:30
Stella Rouzi
23bf55b66c User/Person models merge 2014-06-30 15:46:06 +03:00
Chrisbr
857ac43e74 Implements targets and campaigns for conference 2014-06-26 09:08:26 +02:00
Gopesh Tulsyan
524f22835d Adds include_banner_in_splash to settings dashboard 2014-06-20 21:51:48 +05:30
Gopesh Tulsyan
095aa2b020 Adds banner photo to settings 2014-06-20 21:50:48 +05:30
Gopesh Tulsyan
8e6e708813 Adds admin components for conference photos 2014-06-19 22:56:32 +05:30
Gopesh Tulsyan
291a61bc8d Adds splash check to todo list
Adds specs for make_conference_public
2014-06-19 21:03:57 +05:30
Gopesh Tulsyan
e1b7067fd9 Adds make_conference_public field to conference model 2014-06-19 21:03:57 +05:30
Artem Chernikov
8803384d2f Merge pull request #229 from differentreality/create_conf_indicator
remove readonly option for start_date and end_date of conference
2014-06-19 14:04:04 +02:00
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
Chrisbr
4abd5d2185 Implements instance dashboard 2014-06-16 13:51:43 +02:00
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
Stella Rouzi
72a077e260 remove readonly option for start_date and end_date of conference so that the on-screen indication of missing fields will work 2014-06-12 21:16:08 +03:00
Gopesh Tulsyan
6193b623e6 Fixed description for social media 2014-06-12 23:29:34 +05:30
Chrisbr
b25ae50908 Implements user and event state distribution 2014-06-11 09:31:13 +02:00
Chrisbr
e5b588df81 Refactoring event states 2014-06-06 10:23:01 +02:00
Chrisbr
28293cb4c4 Implements recent items tabs and top submitter for dashboard 2014-06-04 16:11:33 +02:00
Chrisbr
65a73f876a Implements todo list for instance dashboard 2014-06-03 16:27:10 +02:00
Chrisbr
dd22ce3608 Implements active user and submissions for global dashboard 2014-06-02 14:57:53 +02:00
Chrisbr
b645b1a4ff Implements registrations and last login information for dashboard 2014-06-02 14:22:51 +02:00
Christian Bruckmayer
fa129de063 Merge pull request #173 from ChrisBr/new_dashboard
Implements event submissions over time chart
2014-05-30 10:23:23 +02:00
Chrisbr
40c61ed717 Implements event submissions over time chart 2014-05-30 10:10:47 +02:00
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
Chrisbr
89fb059aaa New admin menu 2014-05-22 18:19:07 +02:00
Gopesh Tulsyan
d1e9bd06a6 View specs, added factories, fixed bugs 2014-05-21 16:20:02 +05:30
Chrisbr
27f35a49c6 Fix create conference form
- adds HTML 5 validations
2014-05-12 14:38:55 +02:00
Chrisbr
b095064108 Fix eventtypes form 2014-04-30 10:47:33 +02:00
Chrisbr
169fab5c31 Fixes cfp form 2014-04-28 20:52:02 +02:00
Chrisbr
ba2051afc7 Fixes email settings form 2014-04-28 20:31:44 +02:00
Chrisbr
229581efc3 Fixes eventtype form 2014-04-28 20:08:06 +02:00
Chrisbr
c67b255e05 Fixes tracks form 2014-04-28 20:01:20 +02:00
Chrisbr
c4fbf8d038 Fixes rooms form 2014-04-28 19:58:49 +02:00
Henne Vogelsang
2e9b92c3af Initial Rails4 Port 2014-04-23 15:45:55 +02:00
Henne Vogelsang
633fff59d8 Add conference wide media, fix proposal#show view 2014-04-14 16:25:17 +02:00
Henne Vogelsang
587126218d Update gems, use d3 gem, initial bootstrap v3 port 2014-03-17 16:42:19 +01:00
Henne Vogelsang
0982be8579 Simplify sidebar and navigation
Check existence of supporter levels
2014-03-04 10:10:07 +01:00
Henne Vogelsang
14a896842b Merge branch 'final_volunteers' of https://github.com/differentreality/osem into differentreality-final_volunteers
Conflicts:
	app/models/conference.rb
	app/models/registration.rb
	app/views/admin/conference/_sidebar.html.haml
	app/views/conference_registration/register.html.haml
2014-03-03 10:52:24 +01:00
Henne Vogelsang
243ea41456 Merge branch 'final_questions' of https://github.com/differentreality/osem into differentreality-final_questions
Conflicts:
	app/models/conference.rb
	config/routes.rb
2014-03-03 10:43:38 +01:00
Stella
5b35e25ecd Add difficulty levels 2014-02-23 16:09:09 +02:00
Stella
3105c8da5d question builder 2014-02-09 18:05:57 +02:00