Commit Graph

1287 Commits (e316eff18da913e979df15334a683048450aef6f)

Author SHA1 Message Date
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
Pål Jørgensen ec4678bf0b Fixed issue #2397891 (drupal.org), and made jshint a little happier 2014-12-30 10:54:26 +01:00
Frode Petterson 74fc840366 Added support for debugging events. 2014-12-17 16:57:46 +01:00
Frode Petterson 1aef9e376d Removed ulgy border from full screen. 2014-12-15 16:04:01 +01:00
Frode Petterson acb36845c0 Fixed wrong args. 2014-12-15 11:50:48 +01:00
Svein-Tore Griff With 7dfab8393f Merge branch 'atomic-dev-mode' into text-editor 2014-12-03 16:10:50 +01:00
falcon fb07f54e35 Make it possible to do the dependency transactions in an atomic way 2014-11-27 23:14:15 +01:00
Frode Petterson 8d5d16652b Merge tag 'wp-1.2.2' into stable 2014-11-27 11:36:54 +01:00
Frode Petterson 746f6417a4 Merge branch 'master' into stable 2014-11-27 11:24:15 +01:00
Svein-Tore Griff With e2abcd20b1 Merge branch 'master' of https://github.com/h5p/h5p-php-library 2014-11-27 11:14:12 +01:00
Frode Petterson 9ed2e48fb5 Fixed parse error. 2014-11-25 10:55:32 +01:00
Pål Jørgensen 60d166c6da Made creation of h5p export file overwrite existing file 2014-11-19 12:43:59 +01:00
Svein-Tore Griff With cc455f2b2d Implement changes after testing against Scrom Cloud 2014-11-17 11:08:43 +01:00
Svein-Tore Griff With e581690ce6 Merge branch 'master' into stable 2014-11-11 11:37:12 +01:00
Svein-Tore Griff With 6e17c540fc Merge branch 'fix-for-empty-string-language-in-h5p-json' 2014-11-11 11:14:03 +01:00
Svein-Tore Griff With e8a1b1e4e7 Merge branch 'master' of https://github.com/h5p/h5p-php-library 2014-11-11 11:12:06 +01:00
Frode Petterson 2bba9a183b Bumped api version. 2014-11-10 11:35:15 +01:00
Frode Petterson bc5159e272 Added event dispatcher. 2014-11-10 11:31:23 +01:00
Pål Jørgensen 2d7824aa93 Fix for language containing empty string in H5P export (h5p.json) 2014-11-06 11:13:24 +01:00
Frode Petterson 2727c1eb2d Merge branch 'master' of github.com:h5p/h5p-php-library 2014-11-03 11:30:42 +01:00
Svein-Tore Griff With 57db1d9926 Revert "Add htmlSpecialChars"
This reverts commit 41ed0c18e4.
2014-11-03 10:15:23 +01:00
Svein-Tore Griff With a61744b20a Merge branch 'master' of https://github.com/h5p/h5p-php-library 2014-11-03 10:14:57 +01:00
Pål Jørgensen 415e217134 Fixed URL to h5p.org 2014-11-03 07:02:45 +01:00
Pål Jørgensen 48dd1333a8 Merge branch 'master' of github.com:h5p/h5p-php-library 2014-11-03 07:00:05 +01:00
Svein-Tore Griff With 05d9982070 Add code to make it easy for others to register for xAPI events 2014-11-02 21:37:30 +01:00
Svein-Tore Griff With 5d32c4451c Add real url to statement object 2014-11-02 21:30:19 +01:00
Frode Petterson 77b2f0a426 Merge branch 'master' of github.com:h5p/h5p-php-library 2014-11-02 21:24:21 +01:00
Svein-Tore Griff With 378224f7c6 Get real actor 2014-11-02 21:16:27 +01:00
Svein-Tore Griff With 01779c0004 Use score instead of points 2014-11-02 21:16:19 +01:00
Svein-Tore Griff With 658db52f89 Resolve conflicts 2014-11-02 21:07:08 +01:00
Svein-Tore Griff With 7c3ddea71a Become node_clone compatible again 2014-11-02 19:13:14 +01:00
Frode Petterson e39e6ad136 Merge branch 'master' of github.com:h5p/h5p-php-library 2014-11-02 17:59:37 +01:00
Svein-Tore Griff With 41ed0c18e4 Add htmlSpecialChars 2014-11-02 17:52:39 +01:00