Commit Graph

663 Commits (71f147058d684de05c90fde148ffb993fc4cbe84)

Author SHA1 Message Date
Frode Petterson efd79c9e79 Support init target. 2015-03-10 10:09:31 +01:00
Frode Petterson 2f44edd65a Prevent double init. Ie9 fix. 2015-03-10 10:08:35 +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
Thomas Marstrander 23f68d821e Added woff to css inline 2015-03-04 10:06:35 +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 cd5b37df62 Merge branch 'master' into new-font 2015-03-03 10:46:26 +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 d1cc8bcb71 Moved embed template to core. 2015-02-27 11:05:22 +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
Thomas Marstrander 152b51f02a Added new font 2015-02-20 13:00:50 +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 95a0b000db Remove scary error messages 2015-02-18 19:58:03 +01:00
Svein-Tore Griff With 3d4d72c5a7 Avoid exporting git files 2015-02-18 19:50:23 +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