Merge branch 'redesign2017' of /f/gitRepositories/judo into redesign2018
This commit is contained in:
2
homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
Normal file → Executable file
2
homepage/redesign2018/markdownExperiment/src/galleryHelper/getVideoDurationJson.py
Normal file → Executable file
@@ -34,7 +34,7 @@ def probe(vid_file_path):
|
||||
|
||||
pipe = sp.Popen(command, stdout=sp.PIPE, stderr=sp.STDOUT)
|
||||
out, err = pipe.communicate()
|
||||
return json.loads(out)
|
||||
return json.loads(out.decode('utf-8'))
|
||||
|
||||
|
||||
def duration(vid_file_path):
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?php
|
||||
$basePath = "/users/cwsvjudo/www";
|
||||
include_once("config.inc.php");
|
||||
|
||||
$basePath = "/users/cwsvjudo/www";
|
||||
|
||||
require_once($basePath."/config/cwsvJudo.config.php");
|
||||
|
||||
|
||||
0
homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
Normal file → Executable file
0
homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
Normal file → Executable file
Reference in New Issue
Block a user