Download as
Browse Code »

Commit ec0966c835eb62f746f10b4e23815fc7de4db01f

Authored by libras
2 parents de3f4c58 4cffb404
Exists in master and in 1 other branch devel

Merge branch 'master' of git.lavid.ufpb.br:vlibras-web

Showing 3 changed files with 6 additions and 4 deletions   Show diff stats
app/assets/javascripts/site/videos.js
  Diff comments   View file @ec0966c
@@ -8,7 +8,7 @@ function check_subtitle(file) { @@ -8,7 +8,7 @@ function check_subtitle(file) {
8 }; 8 };
9 9
10 function check_video(file) { 10 function check_video(file) {
11 - var accepted_file_types = ["ts", "avi", "mp4", "mov", "webm", "wmv", "mkv",]; 11 + var accepted_file_types = ["flv", "ts", "avi", "mp4", "mov", "webm", "wmv", "mkv",];
12 return check_type(file, accepted_file_types) 12 return check_type(file, accepted_file_types)
13 }; 13 };
14 14
app/controllers/static_controller.rb
  Diff comments   View file @ec0966c
1 # Author - Igor Portela - igorportela.com | Copyright(c) 2013. All rights reserved. 1 # Author - Igor Portela - igorportela.com | Copyright(c) 2013. All rights reserved.
2 class StaticController < ApplicationController 2 class StaticController < ApplicationController
3 - #before_filter :authenticate_user! 3 + before_filter :authenticate_user!
4 4
5 def choice 5 def choice
6 end 6 end
@@ -9,7 +9,7 @@ class StaticController &lt; ApplicationController @@ -9,7 +9,7 @@ class StaticController &lt; ApplicationController
9 end 9 end
10 10
11 def upload 11 def upload
12 - @presenter = Static::IndexPresenter.new if authenticate_user! 12 + @presenter = Static::IndexPresenter.new #if authenticate_user!
13 13
14 end 14 end
15 15
@@ -25,6 +25,8 @@ class StaticController &lt; ApplicationController @@ -25,6 +25,8 @@ class StaticController &lt; ApplicationController
25 @presenter = Static::IndexPresenter.new(params[:id]) 25 @presenter = Static::IndexPresenter.new(params[:id])
26 if !@presenter.subtitle.window_size.present? 26 if !@presenter.subtitle.window_size.present?
27 27
  28 + #raise current_user.inspect
  29 +
28 @presenter.subtitle.update_attributes(:window_size => params[:window_size], :window_position => params[:window_position], :closed_caption => params[:closed_caption], :user_id => current_user.id) 30 @presenter.subtitle.update_attributes(:window_size => params[:window_size], :window_position => params[:window_position], :closed_caption => params[:closed_caption], :user_id => current_user.id)
29 end 31 end
30 32
config/initializers/devise.rb
  Diff comments   View file @ec0966c
@@ -116,7 +116,7 @@ Devise.setup do |config| @@ -116,7 +116,7 @@ Devise.setup do |config|
116 # ==> Configuration for :timeoutable 116 # ==> Configuration for :timeoutable
117 # The time you want to timeout the user session without activity. After this 117 # The time you want to timeout the user session without activity. After this
118 # time the user will be asked for credentials again. Default is 30 minutes. 118 # time the user will be asked for credentials again. Default is 30 minutes.
119 - # config.timeout_in = 30.minutes 119 + config.timeout_in = 2.weeks
120 120
121 # ==> Configuration for :lockable 121 # ==> Configuration for :lockable
122 # Defines which strategy will be used to lock an account. 122 # Defines which strategy will be used to lock an account.