Commit Graph

919 Commits (1341768c90ae243e1dfef8cba31d9ee04656abc1)

Author SHA1 Message Date
Svein-Tore Griff With a96e5cc7b9 Make the xAPI integration work for stuff that aren't content types 2015-02-18 09:07:19 +01:00
Svein-Tore Griff With 0a6dd4808b Rename the external api 2015-02-17 10:57:21 +01:00
Svein-Tore Griff With 537c62ab33 Get url to the H5P content from the framework 2015-02-17 10:57:12 +01:00
Svein-Tore Griff With c330282351 Refactor xAPI code 2015-02-16 16:47:04 +01:00
Svein-Tore Griff With b575426f83 Add documentation 2015-02-16 15:30:49 +01:00
Svein-Tore Griff With 2237f026c9 Documentation updates 2015-02-16 14:26:09 +01:00
Svein-Tore Griff With 10fbca1549 Documentation updates 2015-02-16 14:22:54 +01:00
Frode Petterson 84f8fb1cff Merge branch 'master' of github.com:h5p/h5p-php-library 2015-02-12 16:00:41 +01:00
Frode Petterson 1d24d073ed Moved "libraries saving" out of savePackage to make it easier to read and handle. Added UI messages when adding and updating libraries. Minor code optimizations. 2015-02-12 15:56:31 +01:00
Svein-Tore Griff With 8d7ce8f4f1 Merge branch 'master' of https://github.com/h5p/h5p-php-library 2015-02-12 15:46:55 +01:00
Svein-Tore Griff With cb1be24f62 Merge branch 'master' into xAPI 2015-02-12 15:46:34 +01:00
Svein-Tore Griff With 83a077be15 Rename api function 2015-02-12 15:46:25 +01:00
Frode Petterson 9fc5f82b2f Fixed empty frame. 2015-02-12 11:52:55 +01:00
Svein-Tore Griff With 36b1fd2d8c Add helper function to get verbs 2015-02-11 20:06:40 +01:00
Svein-Tore Griff With 5483a3f151 Remove event dispatcher 2015-02-11 18:02:58 +01:00
Svein-Tore Griff With c4aedca522 Resolve conflicts 2015-02-11 18:02:25 +01:00
Svein-Tore Griff With f8434bf788 Add scopes to event system 2015-02-11 17:31:01 +01:00
Svein-Tore Griff With 079f4992b4 bugfixes 2015-02-11 15:56:35 +01:00
Frode Petterson 42fbb6ab1f Reverse direction of dependency loading. The libraries used last in the parameters are now loaded first, e.g. summary is now loaded before iv! 2015-02-11 14:40:01 +01:00
Frode Petterson fb77a4d20d bugfix. 2015-02-10 16:40:23 +01:00
Frode Petterson c764d13b32 Moved display options helpers into core. 2015-02-10 16:29:16 +01:00
Frode Petterson 3c712193b3 Merge branch 'master' into settings
Conflicts:
	styles/h5p.css
2015-02-09 15:25:09 +01:00
Frode Petterson a0c5fe0e18 Comment out semi full screen. 2015-02-09 11:51:39 +01:00
Frode Petterson 11d9cb2f35 Trigger events. 2015-02-09 11:47:33 +01:00
Frode Petterson 18a3ed4a8f Simplified integration code to avoid to much duplication.
Added resizing script for new embed code.
Added iframe communicator when embedding.
2015-02-09 10:22:14 +01:00
Svein-Tore Griff With a090468657 Merge branch 'text-editor' 2015-02-05 12:01:16 +01:00
Svein-Tore Griff With 9a0da8614b Add helper functions 2015-02-05 10:46:55 +01:00
Svein-Tore Griff With c8a2465827 Add documentation and change function names for deprecated functions 2015-02-04 18:43:06 +01:00
Frode Petterson 21674d31ac Merge branch 'master' into settings
Conflicts:
	js/h5p.js
2015-02-04 09:32:03 +01:00
Svein-Tore Griff With fc4f791e6e Bump core api version 2015-02-03 20:15:15 +01:00
Svein-Tore Griff With efdd7f9f7a Moving x-api and Event handling code to separate files and refining it 2015-02-03 20:11:01 +01:00
Svein-Tore Griff With 7daa4ff2c8 Merge branch 'master' into xAPI 2015-02-03 17:47:26 +01:00
Svein-Tore Griff With f66e6a3ce9 Merge branch 'manually-move-files' 2015-02-03 14:02:54 +01:00
Svein-Tore Griff With e12ba70b95 Merge branch 'master' into adaptivity 2015-02-03 13:44:52 +01:00
Svein-Tore Griff With daa91b1372 Merge branch 'master' into text-editor 2015-02-02 14:28:52 +01:00
Svein-Tore Griff With ae6329595b Add ordering of libraries 2015-01-30 10:59:40 +01:00
Svein-Tore Griff With 06ba81c2ab Merge branch 'master' of https://github.com/h5p/h5p-php-library 2015-01-28 15:35:27 +01:00
Svein-Tore Griff With b0e6bed517 Update README.txt 2015-01-27 11:28:02 +01:00
Frode Petterson ead790ae1a Make sure fields in optional groups also becomes optional. 2015-01-20 14:48:22 +01:00
Svein-Tore Griff With 3beaa8302a Remove H5P special chars 2015-01-14 18:13:23 +01:00
Svein-Tore Griff With 62618104af Resolve conflict 2015-01-14 18:09:18 +01:00
Svein-Tore Griff With 64dd059c03 Add support for deprecated event system 2015-01-14 18:08:36 +01:00
Svein-Tore Griff With 61eb998d48 Add xAPI todo list 2015-01-14 17:27:32 +01:00
Svein-Tore Griff With 43e98afe4b Merge branch 'text-editor' of https://github.com/h5p/h5p-php-library into text-editor 2015-01-14 09:55:48 +01:00
Frode Petterson 8cee9820b0 Merge branch 'master' into text-editor 2015-01-13 13:38:51 +01:00
Frode Petterson ae8609dd86 Replaced another rename function. 2015-01-09 10:00:40 +01:00
git e7b7cd2abe Issue https://www.drupal.org/node/2402099 by drinkdecaf: H5P on Pantheon Environments 2015-01-09 09:59:29 +01:00
Frode Petterson 35a7f39a0b Merge branch 'master' of github.com:h5p/h5p-php-library 2015-01-09 09:53:13 +01:00
Svein-Tore Griff With 1420a96a2c Merge branch 'atomic-dev-mode' 2015-01-08 11:20:49 +01:00
Svein-Tore Griff With fb517c7592 Merge branch 'master' into atomic-dev-mode 2015-01-08 11:20:18 +01:00