Commit Graph

226 Commits (8d5d16652b3912547b0689f5bf84e1ad5fa70cc2)

Author SHA1 Message Date
Frode Petterson 9ed2e48fb5 Fixed parse error. 2014-11-25 10:55:32 +01:00
Pål Jørgensen 60d166c6da Made creation of h5p export file overwrite existing file 2014-11-19 12:43:59 +01:00
Pål Jørgensen 2d7824aa93 Fix for language containing empty string in H5P export (h5p.json) 2014-11-06 11:13:24 +01:00
Svein-Tore Griff With 57db1d9926 Revert "Add htmlSpecialChars"
This reverts commit 41ed0c18e4.
2014-11-03 10:15:23 +01:00
Pål Jørgensen 415e217134 Fixed URL to h5p.org 2014-11-03 07:02:45 +01:00
Svein-Tore Griff With 7c3ddea71a Become node_clone compatible again 2014-11-02 19:13:14 +01:00
Svein-Tore Griff With 41ed0c18e4 Add htmlSpecialChars 2014-11-02 17:52:39 +01:00
Pål Jørgensen 48f7969ff9 Whitespaces? 2014-11-02 16:57:57 +01:00
Pål Jørgensen 3d370da1e1 Fixed usage of non-existent function 2014-11-02 16:22:27 +01:00
Pål Jørgensen a2c84189b0 Moving external file fetching out of core 2014-11-02 14:29:13 +01:00
Pål Jørgensen f306d24f23 Moved UUID-generation to backend
Added h5pVersion in platforminfo
Avoiding json beeing cached both locally and on backend
2014-11-02 13:46:09 +01:00
Pål Jørgensen cc40f2316c Merge branch 'master' into fetch-libraries-metadata 2014-11-02 11:08:56 +01:00
Pål Jørgensen f01d002f66 Major post review changes 2014-11-01 17:05:15 +01:00
Svein-Tore Griff With 73c9f2768d Resolve conflict 2014-11-01 12:56:38 +01:00
Frode Petterson 2737f3c721 Merge branch 'without-pal'
Conflicts:
	h5p.classes.php
	js/h5p-library-list.js
2014-10-23 15:18:03 +02:00
Frode Petterson 072edf55e7 Made it possible to bypass file extension check. 2014-10-21 15:42:47 +02:00
Frode Petterson 6c471529b1 Updated comment 2014-10-17 11:38:35 +02:00
Frode Petterson a8e6854324 Use correct semantics. 2014-10-14 14:06:49 +02:00
Frode Petterson 0a8bd6a5b5 Fixed typos. 2014-10-10 13:57:43 +02:00
Frode Petterson c9914966f3 Space fix. 2014-10-10 13:56:48 +02:00
falcon c131a339a1 Finish up commenting the interface functions 2014-10-09 19:29:20 +02:00
falcon a7939bf5ad Improve comments 2014-10-08 10:16:16 +02:00
Frode Petterson a38a0f1253 Removed old caching system.
Use content variable for filtered parameters.
Added getOption/setOption.
2014-09-26 15:56:42 +02:00
Frode Petterson 09bf13ee8f Merge branch 'without-pal'
Conflicts:
	js/h5p-library-list.js
2014-09-26 12:37:11 +02:00
Frode Petterson 4b8804988e Revert "Merge branch 'adding-htmlspecialchars-to-h5p' into without-pal"
This reverts commit ab1b691a27, reversing
changes made to 2b12bf4441.
2014-09-24 15:34:55 +02:00
Frode Petterson 909fb3aca3 Merge branch 'without-pal' of github.com:h5p/h5p-php-library into without-pal 2014-09-23 15:10:42 +02:00
Frode Petterson 7fd333088b Added missing translation. 2014-09-23 15:10:23 +02:00
Pål Jørgensen ab1b691a27 Merge branch 'adding-htmlspecialchars-to-h5p' into without-pal 2014-09-23 12:59:37 +02:00
Pål Jørgensen 24be95a78e Bumped core version because of the new function added 2014-09-23 12:59:08 +02:00
Pål Jørgensen f207c3be9b Setting language on export to 'und' if not defined 2014-09-23 10:44:22 +02:00
Pål Jørgensen 7cb2ebe17c Fixed bug in validation, which made library-upload on library admin page fail 2014-09-17 15:04:55 +02:00
Pål Jørgensen 764ba2761d Fixed bug in validation, which made library-upload on library admin page fail 2014-09-05 14:12:46 +02:00
Pål Jørgensen 4729287406 Added H5PCore::getLibrariesMetadata and H5PFrameworkInterface::getPlatformInfo 2014-09-05 09:59:16 +02:00
Frode Petterson 68e7c00145 Merge branch 'master' of github.com:h5p/h5p-php-library 2014-08-26 13:24:20 +02:00
Pål Jørgensen f65af6b758 Merge branch 'master' of github.com:h5p/h5p-php-library
Conflicts:
	h5p.classes.php
2014-08-26 12:08:35 +02:00
Pål Jørgensen a75928d5a4 Updates relevant for upgrade-all-libraries feature 2014-08-26 12:00:14 +02:00
Frode Petterson 2ef3b206dc Added missing $this->. 2014-08-26 11:45:00 +02:00
Frode Petterson 4955e9da59 Did some minor refactoring of "minimum version support" to ease implementation of this in other systems. 2014-08-26 11:26:41 +02:00
Pål Jørgensen 86507a456b Changes related to listing unsupported libraries, and upgrade of all installed libraries 2014-08-22 14:03:00 +02:00
Frode Petterson be44d1fac9 Fixed so that filtered params can be stored in the contents table. 2014-08-22 11:39:15 +02:00
Frode Petterson 1da58ef039 Merge branch 'master' of github.com:h5p/h5p-php-library
Conflicts:
	h5p.classes.php
2014-08-22 11:38:10 +02:00
Frode Petterson 1a1e261dd5 Made it possible to delete libraries without having to load them again. 2014-08-22 11:36:58 +02:00
Frode Petterson 89bacfdb88 Made sure main content id isn't required.
Conflicts:
	h5p.classes.php
2014-08-22 11:36:54 +02:00
Pål Jørgensen e97fc0ae12 Merge branch 'master' of github.com:h5p/h5p-php-library 2014-08-19 10:15:14 +02:00
Pål Jørgensen 426a08e33e Added loadLibraries() to interface 2014-08-19 10:14:55 +02:00
Frode Petterson 89d437774e Added 7.x-1.x changes. 2014-08-18 14:09:38 +02:00
Frode Petterson 9adc12ea37 Added function to help convert object and array properties after getting them from the database. 2014-07-18 11:26:46 +02:00
Frode Petterson db5243383d Added support for sub-libraries in content upgrade. Also made upgrades async. 2014-06-13 15:02:26 +02:00
Frode Petterson dc2c092bc7 Added content upgrade. 2014-06-03 16:07:50 +02:00
Frode Petterson 27a5c4e2a7 Fixed cache invalidation bug. 2014-05-27 14:12:54 +02:00