e404c3ac68
Allow certain style tags on spans.
2015-05-08 16:06:04 +02:00
467f97c11f
Use correct uuid variable
2015-04-28 12:42:36 +02:00
31872111eb
Use content.
2015-04-27 15:20:40 +02:00
4683e61fa7
Delete correct export file.
2015-04-27 13:13:00 +02:00
ccccec84e7
Use correct path.
2015-04-22 15:19:01 +02:00
3eea931332
Merge branch 'release' into smart-file-names
2015-04-22 13:42:17 +02:00
9a37a99574
Re-added "Remove empty params." to master.
...
This reverts commit 31ee0bd51a
2015-04-22 10:44:16 +02:00
31ee0bd51a
Removed "Remove empty params." from release.
...
This reverts commit 8c68f23823
2015-04-22 10:43:18 +02:00
8c68f23823
Remove empty params.
2015-04-20 15:10:31 +02:00
cf7ae066ad
Add disable support for uploads as well
2015-04-15 13:54:46 +02:00
0b609e882d
Add about to disable sources and make sure each source is set
2015-04-13 19:58:41 +02:00
868c06929d
Whitespace changes
2015-04-13 18:41:53 +02:00
fba425220e
Resolve conflicts
2015-04-13 18:32:33 +02:00
5c3620c637
Bubbling for event system
2015-04-07 19:33:21 +02:00
efbe56001d
User data fixes
2015-04-07 19:32:44 +02:00
cfa747f20c
Add path fixes
2015-04-07 19:30:46 +02:00
5adffcaeb8
Added content id.
2015-04-07 15:36:28 +02:00
61a8e7e9e9
Make view work again as well
2015-03-24 19:36:13 +01:00
065ee4e8a2
Make editor work again
2015-03-24 19:29:28 +01:00
ef7a31d2e1
Try to get back the no url branch
2015-03-24 18:55:13 +01:00
44e8cba365
Merge branch 'master' into aggregated-xapi
2015-03-22 13:14:40 +01:00
1c4a5e014b
Comment out prefixing that isn't working
2015-03-22 13:12:44 +01:00
e76fc9eff3
Merge branch 'no-url-fopen' of https://github.com/h5p/h5p-php-library
2015-03-22 12:46:41 +01:00
b79a5b61b8
uuid consists of lowercase letters
2015-03-22 12:42:07 +01:00
313bb757ba
Add bubble system and xAPI context
2015-03-21 16:45:38 +01:00
e6e3ee7559
Allow assets to be relative to another location.
...
Allow assets to contain external URLs.
2015-03-20 11:28:21 +01:00
8494e85c3e
Remove todo items
2015-03-19 19:27:44 +01:00
51a1d333e2
Improved packaging. Made sure zip format is followed by always using forward slashes. This will make h5p export work on Windows.
2015-03-19 16:58:48 +01:00
1b28c7b128
Use different vars for URL and file path to avoid having allow_url_fopen = On.
2015-03-18 14:25:55 +01:00
6541faf8ba
Renamed humanId => slug.
...
Moved most of the slug generating code out of the framework and into core.
Remove old export files.
Use old export file until new slug is generated.
Added support for converting more special chars.
2015-03-13 15:17:19 +01:00
c35d7f8334
Added support for generating human readable H5P file names.
2015-03-12 14:38:10 +01:00
2b1c894307
Merge branch 'master' into settings
...
Conflicts:
h5p.classes.php
2015-02-19 15:50:04 +01:00
95a0b000db
Remove scary error messages
2015-02-18 19:58:03 +01:00
3d4d72c5a7
Avoid exporting git files
2015-02-18 19:50:23 +01:00
c330282351
Refactor xAPI code
2015-02-16 16:47:04 +01:00
84f8fb1cff
Merge branch 'master' of github.com:h5p/h5p-php-library
2015-02-12 16:00:41 +01:00
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
8d7ce8f4f1
Merge branch 'master' of https://github.com/h5p/h5p-php-library
2015-02-12 15:46:55 +01:00
c4aedca522
Resolve conflicts
2015-02-11 18:02:25 +01:00
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
fb77a4d20d
bugfix.
2015-02-10 16:40:23 +01:00
c764d13b32
Moved display options helpers into core.
2015-02-10 16:29:16 +01:00
a090468657
Merge branch 'text-editor'
2015-02-05 12:01:16 +01:00
fc4f791e6e
Bump core api version
2015-02-03 20:15:15 +01:00
efdd7f9f7a
Moving x-api and Event handling code to separate files and refining it
2015-02-03 20:11:01 +01:00
f66e6a3ce9
Merge branch 'manually-move-files'
2015-02-03 14:02:54 +01:00
e12ba70b95
Merge branch 'master' into adaptivity
2015-02-03 13:44:52 +01:00
daa91b1372
Merge branch 'master' into text-editor
2015-02-02 14:28:52 +01:00
ae6329595b
Add ordering of libraries
2015-01-30 10:59:40 +01:00
ead790ae1a
Make sure fields in optional groups also becomes optional.
2015-01-20 14:48:22 +01:00
8cee9820b0
Merge branch 'master' into text-editor
2015-01-13 13:38:51 +01:00
ae8609dd86
Replaced another rename function.
2015-01-09 10:00:40 +01:00
e7b7cd2abe
Issue https://www.drupal.org/node/2402099 by drinkdecaf: H5P on Pantheon Environments
2015-01-09 09:59:29 +01:00
7dfab8393f
Merge branch 'atomic-dev-mode' into text-editor
2014-12-03 16:10:50 +01:00
fb07f54e35
Make it possible to do the dependency transactions in an atomic way
2014-11-27 23:14:15 +01:00
9ed2e48fb5
Fixed parse error.
2014-11-25 10:55:32 +01:00
60d166c6da
Made creation of h5p export file overwrite existing file
2014-11-19 12:43:59 +01:00
2bba9a183b
Bumped api version.
2014-11-10 11:35:15 +01:00
bc5159e272
Added event dispatcher.
2014-11-10 11:31:23 +01:00
2d7824aa93
Fix for language containing empty string in H5P export (h5p.json)
2014-11-06 11:13:24 +01:00
57db1d9926
Revert "Add htmlSpecialChars"
...
This reverts commit 41ed0c18e4
2014-11-03 10:15:23 +01:00
415e217134
Fixed URL to h5p.org
2014-11-03 07:02:45 +01:00
7c3ddea71a
Become node_clone compatible again
2014-11-02 19:13:14 +01:00
41ed0c18e4
Add htmlSpecialChars
2014-11-02 17:52:39 +01:00
48f7969ff9
Whitespaces?
2014-11-02 16:57:57 +01:00
3d370da1e1
Fixed usage of non-existent function
2014-11-02 16:22:27 +01:00
a2c84189b0
Moving external file fetching out of core
2014-11-02 14:29:13 +01:00
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
cc40f2316c
Merge branch 'master' into fetch-libraries-metadata
2014-11-02 11:08:56 +01:00
f01d002f66
Major post review changes
2014-11-01 17:05:15 +01:00
73c9f2768d
Resolve conflict
2014-11-01 12:56:38 +01:00
2737f3c721
Merge branch 'without-pal'
...
Conflicts:
h5p.classes.php
js/h5p-library-list.js
2014-10-23 15:18:03 +02:00
072edf55e7
Made it possible to bypass file extension check.
2014-10-21 15:42:47 +02:00
6c471529b1
Updated comment
2014-10-17 11:38:35 +02:00
a8e6854324
Use correct semantics.
2014-10-14 14:06:49 +02:00
0a8bd6a5b5
Fixed typos.
2014-10-10 13:57:43 +02:00
c9914966f3
Space fix.
2014-10-10 13:56:48 +02:00
c131a339a1
Finish up commenting the interface functions
2014-10-09 19:29:20 +02:00
a7939bf5ad
Improve comments
2014-10-08 10:16:16 +02:00
a38a0f1253
Removed old caching system.
...
Use content variable for filtered parameters.
Added getOption/setOption.
2014-09-26 15:56:42 +02:00
09bf13ee8f
Merge branch 'without-pal'
...
Conflicts:
js/h5p-library-list.js
2014-09-26 12:37:11 +02:00
4b8804988e
Revert "Merge branch 'adding-htmlspecialchars-to-h5p' into without-pal"
...
This reverts commit ab1b691a272b12bf4441
2014-09-24 15:34:55 +02:00
909fb3aca3
Merge branch 'without-pal' of github.com:h5p/h5p-php-library into without-pal
2014-09-23 15:10:42 +02:00
7fd333088b
Added missing translation.
2014-09-23 15:10:23 +02:00
ab1b691a27
Merge branch 'adding-htmlspecialchars-to-h5p' into without-pal
2014-09-23 12:59:37 +02:00
24be95a78e
Bumped core version because of the new function added
2014-09-23 12:59:08 +02:00
f207c3be9b
Setting language on export to 'und' if not defined
2014-09-23 10:44:22 +02:00
7cb2ebe17c
Fixed bug in validation, which made library-upload on library admin page fail
2014-09-17 15:04:55 +02:00
764ba2761d
Fixed bug in validation, which made library-upload on library admin page fail
2014-09-05 14:12:46 +02:00
4729287406
Added H5PCore::getLibrariesMetadata and H5PFrameworkInterface::getPlatformInfo
2014-09-05 09:59:16 +02:00
68e7c00145
Merge branch 'master' of github.com:h5p/h5p-php-library
2014-08-26 13:24:20 +02:00
f65af6b758
Merge branch 'master' of github.com:h5p/h5p-php-library
...
Conflicts:
h5p.classes.php
2014-08-26 12:08:35 +02:00
a75928d5a4
Updates relevant for upgrade-all-libraries feature
2014-08-26 12:00:14 +02:00
2ef3b206dc
Added missing $this->.
2014-08-26 11:45:00 +02:00
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
86507a456b
Changes related to listing unsupported libraries, and upgrade of all installed libraries
2014-08-22 14:03:00 +02:00
be44d1fac9
Fixed so that filtered params can be stored in the contents table.
2014-08-22 11:39:15 +02:00
1da58ef039
Merge branch 'master' of github.com:h5p/h5p-php-library
...
Conflicts:
h5p.classes.php
2014-08-22 11:38:10 +02:00
1a1e261dd5
Made it possible to delete libraries without having to load them again.
2014-08-22 11:36:58 +02:00
89bacfdb88
Made sure main content id isn't required.
...
Conflicts:
h5p.classes.php
2014-08-22 11:36:54 +02:00
Frode Petterson
Svein-Tore Griff With
git
Pål Jørgensen
Pål Jørgensen