Commit Graph

678 Commits (ee02f08bdb54d2882b4b97e99979aa070a4aed93)

Author SHA1 Message Date
Thomas Marstrander 99522f59bf Skip groups that are null. This is done because groups with only one entry are concatenated with their entry. 2015-05-21 13:02:52 +02:00
Frode Petterson 3a0abf935e Merge branch 'release' 2015-05-21 10:17:06 +02:00
Frode Petterson 8e82b515a2 Prevent updating pagination when there's no table. 2015-05-21 09:50:58 +02:00
Frode Petterson 834764e316 Eliminate warnings. 2015-05-20 10:55:02 +02:00
Svein-Tore Griff With 227e0829fd Avoid printing very scary error message for all old interactive videos 2015-05-18 15:14:33 +02:00
Frode Petterson ac96408bc9 Merge branch 'release' 2015-05-18 09:41:07 +02:00
Frode Petterson 3f6abd722d Prevent crashing if getCopyrights fail. 2015-05-15 12:21:23 +02:00
Svein-Tore Griff With e2b6f3527e Merge branch 'semantics-font' into release 2015-05-13 14:06:56 +02:00
Svein-Tore Griff With 85d66d52c0 Add DISABLE_ALL constant 2015-05-13 11:48:56 +02:00
Paal Joergensen a8b465adb7 Merge branch 'smart-file-names' 2015-05-13 10:16:13 +02:00
Svein-Tore Griff With eb6ec29cb6 Remove deprecated name 2015-05-12 16:09:36 +02:00
Frode Petterson ca0c848e0f Use correct element. 2015-05-12 10:04:21 +02:00
Frode Petterson 5568a59854 Pre-generate copyright information. 2015-05-11 16:00:55 +02:00
Frode Petterson cee887901b Make sure styles are filtered if they're not specified in the semantics. 2015-05-11 14:15:16 +02:00
Frode Petterson e404c3ac68 Allow certain style tags on spans. 2015-05-08 16:06:04 +02:00
Frode Petterson ba862f0078 Embed: Always br. Get w/h from correct el. 2015-05-07 15:16:59 +02:00
Frode Petterson e0534dd778 Fixed frame disable broken. Probably a merge gone wrong. 2015-05-07 15:13:28 +02:00
Frode Petterson ccc03782df Cleaned up docs to make JSdoc generation more meaningful. 2015-05-05 13:13:57 +02:00
Frode Petterson 467f97c11f Use correct uuid variable 2015-04-28 12:42:36 +02:00
Frode Petterson 31872111eb Use content. 2015-04-27 15:20:40 +02:00
Thomas Marstrander 9ee8130aae Added copyrights fix. 2015-04-27 13:21:31 +02:00
Frode Petterson 4683e61fa7 Delete correct export file. 2015-04-27 13:13:00 +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
Frode Petterson ccccec84e7 Use correct path. 2015-04-22 15:19:01 +02:00
Svein-Tore Griff With ae512b2b03 Merge branch 'release' into stable 2015-04-22 14:01:56 +02:00
Frode Petterson 3eea931332 Merge branch 'release' into smart-file-names 2015-04-22 13:42:17 +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