Commit Graph

728 Commits (5b965636e02af9f2fca2730546e5a889194f14f9)

Author SHA1 Message Date
Frode Petterson 742339ba8f Merge branch 'master' into editor-padding 2015-09-15 09:28:29 +02:00
Frode Petterson 46183a3a2e Fixed missing equal sign. 2015-09-15 09:26:58 +02:00
Frode Petterson 3e54270f4b Merge branch 'master' into editor-padding 2015-09-10 14:27:37 +02:00
Frode Petterson 2d43942c48 Use parent window instead of top for communications. 2015-09-10 14:27:12 +02:00
Frode Petterson 1cf1a38a1b Merge branch 'master' into editor-padding 2015-09-10 10:02:43 +02:00
Paal Joergensen cb59b9b79f Allowing text-align on wysiwygs [HPN-115] 2015-09-09 13:28:16 +02:00
Frode Petterson 98a7b759a9 Updated icons. 2015-09-03 09:04:04 +02:00
Frode Petterson 47d0f830d3 Removed asd 2015-09-02 15:44:38 +02:00
Frode Petterson 07b085e326 Use HTTPS, much safer. 2015-08-31 15:46:59 +02:00
Frode Petterson 3e3bba7133 Always use 100% for fullscreen. auto is needed for embed. 2015-08-27 15:10:02 +02:00
Frode Petterson 7737559dec Fixed off(). 2015-08-27 11:36:07 +02:00
Frode Petterson d8d7fdabdd Replaced nbsp. 2015-08-26 15:58:49 +02:00
Frode Petterson 1298643ab1 Merge branch 'master' of github.com:h5p/h5p-php-library 2015-08-10 13:04:44 +02:00
Frode Petterson 600975db8b Inconsistent placeholder format. Causes issues in WP. 2015-08-10 13:04:38 +02:00
Svein-Tore Griff With 8d9781f4ae Also add class when framed 2015-07-30 18:11:59 +02:00
Svein-Tore Griff With 71f147058d Rename isStandalone to isRoot and use ned libraryInfo instead of the so called ubername 2015-07-20 13:40:59 +02:00
Svein-Tore Griff With aa96d726bd Merge branch 'master' of https://github.com/h5p/h5p-php-library 2015-07-20 13:05:48 +02:00
Svein-Tore Griff With 5d1cd188d0 Add duration and scaled to result 2015-07-20 13:05:41 +02:00
Svein-Tore Griff With 769fd219bc API 1.6 2015-07-20 13:03:05 +02:00
Paal Joergensen 56e74c2d68 Renamed H5P.Base to H5P.ContentType.
Moved H5P.ContentType code to separate file.
Made H5P.ContentType extend H5P.EventDispatcher.
2015-07-17 13:32:35 +02:00
Paal Joergensen 8cf384f46a Fixed H5P.Base.getLibraryFilePath() bug 2015-07-14 14:46:35 +02:00
Paal Joergensen e36582c714 Added H5P base class that all H5P libraries automatically extends 2015-07-14 14:37:39 +02:00
Svein-Tore Griff With 03370c9500 Add info about the library being used to the xAPI statements 2015-07-10 12:58:02 +02:00
Svein-Tore Griff With 8431304dd0 Remove todos 2015-07-10 11:41:28 +02:00
Frode Petterson 8b9eed2349 Auto seems to work much better if embedded content gets scollbars. 2015-07-07 13:53:20 +02:00
Frode Petterson b30ae98858 Added logo. 2015-07-07 13:25:53 +02:00
Frode Petterson 1764e80511 Merge branch 'master' of github.com:h5p/h5p-php-library 2015-06-25 15:15:04 +02:00
Frode Petterson 3e21226b3b No decimals in embed dialog. 2015-06-25 15:14:55 +02:00
Frode Petterson 3d4165df55 Use local variable. 2015-06-23 14:24:19 +02:00
Frode Petterson f9e07f4b80 Merge branch 'master' of github.com:h5p/h5p-php-library 2015-06-23 11:22:41 +02:00
Frode Petterson 89a03eba8a Merge branch 'master' of github.com:h5p/h5p-php-library 2015-06-23 11:12:38 +02:00
Frode Petterson b9229ba75f Don't try to get data when there's no user. 2015-06-23 11:12:29 +02:00
Frode Petterson 18638f4913 Merge branch 'master' of github.com:h5p/h5p-php-library 2015-06-22 11:23:40 +02:00
Frode Petterson d4ea0a1255 Use warnings to tell the admin what is wrong. Removed duplicate message 2015-06-22 11:22:49 +02:00
Frode Petterson 6ad53d66f3 Improve error handling. 2015-06-22 10:02:07 +02:00
Frode Petterson 2beff66195 Do not try to validate empty params. 2015-06-16 14:52:22 +02:00
Frode Petterson aa49bc88a2 Merge branch 'release' 2015-06-15 16:11:21 +02:00
Frode Petterson 36558b0846 Options are optional. 2015-06-15 16:11:11 +02:00
Frode Petterson d8cf40623e Improved error handling in case upload dir isn't writable, zip isn't enabled or folders are missing. 2015-06-15 14:57:51 +02:00
Frode Petterson b399a68adc Merge branch 'release'
Conflicts:
	h5p.classes.php
2015-06-04 14:47:34 +02:00
Frode Petterson c40d273704 Fixed this arg for external dispatcher. 2015-06-04 14:39:02 +02:00
Frode Petterson aded8d1f43 Avoid errors. Merged in from D7. 2015-05-27 10:11:01 +02:00
Frode Petterson 3460e400a0 Fixed special case for export/download. 2015-05-22 15:50:00 +02:00
Frode Petterson d85815b3be Keep the content's disable settings when re-saving after global options have changed. (More consistent and reliable) 2015-05-22 15:31:28 +02:00
Frode Petterson 9db33dd61b Merge branch 'release' of github.com:h5p/h5p-php-library into release 2015-05-22 13:29:04 +02:00
Frode Petterson 6ecb15a1d0 There is no disable about for content, it's only a global setting. 2015-05-22 13:28:52 +02:00
Frode Petterson 101d5aab31 There is no disable all option. Disabling frame does the same. 2015-05-22 13:28:45 +02:00
Frode Petterson 52dca53883 There is no disable all option. Disabling frame does the same. 2015-05-22 13:20:44 +02:00
Frode Petterson 7e009d00ca There is no disable about for content, it's only a global setting. 2015-05-22 13:18:13 +02:00
Thomas Marstrander d5979f1bcc Merge branch 'release' of https://github.com/h5p/h5p-php-library into release 2015-05-21 13:03:28 +02:00