Commit Graph

602 Commits (467f97c11f232772309d51b02bbff8b30130ab61)

Author SHA1 Message Date
Frode Petterson 467f97c11f Use correct uuid variable 2015-04-28 12:42:36 +02:00
Thomas Marstrander 9ee8130aae Added copyrights fix. 2015-04-27 13:21:31 +02:00
Frode Petterson 66928f397e Merge branch 'master' of github.com:h5p/h5p-php-library 2015-04-27 10:15:11 +02:00
Frode Petterson e6ce2780fa Merge branch 'semi-fullscreen-z-index-fix' 2015-04-27 10:15:00 +02:00
Svein-Tore Griff With a0501eb861 Merge branch 'stable' 2015-04-22 22:58:00 +02:00
Svein-Tore Griff With ae512b2b03 Merge branch 'release' into stable 2015-04-22 14:01:56 +02:00
Frode Petterson 260b6fe044 Restrict IE FullScreen. 2015-04-22 12:55:18 +02:00
Frode Petterson 886c631461 Use correct variable. 2015-04-22 10:58:59 +02:00
Frode Petterson 9a37a99574 Re-added "Remove empty params." to master.
This reverts commit 31ee0bd51a.
2015-04-22 10:44:16 +02:00
Frode Petterson 31ee0bd51a Removed "Remove empty params." from release.
This reverts commit 8c68f23823.
2015-04-22 10:43:18 +02:00
Frode Petterson 540c96178d Merge branch 'master' of github.com:h5p/h5p-php-library 2015-04-22 09:51:45 +02:00
Frode Petterson 1c6b818841 Merge branch 'release'
Conflicts:
	js/h5p.js
2015-04-22 09:51:36 +02:00
Frode Petterson af8e9e8f30 Relay events to top window. 2015-04-22 09:49:58 +02:00
Frode Petterson c13e0a0a9a Fixed fullscreen checker. 2015-04-21 16:55:23 +02:00
Frode Petterson cdceb41d74 Prevent running multiple resizer. 2015-04-21 16:55:04 +02:00
Frode Petterson b3dea65fd8 Remove element from DOM the correct way. 2015-04-21 16:54:31 +02:00
Frode Petterson 1091890596 Fixed fullscreen checker. 2015-04-21 16:22:51 +02:00
Frode Petterson 27a0a33298 Prevent running multiple resizer. 2015-04-21 15:08:59 +02:00
Frode Petterson 8433f654af Remove element from DOM the correct way. 2015-04-21 13:56:24 +02:00
Frode Petterson 28f8a8dc8a Create a spaceholder when resizing iframes. 2015-04-21 09:09:41 +02:00
Frode Petterson 51a77c02ab Merge branch 'master' of github.com:h5p/h5p-php-library 2015-04-20 15:37:59 +02:00
Frode Petterson 59bb32fa44 Create a spaceholder when resizing iframes. 2015-04-20 15:37:49 +02:00
Frode Petterson 8c68f23823 Remove empty params. 2015-04-20 15:10:31 +02:00
Frode Petterson fba8badf1a Use URL template to support URLs of different formatting. 2015-04-20 10:30:52 +02:00
Svein-Tore Griff With 165db6ff6c externalEmbed is either false or undefined it seems 2015-04-16 20:14:53 +02:00
Svein-Tore Griff With cf7ae066ad Add disable support for uploads as well 2015-04-15 13:54:46 +02:00
Svein-Tore Griff With 09c6d5c4f8 Handle cases where a field don't have params 2015-04-14 14:01:28 +02:00
Svein-Tore Griff With 80a80aef7a Better debugging 2015-04-14 14:01:14 +02:00
Thomas Marstrander 2725f591b7 Changed z-index of semi-fullscreen to 1000 to have priority over all drupal elements. 2015-04-14 13:41:27 +02:00
Svein-Tore Griff With 9a92a61484 Make sure state is ignored when disabled 2015-04-13 20:31:21 +02:00
Svein-Tore Griff With ba2355c2ec Make sure state is ignored when disabled 2015-04-13 20:30:40 +02:00
Svein-Tore Griff With 0b609e882d Add about to disable sources and make sure each source is set 2015-04-13 19:58:41 +02:00
Svein-Tore Griff With 868c06929d Whitespace changes 2015-04-13 18:41:53 +02:00
Svein-Tore Griff With fba425220e Resolve conflicts 2015-04-13 18:32:33 +02:00
Svein-Tore Griff With 912a670607 Merge branch 'master' into upgrade-speed 2015-04-13 18:16:19 +02:00
Svein-Tore Griff With 497301d6ad Add triggerXAPIScored and deprecate triggerXAPICompleted 2015-04-09 19:42:05 +02:00
Svein-Tore Griff With 5b36e468ac Rewrite so that we add options as an object instead of a very long list of parameters 2015-04-09 14:00:00 +02:00
Frode Petterson ea26ae95db Merge tag 'wp-1.4.0' into upgrade-speed 2015-04-08 09:35:57 +02:00
Svein-Tore Griff With 5b55b78ded createH5PTitle->createTitle 2015-04-07 19:52:18 +02:00
Svein-Tore Griff With ed23b9fff0 Merge branch 'master' into aggregated-xapi 2015-04-07 19:33:48 +02:00
Svein-Tore Griff With 5c3620c637 Bubbling for event system 2015-04-07 19:33:21 +02:00
Svein-Tore Griff With efbe56001d User data fixes 2015-04-07 19:32:44 +02:00
Svein-Tore Griff With cfa747f20c Add path fixes 2015-04-07 19:30:46 +02:00
Frode Petterson 2dfdc04217 Fixed exports with development mode enabled. 2015-03-27 11:51:17 +01:00
Frode Petterson bf227bdae0 Moved in changes from Drupal. 2015-03-27 10:29:34 +01:00
Frode Petterson 7a3e6ee847 Merge branch 'aggregated-xapi' of ssh://stash.joubel.com:7999/h5p/php-core into aggregated-xapi
Conflicts:
	js/h5p.js
2015-03-27 10:27:54 +01:00
Svein-Tore Griff With 61a8e7e9e9 Make view work again as well 2015-03-24 19:36:13 +01:00
Svein-Tore Griff With 065ee4e8a2 Make editor work again 2015-03-24 19:29:28 +01:00
Svein-Tore Griff With ef7a31d2e1 Try to get back the no url branch 2015-03-24 18:55:13 +01:00
Svein-Tore Griff With 58d0d3e32c Merge branch 'no-url-fopen' into aggregated-xapi 2015-03-24 18:27:23 +01:00