Commit graph

491 commits

Author SHA1 Message Date
Stella Rouzi
23bf55b66c User/Person models merge 2014-06-30 15:46:06 +03:00
Christian Bruckmayer
66b84e3660 Merge pull request #268 from ChrisBr/bugfix_db_week
[Bugfix] Conference methods related to weeks now database independent
2014-06-30 13:38:54 +02:00
Gopesh Tulsyan
3eb0ecf994 Enhance text on location banner
Fix failing test and css fixes
2014-06-26 23:01:54 +05:30
Gopesh Tulsyan
0386a54ad3 Replaced Social icons with fontawesome icons except for speakerdeck and slideshare, css changes for other components 2014-06-26 21:28:45 +05:30
Gopesh Tulsyan
5e8239fe2b Minor edit to fonts 2014-06-26 21:28:45 +05:30
Gopesh Tulsyan
4ca7217c70 Program and Cfp theme 2014-06-26 21:28:44 +05:30
Gopesh Tulsyan
2c4101ab45 Theme intrgration initiated by Onassis theme of Blacktie.co
Banner Component designed
2014-06-26 21:28:06 +05:30
Gopesh Tulsyan
9c69abe950 Implements smoothscroll 2014-06-26 20:39:46 +05:30
Gopesh Tulsyan
f7a12c977b Merge pull request #261 from gopesht/fix_align_bugs
Splash Page bug fixes
2014-06-26 20:37:44 +05:30
Gopesh Tulsyan
f6da596cc9 Count down timer alignment 2014-06-26 20:19:08 +05:30
Chrisbr
596027e49b [Bugfix] Conference methods related to weeks now database independent 2014-06-26 13:28:48 +02:00
Chrisbr
857ac43e74 Implements targets and campaigns for conference 2014-06-26 09:08:26 +02:00
Chrisbr
1bb46874ac [Bugfix] conference top submitter now ordered by submissions 2014-06-25 13:20:05 +02:00
Gopesh Tulsyan
1e9b416e2b Fix banner view 2014-06-25 15:37:32 +05:30
Gopesh Tulsyan
ee4208fa1e Fix call for papers button alignment 2014-06-25 15:24:07 +05:30
Christian Bruckmayer
5e43af350f Merge pull request #246 from ChrisBr/bugfix_admin_menu
Adds missing glyphicon and chevron to admin menu
2014-06-24 10:11:25 +02:00
Artem Chernikov
b1094342b5 Merge pull request #259 from differentreality/openid_documentation
Documentation about using OpenID
2014-06-24 09:59:49 +02:00
Gopesh Tulsyan
351f0d891f Fixed alignment of lodgings containers based on count 2014-06-23 21:41:41 +05:30
Gopesh Tulsyan
2f66500351 Fix sponsor images alignment based on count 2014-06-23 14:47:45 +05:30
Stella Rouzi
043ba75e81 Only show OpenID links if their keys have been set. 2014-06-20 20:13:56 +03:00
Gopesh Tulsyan
38abcd8902 Fix styling and layouts in splash view 2014-06-20 22:41:18 +05:30
Gopesh Tulsyan
cc8299294d Splash view for banner component 2014-06-20 21:53:04 +05:30
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
e731a6b58f Adds migration for banner photo 2014-06-20 21:50:48 +05:30
James Mason
89df9a41d3 Merge pull request #258 from gopesht/change_splash_layout
Changed splash layout
2014-06-20 09:17:05 -07:00
Gopesh Tulsyan
23ad35caea Changed splash layout
Changed view spec to render with content_for
2014-06-20 20:31:20 +05:30
Gopesh Tulsyan
8e6e708813 Adds admin components for conference photos 2014-06-19 22:56:32 +05:30
Gopesh Tulsyan
8ebf9de76c Merge pull request #255 from gopesht/adds_checks_to_splash
Adds checks to splash view
2014-06-19 22:44:59 +05:30
James Mason
47777dbb4c Merge pull request #247 from gopesht/add_splash_dashboard
Adds Splash Checkbox in Conference Settings
2014-06-19 10:08:22 -07:00
Gopesh Tulsyan
2b94ba0281 Adds routing error check in conference#show
Adds make_conference_public to conference factory

Added test
2014-06-19 22:17:32 +05:30
Gopesh Tulsyan
69ddea47dd Added photo model 2014-06-19 21:09:15 +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
20f31621ee Merge pull request #242 from differentreality/refactor_events_states
change paths after refactoring of event states
2014-06-19 16:25:34 +02:00
Stella Rouzi
0c698bac10 Merge pull request #253 from differentreality/final_openid
Authenticate via openid
2014-06-19 15:53:56 +03:00
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
Stella Rouzi
883d94889e styling fixes 2014-06-19 14:03:49 +03:00
Stella Rouzi
29953a71eb Make links partial haml not erb 2014-06-19 13:42:39 +03:00
Stella Rouzi
0beed70d7f some houndci fixes 2014-06-19 12:58:05 +03:00
Stella Rouzi
de58ddde50 openid fixes 2014-06-19 12:58:05 +03:00
Stella Rouzi
600adde6ba implement openID authentication 2014-06-19 12:58:05 +03:00
Gopesh Tulsyan
a1aba60966 Adds checks to splash view 2014-06-18 22:28:00 +05:30
Stella Rouzi
43c11133e4 houndci fixes 2014-06-18 19:14:55 +03:00
Stella Rouzi
cda2a0a1ae fix trailing space, add missing end 2014-06-18 17:40:25 +03:00
Stella Rouzi
9fba9eedc7 hound fixes 2014-06-18 17:40:16 +03:00
Stella Rouzi
37ec4ce746 fix admin schedule routing 2014-06-18 17:40:03 +03:00
Gopesh Tulsyan
a2a9e739f9 Merge pull request #250 from gopesht/adds_checkboxes_for_splash_components
Adds migrations for checkboxes of splash components
2014-06-17 23:20:14 +05:30
Gopesh Tulsyan
ad9c0d1012 Adds splash component checkboxes to admin dashboard 2014-06-17 22:42:15 +05:30
Gopesh Tulsyan
6c5e04f513 Adds migrations for checkboxes of splash components 2014-06-17 20:29:26 +05:30