Frode Petterson 688b00f55e Merge branch 'master' into new-embed ... Conflicts: js/h5p.js		2015-02-20 10:15:36 +01:00
..
h5p-api.js	Simplified integration code to avoid to much duplication.	2015-02-09 10:22:14 +01:00
h5p-content-upgrade.js	Merge branch 'without-pal' of github.com:h5p/h5p-php-library into without-pal	2014-10-17 11:36:16 +02:00
h5p-data-view.js	Added loaded callback and support for column classes.	2014-10-20 16:52:44 +02:00
h5p-embed.js	Fixed issue #2397891 (drupal.org), and made jshint a little happier	2014-12-30 10:54:26 +01:00
h5p-event-dispatcher.js	Trigger xAPI events on top as well if inside ifra	2015-02-18 10:59:47 +01:00
h5p-library-details.js	Did some jshint cleanup and removal of empty spaces.	2014-10-01 10:18:04 +02:00
h5p-library-list.js	Merge branch 'without-pal'	2014-10-23 15:18:03 +02:00
h5p-resizer.js	Comment out semi full screen.	2015-02-09 11:51:39 +01:00
h5p-utils.js	Added loaded callback and support for column classes.	2014-10-20 16:52:44 +02:00
h5p-x-api-event.js	Make the xAPI integration work for stuff that aren't content types	2015-02-18 09:07:19 +01:00
h5p-x-api.js	Trigger xAPI events on top as well if inside ifra	2015-02-18 10:59:47 +01:00
h5p.js	Merge branch 'master' into new-embed	2015-02-20 10:15:36 +01:00
jquery.js	Removed source map ref.	2014-10-21 11:34:14 +02:00