EDUCATIC
/
h5p-php-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
606 Commits
28 Branches
133 Tags
3.5 MiB
Commit Graph

249 Commits (5568a59854b22c0fc018350dd4383415020c7a90)

Author SHA1 Message Date
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
Frode Petterson aac10b86fa Make old embed code insert new. 2015-02-27 14:53:26 +01:00
Frode Petterson f2595b2bce Change how H5Ps are integrated. 2015-02-27 13:59:42 +01:00
Frode Petterson 77d589ec68 Fixed absolute URLs violating its parent. 2015-02-27 10:55:47 +01:00
Frode Petterson 1e4a7ff26f Removed unused code. 2015-02-27 10:29:43 +01:00
Frode Petterson 4e594dd573 Fixed dialog pos and expand. 2015-02-27 10:26:57 +01:00
Frode Petterson 037e26f42b Space support. 2015-02-27 08:57:02 +01:00
Frode Petterson 3463a3c671 Added support for multiple workers during content upgrade. 2015-02-26 16:16:20 +01:00
Frode Petterson fabde2f1ce Automatic positioning. 2015-02-25 13:05:45 +01:00
Frode Petterson 1861f696c1 Added new embed design. 2015-02-25 12:10:07 +01:00
Frode Petterson 0c5aacfa24 Fixed old fullscreen exit in iframe. 2015-02-24 16:02:14 +01:00
Svein-Tore Griff With d6e69e63ee Use this instead of self so that we're compatible with jsdoc 2015-02-20 15:34:38 +01:00
Frode Petterson 1fef537c8c Merge branch 'new-embed' of github.com:h5p/h5p-php-library into new-embed 2015-02-20 13:17:52 +01:00
Frode Petterson 93cd6eea28 Removed empty file. 2015-02-20 13:17:41 +01:00
Frode Petterson f76290cdde Made user results work in new embed. 2015-02-20 11:41:09 +01:00
Frode Petterson 971a55df58 Satisfy JSHint and prevent crashing. 2015-02-20 10:26:33 +01:00
Frode Petterson 688b00f55e Merge branch 'master' into new-embed 
Conflicts:
	js/h5p.js
 2015-02-20 10:15:36 +01:00
Frode Petterson 2b1c894307 Merge branch 'master' into settings 
Conflicts:
	h5p.classes.php
 2015-02-19 15:50:04 +01:00
Svein-Tore Griff With c7c46bc779 Fix spelling error 2015-02-18 15:20:20 +01:00
Svein-Tore Griff With 0d8fe7498c Remove code not being used 2015-02-18 15:08:55 +01:00
Svein-Tore Griff With e981e7d605 Trigger xAPI events on top as well if inside ifra 2015-02-18 10:59:47 +01:00
Svein-Tore Griff With d6db07481e Make sure the contentId is set on content types 2015-02-18 09:07:57 +01:00
Svein-Tore Griff With 1995da20bb Remove old todo items 2015-02-18 09:07:38 +01:00
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
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 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 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 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 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
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 acb36845c0 Fixed wrong args. 2014-12-15 11:50:48 +01:00
Svein-Tore Griff With cc455f2b2d Implement changes after testing against Scrom Cloud 2014-11-17 11:08:43 +01:00
Frode Petterson bc5159e272 Added event dispatcher. 2014-11-10 11:31:23 +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 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
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 41ed0c18e4 Add htmlSpecialChars 2014-11-02 17:52:39 +01:00
Svein-Tore Griff With 9391b60a03 Refactoring xAPI to use inheritence and event classes 2014-11-01 21:54:42 +01:00
Svein-Tore Griff With b3da2c5b32 Resolving conflicts 2014-11-01 20:42:34 +01:00
Svein-Tore Griff With f22cfb05b7 Merge branch 'master' into flat-copyrights 2014-11-01 13:49:26 +01:00
Svein-Tore Griff With dd83933a0a Remove } 2014-11-01 13:47:24 +01:00
Svein-Tore Griff With 37ad033e33 Resolve conflict 2014-11-01 12:50:40 +01:00
Frode Petterson ad03edf662 Added generic fallback for libraries that hasn't implemented getCopyrights. 2014-10-30 15:51:20 +01:00
falcon 22a559ccd8 Shorter function names and a few bugfixes 2014-10-26 22:18:28 +01:00
Frode Petterson 6c38bfe38c Merge branch 'whitelist' into settings 2014-10-23 15:31:34 +02:00
Frode Petterson 2f160909e3 Merge branch 'without-pal' into user-results 2014-10-23 15:19:52 +02:00
Frode Petterson 2737f3c721 Merge branch 'without-pal' 
Conflicts:
	h5p.classes.php
	js/h5p-library-list.js
 2014-10-23 15:18:03 +02:00
Frode Petterson af2f01cbb7 Added support for real fullscreen on Android devices. 2014-10-23 15:00:37 +02:00
Frode Petterson 2636ddc393 Make it easy to disable generic content features. 2014-10-23 14:02:34 +02:00
Frode Petterson 9f85ea370a Merge branch 'without-pal' into user-results 2014-10-22 14:31:46 +02:00
Frode Petterson f0cbb24cc6 Merge branch 'without-pal' of github.com:h5p/h5p-php-library into without-pal 2014-10-22 14:22:56 +02:00
Frode Petterson 68f1e89ca5 Removed source map ref. 2014-10-21 11:34:14 +02:00
Frode Petterson 062a8921e2 Added loaded callback and support for column classes. 2014-10-20 16:52:44 +02:00
Frode Petterson 36ed607f9e Updated js doc. 2014-10-17 16:06:47 +02:00
Frode Petterson 9ef34c2119 Added support for sorting. 2014-10-17 15:01:45 +02:00
Frode Petterson c6f92ea49b Improved messaging 2014-10-17 11:54:28 +02:00
Frode Petterson 245cf3c2a0 Merge branch 'without-pal' of github.com:h5p/h5p-php-library into without-pal 
Conflicts:
	js/h5p-content-upgrade.js
 2014-10-17 11:36:16 +02:00
Frode Petterson e6125f5c61 Merge branch 'without-pal' of github.com:h5p/h5p-php-library into user-results 
Conflicts:
	js/h5p-content-upgrade.js
	styles/h5p-admin.css
 2014-10-16 16:11:12 +02:00
Frode Petterson 04b8c8a8a1 Added support for text filters in data view. 2014-10-16 16:07:52 +02:00