Commit Graph

166 Commits (d53c1877ea13ac2bacdae0411914b81f2abde675)

Author SHA1 Message Date
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
Frank Ronny Larsen 691a1c8be5 Merge branch 'master' of ssh://stash.amendor.com:7999/h5p/h5p-core-php 2013-12-05 12:17:25 +01:00
Frank Ronny Larsen b7f14a4c44 HFJ-59: Renamed coreVersion to coreApi.
Removes annoying double naming (coreVersion.majorVersion become coreApi.majorVersion)
Explicitly states that the versioning is one the API.
Explicitly states that this is the core version. (apiVersion could mean API of the library)
2013-12-05 12:15:17 +01:00
Frode Petterson 0884bf369a Added more attrs for videos. 2013-12-03 11:36:31 +01:00
Frank Ronny Larsen 6bb9c9a9b6 HFJ-59: Added coreVersion check for libraries, and explicitly set H5PCore version to 1.0 2013-11-27 10:09:57 +01:00
Frank Ronny Larsen 47dcb931e9 Fix regexp slashes and FontAwesome dependency 2013-11-26 14:40:38 +01:00
Svein-Tore Griff With 563a5f2674 Use / instead of pipe as regexp fence in order to make pipe work inside the regexp. Needs testing 2013-11-25 23:44:45 +01:00
Svein-Tore Griff With e4c268612f Documentation updates 2013-11-18 18:03:01 +01:00
Svein-Tore Griff With 7aef062810 Clean up deletion and make sure export is deleted when node is deleted 2013-11-18 17:57:32 +01:00
Svein-Tore Griff With bdb508c877 Make export work 2013-11-18 17:45:31 +01:00
Svein-Tore Griff With f32ae3a4d4 We save the file instead of returning it for performance reasons 2013-11-17 18:26:39 +01:00
Svein-Tore Griff With 7695850799 Make sure content.json and editor libraries are included in export 2013-11-17 18:04:39 +01:00
Svein-Tore Griff With cab8e258be Export improvements 2013-11-15 01:13:00 +01:00
Svein-Tore Griff With 9dd710a8fb Renaming functions 2013-11-14 23:42:10 +01:00
Svein-Tore Griff With f98cce49a6 Make sure we only use camel case in the H5P php library 2013-11-14 14:10:55 +01:00
Svein-Tore Griff With 99ee7a47ae Documentation improvements 2013-11-14 14:05:34 +01:00
Svein-Tore Griff With 5ca6a5f39a Issue #2120227 by gafolini, Ellinokon and falcon: Add export feature to H5P 2013-11-14 13:48:07 +01:00
Frank Ronny Larsen 1d46204ac0 Merge branch 'master' of ssh://stash.amendor.com:7999/h5p/h5p-core-php
Conflicts:
	h5p.classes.php
2013-11-13 15:38:32 +01:00
Frank Ronny Larsen d9532a44ed Escape '|' characters in regexp 2013-11-13 15:36:00 +01:00
Svein-Tore Griff With 2454bcfa2a BUGFIX: The strikethrough was removed when an H5P was saved 2013-11-08 18:46:47 +01:00
Svein-Tore Griff With 1a6ef6f0fa Why are we using | instead of / around the regex? Change to / so that we may use | inside the regex 2013-11-08 18:24:42 +01:00
Svein-Tore Griff With 0d97f6952c Add iframe support and more license types 2013-11-08 18:16:41 +01:00
Frode Petterson 2720ec5f16 Added iframe support (by: Frank Ronny Larsen). 2013-10-25 15:10:50 +02:00
Svein-Tore Griff With f939e00f44 Fix styling issues for sites that has uncleard floating blocks 2013-10-21 13:22:13 +02:00
Svein-Tore Griff With ece7b5bcde Add support for GPL license in libraries 2013-09-17 15:57:13 +02:00
Svein-Tore Griff With 1549075a57 From ICC, allow extra params 2013-09-17 15:53:37 +02:00
Svein-Tore Griff With 7d989c648d Merge branch 'master' of ssh://stash.amendor.com:7999/h_core/h5p-core-php 2013-09-10 22:43:37 +02:00
Svein-Tore Griff With 6f46c5a5fa Move H5P content to top of body 2013-09-10 22:43:31 +02:00
Frank Ronny Larsen 676edc5eec BUGFIX: The saveLibraryData method is assumed to have a argument, include in Interface 2013-08-13 14:16:56 +02:00
Svein-Tore Griff With 2187777720 Add development mode 2013-08-12 08:11:11 +02:00
Svein-Tore Griff With 9a4f57fa7d Make sure that texts are texts 2013-07-24 18:01:07 +02:00
Frank Ronny Larsen 7736506b39 Avoid double encoding of htmlspecialchars, we get them encoded from editor 2013-07-17 15:11:37 +02:00
Frank Ronny Larsen 67cfc1d333 OPPG-470: More potential threats in validator 2013-07-17 12:55:51 +02:00
Svein-Tore Griff With db388d9a14 OPPG-470: Fixed several (potential) security problems
The biggest problem was that no filtering was done on lists because list values wasn't passed by referende through foreach
Also made sure lists where lists and keys where numbers
Made sure libraries only have library and semantics properties
2013-07-17 11:41:23 +02:00
Frank Ronny Larsen 46e4d67c06 Merge branch 'master' of b.amendor.com:h5p 2013-07-16 08:56:10 +02:00
Svein-Tore Griff With b69ee7c2e3 OPPG-436: Rewrote logic so that the entire library processing is skipped if the user doesn't have access to update libraries 2013-07-15 17:36:56 +02:00
Frank Ronny Larsen 6d231499e3 OPPG-459: "multiple" option for semantic type "select"
Specifies that the select shall handle multiple options.
Used by dynamicCheckboxes widget.
2013-07-15 16:25:10 +02:00