Stella Rouzi
|
d75ddcf5f3
|
Merge pull request #262 from differentreality/final_user_model
User/Person models merge
|
2014-06-30 20:08:30 +03:00 |
|
Stella Rouzi
|
a87018192a
|
style fixes
|
2014-06-30 15:46:52 +03:00 |
|
Stella Rouzi
|
fc753282d3
|
hound fixes
|
2014-06-30 15:46:51 +03:00 |
|
Stella Rouzi
|
e8990bfb12
|
fix biography field as text, not string
|
2014-06-30 15:46:51 +03:00 |
|
Stella Rouzi
|
9292b79c78
|
houndci fixes
|
2014-06-30 15:46:51 +03:00 |
|
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 |
|
James Mason
|
a513307ff3
|
Merge pull request #270 from gopesht/splash_themes
Splash themes
|
2014-06-26 11:08:59 -07: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
|
6712f582c3
|
Integrate font awesome
|
2014-06-26 21:28:06 +05:30 |
|
Gopesh Tulsyan
|
0a01c0c031
|
Merge pull request #269 from gopesht/implement_smoothscroll
Implements smoothscroll
|
2014-06-26 21:21:35 +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 |
|
Christian Bruckmayer
|
fd95570c02
|
Merge pull request #266 from ChrisBr/implements_ahoy
Implements targets and campaigns for conference
|
2014-06-26 13:21:04 +02:00 |
|
Chrisbr
|
857ac43e74
|
Implements targets and campaigns for conference
|
2014-06-26 09:08:26 +02:00 |
|
Christian Bruckmayer
|
678fe38a25
|
Merge pull request #267 from ChrisBr/bugfix_top_submitter
[Bugfix] conference top submitter now ordered by submissions
|
2014-06-25 14:16:10 +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
|
be1e3293de
|
assign values to necessary Rails.application.secrets variables
|
2014-06-21 07:42:02 +03:00 |
|
Gopesh Tulsyan
|
c06b2a31ab
|
Merge pull request #260 from gopesht/add_banner_to_splash
Add banner to splash
|
2014-06-20 22:58:30 +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 |
|
Stella Rouzi
|
9eeb60b5cd
|
Documentation about using OpenID
|
2014-06-20 15:26:15 +03:00 |
|
Gopesh Tulsyan
|
0ec673b582
|
Merge pull request #220 from gopesht/adds_carousel_dashboard
Adds admin component for conference photos
|
2014-06-19 23:18:25 +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
|
983c08c8e4
|
Merge pull request #219 from gopesht/carousel_model
Added Photo model
|
2014-06-19 21:27:18 +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 |
|
James Mason
|
0f697f3dbe
|
Update awesome_nested_set
The stable release of awesome_nested_set isn't compatible with Rails 4.1;
running in production mode errors out at init.
Issue 253 suggests resolving with 3.0.0 RC
https://github.com/collectiveidea/awesome_nested_set/issues/253
Conflicts:
Gemfile.lock
|
2014-06-19 08:07:30 -07:00 |
|