Commit Graph

1418 Commits (d392737f45065fde04071bd7e29c5287fa7d1414)

Author SHA1 Message Date
Frode Petterson 808e43bc66 Disable generating export on each request 2016-01-12 10:31:47 +01:00
Frode Petterson 0125afb440 Refactor for consistency 2016-01-12 10:31:36 +01:00
Frode Petterson 2bd972168e Isolate file operations in a separate class 2016-01-11 18:31:04 +01:00
Frode Petterson 510016b1cc Merge branch 'release' of github.com:h5p/h5p-php-library into release 2016-01-05 13:58:20 +01:00
Frode Petterson 59901fd1c9 Fixed resizing script trying to access iframe content
HFJ-1512
2016-01-05 13:57:16 +01:00
Paal Joergensen 919ac77f35 Readded check for undefined contentid in setActivityStarted() 2015-12-18 10:26:59 +01:00
Paal Joergensen e83b213183 Made content state saving more robust [HFJ-1450] 2015-12-18 10:06:33 +01:00
Frode Petterson 5e45e7d7dd Merge branch 'master' into release
Conflicts:
	js/h5p-x-api.js
2015-12-17 14:04:58 +01:00
Paal Joergensen e6ec257c6d Made setActivityStarted a little more robust [HFJ-1474] 2015-12-16 15:42:26 +01:00
Paal Joergensen 2d0e409ac4 Made content state beeing saved on safari@iPad when closing tab and leaving tab 2015-12-16 09:50:58 +01:00
Frode Petterson 2bc4dee85a Prevent crashing editor for old libraries 2015-12-10 14:49:30 +01:00
Frode Petterson b85ee0bd0b Merge branch 'auto-install' 2015-12-10 10:22:19 +01:00
Frode Petterson 932db9eb7a Merge pull request #6 from juho-jaakkola/composer
Adds minimal composer.json
2015-12-03 21:41:17 +01:00
Svein-Tore Griff With 3a2bb0a2fd Trigger attempted event the first time a user sees a question - HFJ-1397 2015-11-27 20:49:49 +01:00
Juho Jaakkola 6773f7aad8 Adds minimal composer.json 2015-11-27 13:10:41 +02:00
Frode Petterson 5aec15061c Make copyright fields translatable
https://github.com/h5p/h5p-image/issues/2
2015-11-23 14:35:51 +01:00
Svein-Tore Griff With 813103a28b Add GPL license 2015-11-17 14:10:26 +01:00
Frode Petterson 3c34ab223a Prevent assigning to the htmlcollection. 2015-11-13 11:18:53 +01:00
Frode Petterson 0c24965305 Keep track of the latest H5P release 2015-11-11 14:13:05 +01:00
Frode Petterson 16aa6813ae Use correct variable 2015-11-06 15:35:06 +01:00
Frode Petterson 2f5e1fcc91 Use correct variable. 2015-11-05 16:52:38 +01:00
Frode Petterson 7a369de7e7 Avoid undefined errors 2015-11-04 17:30:58 +01:00
Frode Petterson 4bca7055ab Merge branch 'master' into copy-and-paste 2015-11-04 11:38:52 +01:00
Svein-Tore Griff With e29be52de5 Merge branch 'master' of https://github.com/h5p/h5p-php-library 2015-11-01 00:32:55 +01:00
Svein-Tore Griff With b077af0981 Merge branch 'stable' 2015-11-01 00:32:47 +01:00
Svein-Tore Griff With ccfa2d516f Make sure we get answered statements in the result log 2015-11-01 00:30:45 +01:00
Svein-Tore Griff With 844883a1cf triggerXAPICompleted is deprecated so we don't change it. Also fixes doc 2015-11-01 00:23:10 +01:00
Svein-Tore Griff With cc6521c4a1 completed default value depends on verb 2015-11-01 00:19:56 +01:00
Svein-Tore Griff With e7fe53c235 Merge pull request #4 from garemoko/garemoko-issue-2
Add support for result.success & completion
2015-11-01 00:14:42 +01:00
Frode Petterson f0530957ad Improved semi-fullscreen for iPad. 2015-10-27 16:57:28 +01:00
Frode Petterson 876135436c Made resize script smarter to avoid flickering. 2015-10-26 14:13:21 +01:00
Frode Petterson f35e36cf5a Merge branch 'editor-padding' 2015-10-22 14:53:53 +02:00
Andrew Downes 76a02867aa Update triggerXAPICompleted and triggerXAPIScored
Added support for completion and success.
2015-10-20 11:29:01 +01:00
Andrew Downes f9ea9adb1b Add support for result.success & completion 2015-10-20 11:13:08 +01:00
Frode Petterson ee02f08bdb Prevent warnings when reading the directory fails
(There will still be error messages)
2015-10-14 14:43:03 +02:00
Paal Joergensen 78c06fb42a Merge branch 'master' into copy-and-paste 2015-10-06 14:00:08 +02:00
Frode Petterson cb8640195e Avoid thin grey lines around the iframe when using fullscreen on high-res devices. 2015-10-02 08:52:11 +02:00
Frode Petterson ef3cbd92c5 Improved semi-fullscreen? 2015-09-28 15:30:25 +02:00
Svein-Tore Griff With 1c99d7ed61 Remove the https since there are some servers that doesn't support it 2015-09-22 17:58:55 +02:00
Frode Petterson 8e3d78a2f6 Prevent use of files that belongs to other content. 2015-09-18 12:55:58 +02:00
Frode Petterson 742339ba8f Merge branch 'master' into editor-padding 2015-09-15 09:28:29 +02:00
Frode Petterson 46183a3a2e Fixed missing equal sign. 2015-09-15 09:26:58 +02:00
Frode Petterson 3e54270f4b Merge branch 'master' into editor-padding 2015-09-10 14:27:37 +02:00
Frode Petterson 2d43942c48 Use parent window instead of top for communications. 2015-09-10 14:27:12 +02:00
Frode Petterson 1cf1a38a1b Merge branch 'master' into editor-padding 2015-09-10 10:02:43 +02:00
Paal Joergensen cb59b9b79f Allowing text-align on wysiwygs [HPN-115] 2015-09-09 13:28:16 +02:00
Frode Petterson 98a7b759a9 Updated icons. 2015-09-03 09:04:04 +02:00
Frode Petterson 47d0f830d3 Removed asd 2015-09-02 15:44:38 +02:00
Frode Petterson 07b085e326 Use HTTPS, much safer. 2015-08-31 15:46:59 +02:00
Frode Petterson 3e3bba7133 Always use 100% for fullscreen. auto is needed for embed. 2015-08-27 15:10:02 +02:00