0c24965305
Keep track of the latest H5P release
2015-11-11 14:13:05 +01:00
4bca7055ab
Merge branch 'master' into copy-and-paste
2015-11-04 11:38:52 +01:00
ee02f08bdb
Prevent warnings when reading the directory fails
...
(There will still be error messages)
2015-10-14 14:43:03 +02:00
78c06fb42a
Merge branch 'master' into copy-and-paste
2015-10-06 14:00:08 +02:00
1c99d7ed61
Remove the https since there are some servers that doesn't support it
2015-09-22 17:58:55 +02:00
8e3d78a2f6
Prevent use of files that belongs to other content.
2015-09-18 12:55:58 +02:00
46183a3a2e
Fixed missing equal sign.
2015-09-15 09:26:58 +02:00
cb59b9b79f
Allowing text-align on wysiwygs [HPN-115]
2015-09-09 13:28:16 +02:00
07b085e326
Use HTTPS, much safer.
2015-08-31 15:46:59 +02:00
1298643ab1
Merge branch 'master' of github.com:h5p/h5p-php-library
2015-08-10 13:04:44 +02:00
600975db8b
Inconsistent placeholder format. Causes issues in WP.
2015-08-10 13:04:38 +02:00
aa96d726bd
Merge branch 'master' of https://github.com/h5p/h5p-php-library
2015-07-20 13:05:48 +02:00
769fd219bc
API 1.6
2015-07-20 13:03:05 +02:00
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
f9e07f4b80
Merge branch 'master' of github.com:h5p/h5p-php-library
2015-06-23 11:22:41 +02:00
18638f4913
Merge branch 'master' of github.com:h5p/h5p-php-library
2015-06-22 11:23:40 +02:00
d4ea0a1255
Use warnings to tell the admin what is wrong. Removed duplicate message
2015-06-22 11:22:49 +02:00
6ad53d66f3
Improve error handling.
2015-06-22 10:02:07 +02:00
2beff66195
Do not try to validate empty params.
2015-06-16 14:52:22 +02:00
aa49bc88a2
Merge branch 'release'
2015-06-15 16:11:21 +02:00
36558b0846
Options are optional.
2015-06-15 16:11:11 +02:00
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
b399a68adc
Merge branch 'release'
...
Conflicts:
h5p.classes.php
2015-06-04 14:47:34 +02:00
aded8d1f43
Avoid errors. Merged in from D7.
2015-05-27 10:11:01 +02:00
3460e400a0
Fixed special case for export/download.
2015-05-22 15:50:00 +02:00
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
9db33dd61b
Merge branch 'release' of github.com:h5p/h5p-php-library into release
2015-05-22 13:29:04 +02:00
6ecb15a1d0
There is no disable about for content, it's only a global setting.
2015-05-22 13:28:52 +02:00
101d5aab31
There is no disable all option. Disabling frame does the same.
2015-05-22 13:28:45 +02:00
52dca53883
There is no disable all option. Disabling frame does the same.
2015-05-22 13:20:44 +02:00
7e009d00ca
There is no disable about for content, it's only a global setting.
2015-05-22 13:18:13 +02:00
99522f59bf
Skip groups that are null. This is done because groups with only one entry are concatenated with their entry.
2015-05-21 13:02:52 +02:00
834764e316
Eliminate warnings.
2015-05-20 10:55:02 +02:00
ac96408bc9
Merge branch 'release'
2015-05-18 09:41:07 +02:00
e2b6f3527e
Merge branch 'semantics-font' into release
2015-05-13 14:06:56 +02:00
85d66d52c0
Add DISABLE_ALL constant
2015-05-13 11:48:56 +02:00
a8b465adb7
Merge branch 'smart-file-names'
2015-05-13 10:16:13 +02:00
cee887901b
Make sure styles are filtered if they're not specified in the semantics.
2015-05-11 14:15:16 +02:00
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
Frode Petterson
Paal Joergensen
Svein-Tore Griff With
Thomas Marstrander
git