Commit Graph

332 Commits (2c4edb7b564da455080a86d4a54f8a83ecf58e6e)

Author SHA1 Message Date
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
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 2d43942c48 Use parent window instead of top for communications. 2015-09-10 14:27:12 +02:00
Frode Petterson 47d0f830d3 Removed asd 2015-09-02 15:44:38 +02:00
Frode Petterson 7737559dec Fixed off(). 2015-08-27 11:36:07 +02:00
Frode Petterson d8d7fdabdd Replaced nbsp. 2015-08-26 15:58:49 +02:00
Svein-Tore Griff With 8d9781f4ae Also add class when framed 2015-07-30 18:11:59 +02:00
Svein-Tore Griff With 71f147058d Rename isStandalone to isRoot and use ned libraryInfo instead of the so called ubername 2015-07-20 13:40:59 +02:00
Svein-Tore Griff With aa96d726bd Merge branch 'master' of https://github.com/h5p/h5p-php-library 2015-07-20 13:05:48 +02:00
Svein-Tore Griff With 5d1cd188d0 Add duration and scaled to result 2015-07-20 13:05:41 +02:00
Paal Joergensen 56e74c2d68 Renamed H5P.Base to H5P.ContentType.
Moved H5P.ContentType code to separate file.
Made H5P.ContentType extend H5P.EventDispatcher.
2015-07-17 13:32:35 +02:00
Paal Joergensen 8cf384f46a Fixed H5P.Base.getLibraryFilePath() bug 2015-07-14 14:46:35 +02:00
Paal Joergensen e36582c714 Added H5P base class that all H5P libraries automatically extends 2015-07-14 14:37:39 +02:00
Svein-Tore Griff With 03370c9500 Add info about the library being used to the xAPI statements 2015-07-10 12:58:02 +02:00
Svein-Tore Griff With 8431304dd0 Remove todos 2015-07-10 11:41:28 +02:00
Frode Petterson 1764e80511 Merge branch 'master' of github.com:h5p/h5p-php-library 2015-06-25 15:15:04 +02:00
Frode Petterson 3e21226b3b No decimals in embed dialog. 2015-06-25 15:14:55 +02:00
Frode Petterson 3d4165df55 Use local variable. 2015-06-23 14:24:19 +02:00
Frode Petterson b9229ba75f Don't try to get data when there's no user. 2015-06-23 11:12:29 +02:00
Frode Petterson c40d273704 Fixed this arg for external dispatcher. 2015-06-04 14:39:02 +02:00
Frode Petterson 8e82b515a2 Prevent updating pagination when there's no table. 2015-05-21 09:50:58 +02:00
Svein-Tore Griff With 227e0829fd Avoid printing very scary error message for all old interactive videos 2015-05-18 15:14:33 +02:00
Frode Petterson 3f6abd722d Prevent crashing if getCopyrights fail. 2015-05-15 12:21:23 +02:00
Svein-Tore Griff With eb6ec29cb6 Remove deprecated name 2015-05-12 16:09:36 +02:00
Frode Petterson ca0c848e0f Use correct element. 2015-05-12 10:04:21 +02:00
Frode Petterson 5568a59854 Pre-generate copyright information. 2015-05-11 16:00:55 +02:00
Frode Petterson ba862f0078 Embed: Always br. Get w/h from correct el. 2015-05-07 15:16:59 +02:00
Frode Petterson e0534dd778 Fixed frame disable broken. Probably a merge gone wrong. 2015-05-07 15:13:28 +02:00
Frode Petterson ccc03782df Cleaned up docs to make JSdoc generation more meaningful. 2015-05-05 13:13:57 +02:00
Thomas Marstrander 9ee8130aae Added copyrights fix. 2015-04-27 13:21:31 +02:00
Frode Petterson 260b6fe044 Restrict IE FullScreen. 2015-04-22 12:55:18 +02:00
Frode Petterson 886c631461 Use correct variable. 2015-04-22 10:58:59 +02:00
Frode Petterson 1c6b818841 Merge branch 'release'
Conflicts:
	js/h5p.js
