EDUCATIC
/
h5p-php-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
643 Commits
28 Branches
133 Tags
3.5 MiB
Commit Graph

302 Commits (b9229ba75fb458355acfb0b2d12cec723b719900)

Author SHA1 Message Date
Frode Petterson 2b1c894307 Merge branch 'master' into settings 
Conflicts:
	h5p.classes.php
 2015-02-19 15:50:04 +01:00
Svein-Tore Griff With 95a0b000db Remove scary error messages 2015-02-18 19:58:03 +01:00
Svein-Tore Griff With 3d4d72c5a7 Avoid exporting git files 2015-02-18 19:50:23 +01:00
Svein-Tore Griff With c330282351 Refactor xAPI code 2015-02-16 16:47:04 +01:00
Frode Petterson 84f8fb1cff Merge branch 'master' of github.com:h5p/h5p-php-library 2015-02-12 16:00:41 +01:00
Frode Petterson 1d24d073ed Moved "libraries saving" out of savePackage to make it easier to read and handle. Added UI messages when adding and updating libraries. Minor code optimizations. 2015-02-12 15:56:31 +01:00
Svein-Tore Griff With 8d7ce8f4f1 Merge branch 'master' of https://github.com/h5p/h5p-php-library 2015-02-12 15:46:55 +01:00
Svein-Tore Griff With c4aedca522 Resolve conflicts 2015-02-11 18:02:25 +01:00
Frode Petterson 42fbb6ab1f Reverse direction of dependency loading. The libraries used last in the parameters are now loaded first, e.g. summary is now loaded before iv! 2015-02-11 14:40:01 +01:00
Frode Petterson fb77a4d20d bugfix. 2015-02-10 16:40:23 +01:00
Frode Petterson c764d13b32 Moved display options helpers into core. 2015-02-10 16:29:16 +01:00
Svein-Tore Griff With a090468657 Merge branch 'text-editor' 2015-02-05 12:01:16 +01:00
Svein-Tore Griff With fc4f791e6e Bump core api version 2015-02-03 20:15:15 +01:00
Svein-Tore Griff With efdd7f9f7a Moving x-api and Event handling code to separate files and refining it 2015-02-03 20:11:01 +01:00
Svein-Tore Griff With f66e6a3ce9 Merge branch 'manually-move-files' 2015-02-03 14:02:54 +01:00
Svein-Tore Griff With e12ba70b95 Merge branch 'master' into adaptivity 2015-02-03 13:44:52 +01:00
Svein-Tore Griff With daa91b1372 Merge branch 'master' into text-editor 2015-02-02 14:28:52 +01:00
Svein-Tore Griff With ae6329595b Add ordering of libraries 2015-01-30 10:59:40 +01:00
Frode Petterson ead790ae1a Make sure fields in optional groups also becomes optional. 2015-01-20 14:48:22 +01:00
Frode Petterson 8cee9820b0 Merge branch 'master' into text-editor 2015-01-13 13:38:51 +01:00
Frode Petterson ae8609dd86 Replaced another rename function. 2015-01-09 10:00:40 +01:00
git e7b7cd2abe Issue https://www.drupal.org/node/2402099 by drinkdecaf: H5P on Pantheon Environments 2015-01-09 09:59:29 +01:00
Svein-Tore Griff With 7dfab8393f Merge branch 'atomic-dev-mode' into text-editor 2014-12-03 16:10:50 +01:00
falcon fb07f54e35 Make it possible to do the dependency transactions in an atomic way 2014-11-27 23:14:15 +01:00
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
Frode Petterson 2bba9a183b Bumped api version. 2014-11-10 11:35:15 +01:00
Frode Petterson bc5159e272 Added event dispatcher. 2014-11-10 11:31:23 +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
Frode Petterson 2053b43024 Recreate .h5p when content cache is rebuilt. Avoid loading content dependencies multiple times. 2014-05-27 14:05:20 +02:00
Frode Petterson 43d239c6f1 Temporarily disabled content development mode until we can work out how it should work. 2014-05-27 13:07:53 +02:00
Frode Petterson c5b32fb621 Moved content cache control to core. Made sure updating a library invalidates caches for all content who uses it. All saving of content and filtering of parameters is now handled by core. 
ContentValidator now collects a flat list of content dependencies.
 2014-05-27 10:55:46 +02:00
Frode Petterson 4a32f976e5 Bumped api version. 2014-05-23 16:15:15 +02:00
Frode Petterson 08f8c46544 Changed getDependenciesFiles format to make it easier to use on all systems. 2014-05-09 10:48:05 +02:00
Frode Petterson 86441f4bec Be able to skip cache busting on dependency files. 
Renamed tmp to temp.
Suppress errors when moving content folder.
Made sure loaded development libraries bring their semantics.
 2014-05-08 16:28:36 +02:00
Frode Petterson 48b07c46f5 Adapted and simplified export, makes it easier to implement on new systems and improves performance. 2014-05-07 16:43:48 +02:00
Frode Petterson 34d65b9601 Changed savePackage so it's easier to send along extra content data. 2014-05-06 16:52:43 +02:00
Frode Petterson 700fc1c67b Added individual cache busting to dependency files. Improves performance and is useful for systems without a cache buster string / js aggr. 2014-05-06 11:48:36 +02:00
Frode Petterson fd9a41f957 Quickfix so WP can get the id of new content. (used for redirect) 2014-04-28 15:09:07 +02:00
Frode Petterson 568637a718 Merge branch 'master' of github.com:h5p/h5p-php-library 2014-04-22 16:34:55 +02:00
Frode Petterson ea6a226069 Added support for auto increment on content id when saving packages. 
Made core create directories if they doesn't exist.
Added md and textile to file whitelist.
 2014-04-22 16:33:01 +02:00
Frode Petterson c83092f747 Imported changes from 7.x-1.x 2014-04-14 10:50:37 +02:00
Frode Petterson 9e01bbfb81 Imported changes from Drupal 6.x. 2014-04-13 15:52:12 +02:00
Frode Petterson c77b6ee19e Fixed some notices by setting default values. 2014-03-26 08:47:56 +01:00
Frode Petterson 81feec677d Synced library with module 6.x-1.x. 2014-03-26 08:43:29 +01:00
Frode Petterson c06123a21e Revert "BUGFIX: Replace str_replace with preg_quote" 
This reverts commit ec10ce034e.
 2014-02-11 13:47:24 +01:00
Frode Petterson 7d8d85f450 Merged in library changes. 2014-02-11 13:45:40 +01:00
Frode Petterson ced3f8e711 Moved css into library. 2014-01-29 16:03:51 +01:00
Frode Petterson b3c3aed32a Removed deprecated js. 2014-01-02 15:41:56 +01:00
Frode Petterson cca335b731 Merge branch 'master' of ssh://stash.amendor.com:7999/h5p/h5p-core-php 2013-12-20 13:34:18 +01:00
Frode Petterson 7a3888a367 Prevent copy of trees that does not exist. 2013-12-20 13:31:08 +01:00
Frank Ronny Larsen ec10ce034e BUGFIX: Replace str_replace with preg_quote 2013-12-18 11:32:57 +01:00
Frank Ronny Larsen e893086931 BUGFIX: Unknown regexp modifier 'k' removed 2013-12-18 11:32:18 +01:00