EDUCATIC
/
h5p-php-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,118 Commits
28 Branches
133 Tags
3.5 MiB
Commit Graph

1118 Commits (wp-1.8.0)

Author SHA1 Message Date
thomasmars 47c35d5135 Merge branches 'master' and 'stable' of https://github.com/h5p/h5p-php-library 2016-12-06 11:35:24 +01:00
Pål Jørgensen c906cb7084 Merge pull request #33 from h5p/improved-message-for-library-in-smantics-no-valid 
Improved message presented to user
 2016-12-05 09:45:23 +01:00
thomasmars d100c5102a Merge branch 'release' into ignoreBuildFiles 2016-12-02 13:47:21 +01:00
Paal Joergensen 4d010ef38f Improved message presented to user 2016-12-01 11:34:28 +01:00
thomasmars 5ec651e696 Merge branch 'release' into ignoreBuildFiles 2016-11-30 13:24:33 +01:00
Paal Joergensen ed1fb00745 Merge branch 'release' into improved-file-handling 2016-11-30 11:19:08 +01:00
Pål Jørgensen ece72fcfbe Merge pull request #32 from h5p/semi-fullscreen-api-function 
Added semi fullscreen function
 2016-11-30 09:40:17 +01:00
Tom Arild Jakobsen 32d06356b1 Bump to version 1.11 
Relates to: #HFP-285
 2016-11-29 16:44:20 +01:00
Tom Arild Jakobsen 5494443533 validateGroup must handle isSubContent 
* Update validateGroup in h4p.classes.php to allow subContentId into the data
 * Fix h5p-content-upgrade-process.js to take into account isSubContent

Relates to: #HFP-285
 2016-11-29 15:44:32 +01:00
Tom Arild Jakobsen 0882879552 Allow subContentId in group validation. Relates to: #HFP-285 2016-11-28 14:55:57 +01:00
Tom Arild Jakobsen b4615e01b1 Allow subContentId in group validation. Relates to: #HFP-285 2016-11-28 14:54:33 +01:00
Tom Arild Jakobsen b55c1838a9 Update .gitignore 2016-11-23 14:21:28 +01:00
thomasmars 9b0d77a721 Check instanceof score as well to validate number. 
HFP-215
 2016-11-19 12:29:38 +01:00
thomasmars 3278535a04 Merge branch 'master' into ignoreBuildFiles 2016-11-17 13:28:17 +01:00
thomasmars f82f3a354c Removed debug 
HFP-86
 2016-11-17 13:27:41 +01:00
thomasmars 0d3648d601 Merge branch 'master' into ignoreBuildFiles 2016-11-17 12:57:58 +01:00
thomasmars d55134151c Moved registering of external dispatcher listener. 
- This will dispatch events that are dispatched inside the constructor of
  content types
HFP-86
 2016-11-17 12:56:15 +01:00
thomasmars 3e2266fe6c Merge branch 'master' into ignoreBuildFiles 2016-11-17 11:17:32 +01:00
thomasmars ec2ff180c1 Updated H5P font 
HFP-114
 2016-11-17 11:13:59 +01:00
thomasmars bb29d0c161 Merge branch 'master' into ignoreBuildFiles 2016-11-16 16:29:11 +01:00
Frode Petterson 44c0507887 Merge branch 'editor-redesign' 2016-11-16 16:12:40 +01:00
thomasmars 49e0ff09f4 Merge branch 'master' into ignoreBuildFiles 2016-11-16 14:41:46 +01:00
Paal Joergensen 6001b68b99 Making naming harder to misunderstand 2016-11-11 11:57:54 +01:00
Paal Joergensen 7e90871cb7 Fixing typo 2016-11-11 11:51:20 +01:00
Paal Joergensen 96f84a430a Added semi fullscreen function 2016-11-11 11:45:59 +01:00
Frode Petterson 1173341b76 Merge branch 'release' into improved-file-handling 2016-11-01 16:30:32 +01:00
thomasmars 426f51caa0 Check that score is a number before storing it to the database. 
HFP-173

(cherry picked from commit bae3145)
 2016-10-28 13:49:03 +02:00
thomasmars bae31451c0 Check that score is a number before storing it to the database. 
HFP-173
 2016-10-28 13:45:11 +02:00
thomasmars b4949c0d83 Don't store results if they have no score. 
HFP-173

(cherry picked from commit 516c70a)
 2016-10-28 10:46:40 +02:00
thomasmars 516c70add5 Don't store results if they have no score. 
HFP-173
 2016-10-28 10:46:05 +02:00
Frode Petterson 08a1cece26 Merge branch 'master' into improved-file-handling 2016-10-27 11:20:18 +02:00
thomasmars 0474ed89af Merge branch 'master' into ignoreBuildFiles 2016-10-21 09:55:08 +02:00
thomasmars f28036ca0e Bumped core API version because of API changes in editor 2016-10-21 09:53:59 +02:00
Frode Petterson bf554b8ee2 Updated composer config 2016-10-07 13:39:51 +02:00
Frode Petterson c9e5680e85 Merge branch 'master' into improved-file-handling 2016-10-03 15:12:32 +02:00
Frode Petterson e4266efb22 Added framework method to clear dirsize cache 
HFP-23
 2016-09-30 13:41:50 +02:00
Frode Petterson 0a9aa5a783 Merge pull request #28 from limikael/master 
don't fail silently in createExportFile
 2016-09-30 11:31:17 +02:00
Håkon Ellingsen a2097d56cb HVP-73: Update font with new icons 2016-09-27 08:12:46 +02:00
Mikael Lindqvist ce796cf0cf don't fail silently in createExportFile 2016-09-26 12:05:02 +02:00
thomasmars cee88a544f Made it possible to ignore build files when exporting development folders. 2016-09-23 15:47:38 +02:00
Frode Petterson 1c5b9707e5 Regenerate export if missing on view 
Thanks to paravibe on Drupal.org for contributing.
 2016-09-23 10:52:40 +02:00
Frode Petterson 263a987eeb Added document root when creating zip 
Thanks to paravibe on Drupal.org for contributing.
 2016-09-23 10:31:55 +02:00
Frode Petterson 6b6d4cd109 Merge branch 'improved-file-handling' of github.com:h5p/h5p-php-library into improved-file-handling 2016-09-23 10:14:28 +02:00
Frode Petterson f0e7ea1283 Merge branch 'moodle-rc3' into improved-file-handling 2016-09-23 10:14:19 +02:00
thomasmars 7d86a6235b Merge branch 'release' of https://github.com/h5p/h5p-php-library into moodle-rc3 2016-09-21 14:34:24 +02:00
Thomas 218e48ee91 Merge pull request #25 from h5p/release 
Merge 'release' into 'improved-file-handling'
 2016-09-21 13:42:06 +02:00
Paal Joergensen 5f38e2b7f8 Bumped core because of bugfix for optional selects [HFJ-2183] 2016-09-21 13:22:35 +02:00
Frode Petterson fd34af6964 Use content array instead of just id 
Makes it easier when additional properties are needed.
Also, don't try to translate PHP exception messages.
h5p/h5p-moodle-plugin#112
 2016-09-14 10:44:10 +02:00
Frode Petterson c88c049438 Check if contents is set before using 
h5p/h5p-moodle-plugin#112
 2016-09-09 09:19:55 +02:00
Frode Petterson e8f90c9116 Allow overriding of content URLs 
h5p/h5p-moodle-plugin#112
 2016-09-08 16:34:53 +02:00