Commit Graph

1499 Commits (eeefc1228b4294d75288be341e5dea97a10927cb)

Author SHA1 Message Date
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
Mannes 52723ad933 Check for file exists before adding to zip. Adding a non existent file to ZipArchive can lead to archive not being created 2016-10-05 17:14:48 +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
Frode Petterson 2896c9fdab Revert "Added content ID to export handlers"
This reverts commit 7fca1d100d.

Holding off on the exports for now
2016-09-08 14:48:08 +02:00
Frode Petterson 7fca1d100d Added content ID to export handlers
This is to enable for proper access control.
h5p/h5p-moodle-plugin#112
2016-09-08 13:32:57 +02:00
Paal Joergensen 5b8836b5be Making select beeing able to be optional 2016-08-29 15:54:48 +02:00
Frode Petterson d946f32b81 Merge branch 'master' into improved-file-handling 2016-08-02 13:37:26 +02:00
Frode Petterson 888a46844b Bumped core version 2016-08-02 12:57:43 +02:00
Frode Petterson 832aebf5e0 Moved regexp from editor to core
HFJ-2099
2016-07-29 14:15:00 +02:00
Frode Petterson 1ef52dfafe Merge branch 'release' of github.com:h5p/h5p-php-library into release 2016-07-29 13:47:17 +02:00
Frode Petterson 44633fc1db Updated regexp to support existing content to new content copy
HFJ-2099
2016-07-29 13:46:14 +02:00
Frode Petterson 8b31f88ca8 Increase performance by removing unused code 2016-07-27 16:17:58 +02:00
Frode Petterson 9f7b545f02 Added lost part of old fix
HVP-212
2016-07-15 16:14:32 +02:00
Svein-Tore Griff With 43748bc4b8 Add documentation regarding stylePatterns 2016-07-15 15:33:11 +02:00
Frode Petterson 61219a7d84 Merge branch 'master' into improved-file-handling 2016-07-14 10:29:30 +02:00
Frode Petterson 3d14588160 Bugfix: Check if library json is valid 2016-07-08 11:08:47 +02:00
ndobromirov 406a55be5c Excessive calls to variable_set HFJ-1893 2016-06-21 13:26:39 +02:00
Frode Petterson 18e2b79cc6 Merge branch 'master' of github.com:h5p/h5p-php-library 2016-06-21 09:34:37 +02:00
andyrandom 8cb0aad09e Allow hyphens in HTML tags HFJ-1951 2016-06-21 09:34:27 +02:00
Frode Petterson a6656c2e6f Support for when cookies are disabled
HFJ-1915
2016-06-20 14:57:14 +02:00
Frode Petterson 77b9959c87 Merge pull request #22 from davericher/patch-1
Minor cleanup
2016-06-17 08:59:40 +02:00
Dave Richer bcdaf59e5e Minor cleanup 2016-06-16 14:13:51 -04:00