Commit Graph

  • 9a37a99574 Re-added "Remove empty params." to master. Frode Petterson 2015-04-22 10:44:16 +0200
  • 31ee0bd51a Removed "Remove empty params." from release. Frode Petterson 2015-04-22 10:43:18 +0200
  • 540c96178d Merge branch 'master' of github.com:h5p/h5p-php-library Frode Petterson 2015-04-22 09:51:45 +0200
  • 1c6b818841 Merge branch 'release' Frode Petterson 2015-04-22 09:51:36 +0200
  • af8e9e8f30 Relay events to top window. Frode Petterson 2015-04-22 09:49:58 +0200
  • c13e0a0a9a Fixed fullscreen checker. Frode Petterson 2015-04-21 16:22:51 +0200
  • cdceb41d74 Prevent running multiple resizer. Frode Petterson 2015-04-21 15:08:59 +0200
  • b3dea65fd8 Remove element from DOM the correct way. Frode Petterson 2015-04-21 13:56:24 +0200
  • 1091890596 Fixed fullscreen checker. Frode Petterson 2015-04-21 16:22:51 +0200
  • 27a0a33298 Prevent running multiple resizer. Frode Petterson 2015-04-21 15:08:59 +0200
  • 8433f654af Remove element from DOM the correct way. Frode Petterson 2015-04-21 13:56:24 +0200
  • 28f8a8dc8a Create a spaceholder when resizing iframes. Frode Petterson 2015-04-20 15:37:49 +0200
  • 51a77c02ab Merge branch 'master' of github.com:h5p/h5p-php-library Frode Petterson 2015-04-20 15:37:59 +0200
  • 59bb32fa44 Create a spaceholder when resizing iframes. Frode Petterson 2015-04-20 15:37:49 +0200
  • 8c68f23823 Remove empty params. Frode Petterson 2015-04-20 15:10:31 +0200
  • 419aed308a Merged in url fixes. d6 Frode Petterson 2015-04-20 13:53:38 +0200
  • fba8badf1a Use URL template to support URLs of different formatting. Frode Petterson 2015-04-20 10:30:52 +0200
  • 165db6ff6c externalEmbed is either false or undefined it seems Svein-Tore Griff With 2015-04-16 20:14:53 +0200
  • cf7ae066ad Add disable support for uploads as well Svein-Tore Griff With 2015-04-15 13:54:46 +0200
  • 09c6d5c4f8 Handle cases where a field don't have params Svein-Tore Griff With 2015-04-14 14:01:28 +0200
  • 80a80aef7a Better debugging Svein-Tore Griff With 2015-04-14 14:01:14 +0200
  • 2725f591b7 Changed z-index of semi-fullscreen to 1000 to have priority over all drupal elements. Thomas Marstrander 2015-04-14 13:41:27 +0200
  • 9a92a61484 Make sure state is ignored when disabled Svein-Tore Griff With 2015-04-13 20:31:21 +0200
  • ba2355c2ec Make sure state is ignored when disabled Svein-Tore Griff With 2015-04-13 20:30:40 +0200
  • 0b609e882d Add about to disable sources and make sure each source is set Svein-Tore Griff With 2015-04-13 19:58:41 +0200
  • 868c06929d Whitespace changes Svein-Tore Griff With 2015-04-13 18:41:53 +0200
  • fba425220e Resolve conflicts Svein-Tore Griff With 2015-04-13 18:32:33 +0200
  • 912a670607 Merge branch 'master' into upgrade-speed Svein-Tore Griff With 2015-04-13 18:16:19 +0200
  • 497301d6ad Add triggerXAPIScored and deprecate triggerXAPICompleted Svein-Tore Griff With 2015-04-09 19:42:05 +0200
  • 5b36e468ac Rewrite so that we add options as an object instead of a very long list of parameters Svein-Tore Griff With 2015-04-09 14:00:00 +0200
  • ea26ae95db Merge tag 'wp-1.4.0' into upgrade-speed Frode Petterson 2015-04-08 09:35:57 +0200
  • 5b55b78ded createH5PTitle->createTitle Svein-Tore Griff With 2015-04-07 19:52:18 +0200
  • ed23b9fff0 Merge branch 'master' into aggregated-xapi Svein-Tore Griff With 2015-04-07 19:33:48 +0200
  • 5c3620c637 Bubbling for event system Svein-Tore Griff With 2015-04-07 19:33:21 +0200
  • efbe56001d User data fixes Svein-Tore Griff With 2015-04-07 19:32:44 +0200
  • cfa747f20c Add path fixes Svein-Tore Griff With 2015-04-07 19:30:46 +0200
  • 5adffcaeb8 Added content id. Frode Petterson 2015-04-07 15:36:28 +0200
  • 2dfdc04217 Fixed exports with development mode enabled. Frode Petterson 2015-03-27 11:51:17 +0100
  • bf227bdae0 Moved in changes from Drupal. Frode Petterson 2015-03-27 10:29:34 +0100
  • 7a3e6ee847 Merge branch 'aggregated-xapi' of ssh://stash.joubel.com:7999/h5p/php-core into aggregated-xapi Frode Petterson 2015-03-27 10:27:54 +0100
  • 61a8e7e9e9 Make view work again as well Svein-Tore Griff With 2015-03-24 19:36:13 +0100
  • 065ee4e8a2 Make editor work again Svein-Tore Griff With 2015-03-24 19:29:28 +0100
  • ef7a31d2e1 Try to get back the no url branch Svein-Tore Griff With 2015-03-24 18:55:13 +0100
  • 58d0d3e32c Merge branch 'no-url-fopen' into aggregated-xapi Svein-Tore Griff With 2015-03-24 18:27:23 +0100
  • c746457a87 Make xAPI work in editor Svein-Tore Griff With 2015-03-24 18:24:07 +0100
  • c4c2f6b16a Display dialog when content user data is reset. Frode Petterson 2015-03-24 16:17:26 +0100
  • 24fa34f9c2 Avoid parsing state multiple times. Frode Petterson 2015-03-24 11:01:23 +0100
  • e153acbf3e Merge branch 'no-url-fopen' into content-user-data Frode Petterson 2015-03-23 10:54:00 +0100
  • 9ae40ad739 Merge branch 'master' into no-url-fopen Frode Petterson 2015-03-23 10:53:47 +0100
  • acd3aa2dba Merge branch 'master' of github.com:h5p/h5p-php-library Frode Petterson 2015-03-23 10:53:30 +0100
  • cfe73006a2 Added back deprecated function. Frode Petterson 2015-03-23 10:53:21 +0100
  • bb059d63e2 Merge branch 'no-url-fopen' into content-user-data Frode Petterson 2015-03-23 10:02:23 +0100
  • 8ed7e39ddf Merge branch 'no-url-fopen' into d6 Frode Petterson 2015-03-23 10:00:05 +0100
  • eee77519b7 Always use complete URLs. Frode Petterson 2015-03-23 09:45:02 +0100
  • 67288c2a0b Added auto save loop. Added save after xAPI events. Made it possible to disable saving. Frode Petterson 2015-03-22 20:44:35 +0100
  • 8e113ff792 Add parameter set as parameter 5 to new runnable, and blacklist libraries that already have a custom third parameter for their constructor Svein-Tore Griff With 2015-03-22 20:39:16 +0100
  • 9d38f83886 Refactor completed listener to use more of the new xAPI api functions Svein-Tore Griff With 2015-03-22 20:38:57 +0100
  • eb02a5942d Make externalDispatcher from framed content work again Svein-Tore Griff With 2015-03-22 20:38:33 +0100
  • d3453b8637 Context bug fix Svein-Tore Griff With 2015-03-22 20:38:17 +0100
  • 5d6d22a13f Accept other verbs than the adl verbs Svein-Tore Griff With 2015-03-22 20:37:48 +0100
  • 46c9260755 Don't bubble by default Svein-Tore Griff With 2015-03-22 20:37:28 +0100
  • 6b3e550a48 Don't bubble by default Svein-Tore Griff With 2015-03-22 20:37:10 +0100
  • a712d6ed61 Removed debug. Frode Petterson 2015-03-22 19:31:35 +0100
  • 431cff0196 New API for saving user data per content. Frode Petterson 2015-03-22 19:28:16 +0100
  • 9a204b3d8f Make sure title are added Svein-Tore Griff With 2015-03-22 15:14:28 +0100
  • c4e488f9c8 Get contentId from the right place in the statement Svein-Tore Griff With 2015-03-22 13:27:40 +0100
  • 44e8cba365 Merge branch 'master' into aggregated-xapi Svein-Tore Griff With 2015-03-22 13:14:40 +0100
  • 1c4a5e014b Comment out prefixing that isn't working Svein-Tore Griff With 2015-03-22 13:12:44 +0100
  • e76fc9eff3 Merge branch 'no-url-fopen' of https://github.com/h5p/h5p-php-library Svein-Tore Griff With 2015-03-22 12:46:41 +0100
  • 5a882e4d55 Improve title generator Svein-Tore Griff With 2015-03-22 12:45:03 +0100
  • 93f2bcc01a Use uuid instead of h5pUUID Svein-Tore Griff With 2015-03-22 12:44:55 +0100
  • e14c24cc07 Fix xAPI statement structure to follow the standard better Svein-Tore Griff With 2015-03-22 12:43:07 +0100
  • b79a5b61b8 uuid consists of lowercase letters Svein-Tore Griff With 2015-03-22 12:42:07 +0100
  • 3da0de4626 Fix bubble system Svein-Tore Griff With 2015-03-22 11:17:58 +0100
  • 313bb757ba Add bubble system and xAPI context Svein-Tore Griff With 2015-03-21 16:45:38 +0100
  • 76b0fc04f8 Make UUID creator available for everyone Svein-Tore Griff With 2015-03-21 14:16:31 +0100
  • 9672986112 Merge branch 'settings' into d6 Frode Petterson 2015-03-20 13:52:57 +0100
  • e6e3ee7559 Allow assets to be relative to another location. Allow assets to contain external URLs. Frode Petterson 2015-03-20 11:28:21 +0100
  • b04756a520 Merge branch 'master' into improved-packaging Svein-Tore Griff With 2015-03-19 19:27:47 +0100
  • 8494e85c3e Remove todo items Svein-Tore Griff With 2015-03-19 19:27:44 +0100
  • 51a1d333e2 Improved packaging. Made sure zip format is followed by always using forward slashes. This will make h5p export work on Windows. Frode Petterson 2015-03-19 16:58:48 +0100
  • 1b28c7b128 Use different vars for URL and file path to avoid having allow_url_fopen = On. Frode Petterson 2015-03-18 14:25:55 +0100
  • 6541faf8ba Renamed humanId => slug. Moved most of the slug generating code out of the framework and into core. Remove old export files. Use old export file until new slug is generated. Added support for converting more special chars. Frode Petterson 2015-03-13 15:17:19 +0100
  • c7a7a99590 Merge branch 'master' into smart-file-names Frode Petterson 2015-03-13 13:05:20 +0100
  • fb82328535 Fullscreen fix Frode Petterson 2015-03-13 12:51:31 +0100
  • c35d7f8334 Added support for generating human readable H5P file names. Frode Petterson 2015-03-12 14:38:10 +0100
  • 5931ed5d76 Merge branch 'new-font' wp-1.4.0 Frode Petterson 2015-03-11 13:17:44 +0100
  • 7ef9ffbf1f Added default sort option to data view. Improved buttons. Frode Petterson 2015-03-11 11:40:07 +0100
  • efd79c9e79 Support init target. Frode Petterson 2015-03-10 10:09:31 +0100
  • 2f44edd65a Prevent double init. Ie9 fix. Frode Petterson 2015-03-10 10:08:35 +0100
  • 72db596bac Make sure H5P.externalEmbed is set inside the iframe. Run H5P.init from external resource to ensure correct execution order in IE9. Frode Petterson 2015-03-10 09:53:33 +0100
  • b45bfe770b Critical bug fix for safari Svein-Tore Griff With 2015-03-06 12:56:41 +0100
  • 6d4caf855d Fixed error handling. Frode Petterson 2015-03-04 11:30:20 +0100
  • c91391e0bc Fixed URLs. Finishing touches on the time tracking. Frode Petterson 2015-03-04 11:13:32 +0100
  • 812c3b5e7c Merge branch 'master' into upgrade-speed Frode Petterson 2015-03-04 10:21:29 +0100
  • 23f68d821e Added woff to css inline Thomas Marstrander 2015-03-04 10:06:35 +0100
  • 96b1014f80 Merge branch 'master' into new-embed Svein-Tore Griff With 2015-03-03 18:10:07 +0100
  • acca962775 Fixed misplaced stash (after merge). Frode Petterson 2015-03-03 11:03:10 +0100
  • cd5b37df62 Merge branch 'master' into new-font Frode Petterson 2015-03-03 10:46:26 +0100
  • 22d085386e Merge branch 'new-embed' of github.com:h5p/h5p-php-library into new-embed Frode Petterson 2015-03-02 16:03:48 +0100