Merge branch 'master' into improved-file-handling

JI-92-path-fix
Frode Petterson 2016-10-27 11:20:18 +02:00
commit 08a1cece26
3 changed files with 31 additions and 5 deletions

2
.gitignore vendored
View File

@ -1 +1,3 @@
vendor
*~ *~

View File

@ -1,10 +1,34 @@
{ {
"name": "h5p/h5p-php-library", "name": "h5p/h5p-core",
"type": "library",
"description": "H5P Core functionality in PHP",
"keywords": ["h5p","hvp","interactive","content","quiz"],
"homepage": "https://h5p.org",
"license": "GPL-3.0", "license": "GPL-3.0",
"authors": [
{
"name": "Svein-Tore Griff With",
"email": "with@joubel.com",
"homepage": "http://joubel.com",
"role": "CEO"
},
{
"name": "Frode Petterson",
"email": "frode.petterson@joubel.com",
"homepage": "http://joubel.com",
"role": "Developer"
}
],
"require": {
"php": ">=5.3.0"
},
"autoload": { "autoload": {
"files": [ "files": [
"h5p-development.class.php", "h5p.classes.php",
"h5p.classes.php" "h5p-development.class.php",
"h5p-file-storage.interface.php",
"h5p-default-storage.class.php",
"h5p-event-base.class.php"
] ]
} }
} }

View File

@ -1676,7 +1676,7 @@ class H5PCore {
public static $coreApi = array( public static $coreApi = array(
'majorVersion' => 1, 'majorVersion' => 1,
'minorVersion' => 9 'minorVersion' => 10
); );
public static $styles = array( public static $styles = array(
'styles/h5p.css', 'styles/h5p.css',