2015-04-22 09:51:36 +02:00
Frode Petterson af8e9e8f30 Relay events to top window. 2015-04-22 09:49:58 +02:00
Frode Petterson c13e0a0a9a Fixed fullscreen checker. 2015-04-21 16:55:23 +02:00
Frode Petterson cdceb41d74 Prevent running multiple resizer. 2015-04-21 16:55:04 +02:00
Frode Petterson b3dea65fd8 Remove element from DOM the correct way. 2015-04-21 16:54:31 +02:00
Frode Petterson 28f8a8dc8a Create a spaceholder when resizing iframes. 2015-04-21 09:09:41 +02:00
Frode Petterson fba8badf1a Use URL template to support URLs of different formatting. 2015-04-20 10:30:52 +02:00
Svein-Tore Griff With 165db6ff6c externalEmbed is either false or undefined it seems 2015-04-16 20:14:53 +02:00
Svein-Tore Griff With cf7ae066ad Add disable support for uploads as well 2015-04-15 13:54:46 +02:00
Svein-Tore Griff With 09c6d5c4f8 Handle cases where a field don't have params 2015-04-14 14:01:28 +02:00
Svein-Tore Griff With 80a80aef7a Better debugging 2015-04-14 14:01:14 +02:00
Svein-Tore Griff With 9a92a61484 Make sure state is ignored when disabled 2015-04-13 20:31:21 +02:00
Svein-Tore Griff With ba2355c2ec Make sure state is ignored when disabled 2015-04-13 20:30:40 +02:00
Svein-Tore Griff With 868c06929d Whitespace changes 2015-04-13 18:41:53 +02:00
Svein-Tore Griff With fba425220e Resolve conflicts 2015-04-13 18:32:33 +02:00
Svein-Tore Griff With 912a670607 Merge branch 'master' into upgrade-speed 2015-04-13 18:16:19 +02:00
Svein-Tore Griff With 497301d6ad Add triggerXAPIScored and deprecate triggerXAPICompleted 2015-04-09 19:42:05 +02:00
Svein-Tore Griff With 5b36e468ac Rewrite so that we add options as an object instead of a very long list of parameters 2015-04-09 14:00:00 +02:00
Frode Petterson ea26ae95db Merge tag 'wp-1.4.0' into upgrade-speed 2015-04-08 09:35:57 +02:00
Svein-Tore Griff With 5b55b78ded createH5PTitle->createTitle 2015-04-07 19:52:18 +02:00
Svein-Tore Griff With 5c3620c637 Bubbling for event system 2015-04-07 19:33:21 +02:00
Svein-Tore Griff With efbe56001d User data fixes 2015-04-07 19:32:44 +02:00
Svein-Tore Griff With 58d0d3e32c Merge branch 'no-url-fopen' into aggregated-xapi 2015-03-24 18:27:23 +01:00
Svein-Tore Griff With c746457a87 Make xAPI work in editor 2015-03-24 18:24:07 +01:00
Frode Petterson 9ae40ad739 Merge branch 'master' into no-url-fopen 2015-03-23 10:53:47 +01:00
Frode Petterson acd3aa2dba Merge branch 'master' of github.com:h5p/h5p-php-library 2015-03-23 10:53:30 +01:00
Frode Petterson cfe73006a2 Added back deprecated function. 2015-03-23 10:53:21 +01:00
Frode Petterson eee77519b7 Always use complete URLs. 2015-03-23 09:45:02 +01:00
Svein-Tore Griff With 8e113ff792 Add parameter set as parameter 5 to new runnable, and blacklist libraries that already have a custom third parameter for their constructor 2015-03-22 20:39:16 +01:00
Svein-Tore Griff With 9d38f83886 Refactor completed listener to use more of the new xAPI api functions 2015-03-22 20:38:57 +01:00
Svein-Tore Griff With eb02a5942d Make externalDispatcher from framed content work again 2015-03-22 20:38:33 +01:00
Svein-Tore Griff With d3453b8637 Context bug fix 2015-03-22 20:38:17 +01:00
Svein-Tore Griff With 5d6d22a13f Accept other verbs than the adl verbs 2015-03-22 20:37:48 +01:00
Svein-Tore Griff With 46c9260755 Don't bubble by default 2015-03-22 20:37:28 +01:00
Svein-Tore Griff With 6b3e550a48 Don't bubble by default 2015-03-22 20:37:10 +01:00
Svein-Tore Griff With 9a204b3d8f Make sure title are added 2015-03-22 15:14:28 +01:00
Svein-Tore Griff With c4e488f9c8 Get contentId from the right place in the statement 2015-03-22 13:27:40 +01:00
Svein-Tore Griff With 5a882e4d55 Improve title generator 2015-03-22 12:45:03 +01:00
Svein-Tore Griff With 93f2bcc01a Use uuid instead of h5pUUID 2015-03-22 12:44:55 +01:00
Svein-Tore Griff With e14c24cc07 Fix xAPI statement structure to follow the standard better 2015-03-22 12:43:07 +01:00
Svein-Tore Griff With 3da0de4626 Fix bubble system 2015-03-22 11:17:58 +01:00
Svein-Tore Griff With 313bb757ba Add bubble system and xAPI context 2015-03-21 16:45:38 +01:00
Svein-Tore Griff With 76b0fc04f8 Make UUID creator available for everyone 2015-03-21 14:16:31 +01:00
Frode Petterson fb82328535 Fullscreen fix 2015-03-13 12:51:31 +01:00
Frode Petterson 7ef9ffbf1f Added default sort option to data view. Improved buttons. 2015-03-11 11:40:07 +01:00
Frode Petterson efd79c9e79 Support init target. 2015-03-10 10:09:31 +01:00
Frode Petterson 72db596bac Make sure H5P.externalEmbed is set inside the iframe. Run H5P.init from external resource to ensure correct execution order in IE9. 2015-03-10 09:53:33 +01:00
Svein-Tore Griff With b45bfe770b Critical bug fix for safari 2015-03-06 12:56:41 +01:00
Frode Petterson 6d4caf855d Fixed error handling. 2015-03-04 11:30:20 +01:00
Frode Petterson c91391e0bc Fixed URLs.
Finishing touches on the time tracking.
2015-03-04 11:13:32 +01:00
Frode Petterson 812c3b5e7c Merge branch 'master' into upgrade-speed 2015-03-04 10:21:29 +01:00
Svein-Tore Griff With 96b1014f80 Merge branch 'master' into new-embed 2015-03-03 18:10:07 +01:00
Frode Petterson acca962775 Fixed misplaced stash (after merge). 2015-03-03 11:03:18 +01:00
Frode Petterson 22d085386e Merge branch 'new-embed' of github.com:h5p/h5p-php-library into new-embed 2015-03-02 16:03:48 +01:00
Frode Petterson e961f614a4 Fixed so that iframes can be loaded before resizer script. 2015-03-02 15:53:29 +01:00
Svein-Tore Griff With 99db5699fb Handle anonymous users 2015-03-02 15:49:27 +01:00
Svein-Tore Griff With 553ae243d2 UX improvements to embed code system 2015-03-02 15:01:05 +01:00
Frode Petterson 8e53f62679 Make sure admin container is empty. 2015-03-02 13:42:15 +01:00
Frode Petterson 07cd5c0d42 Added a floating touch. 2015-02-27 15:37:16 +01:00
Frode Petterson 1c1829b13b Fixed integration bug. 2015-02-27 14:53:38 +01:00