Added cameo delete functionality, need to be verified
added enable disable option to the cameos
Change in friend request at notifications
Merge branch 'minor_changes' into from_june_12
Merged divyas changes and for protected cameo contribution added error msg
schema is modified
IE7 fixes and friend duplication
Review the cameos
Merge branch 'development' of https://github.com/dputtannaiah/rvidi into development
Change in display preference
custom filename for video name is done
Updated cameos to save in kaltura server and added class method to add cameos from console or from rake task as well
association between user and cameos is established
Added css to how it works for ie7
file is modified
Merge remote-tracking branch 'origin/development' into from_june_12
Merge remote-tracking branch 'origin/development' into video-recording
Merged development into record_video branch
Revert back to kaltura.com for Video uploading
Merge branch 'development' into record_video