Issue #150 Add basic video model
Issue #151 Add video controller with basic views
Merge branch 'C3_hussien_151_Upload_videos_to_database' into C3_hussien_157_Play_uploaded_videos_online
Issue #157 upload video with carrierwave on mp4 form
Issue #157 Delete uploaded local files
Issue #157 Modify in uploader class
Issue #157 Create_video_uploader_and viewer
Merge branch 'development' into C3_hussien_157_Play_uploaded_videos_online
ay7aga
testing

nch 'migrations' into C3_S17_As_a_child_I_can_show_an_event_page

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
ed
adding files
Issue #157 fix documentation
Issue #157 fix routes
Merge branch 'migrations' of https://github.com/yousraHazem/Topsoft-14 into C3_hussien_157_Play_uploaded_videos_online

merge migrations
Issue #157 fix validations
Issue #157 fix doc
Merge branch 'C3_hussien_157_Play_uploaded_videos_online' of https://github.com/yousraHazem/Topsoft-14 into C3_hussien_157_Play_uploaded_videos_online

fixing Validations
Merge branch 'authentication_fix' of https://github.com/yousraHazem/Topsoft-14 into migrations
fix conf