95cfaf6b9e
Merge branch 'master' into improved-file-handling
2017-01-26 14:12:43 +01:00
e02df35bb1
Fix compability with PHP <5.4
...
Big thanks to andyrandom at drupal.org for providing the fix.
2017-01-26 10:37:26 +01:00
a41df0ad9e
Merge branch 'master' into improved-file-handling
2016-12-21 15:17:56 +01:00
e00bdbd125
Making sure displayoptions.icon is a boolean [HFP-277]
2016-12-21 15:17:36 +01:00
20042fba85
Merge branch 'master' into improved-file-handling
2016-12-21 13:34:06 +01:00
117e1457b7
Merge branch 'master' into improved-embed-and-download
2016-12-20 14:37:52 +01:00
87ec43d687
Using constants for the different display options, and avoid special cases [HFP-277]
2016-12-16 14:22:03 +01:00
7b39a6900c
Inheriting global disable setting for export & embed when saving [HFP-277]
2016-12-16 13:29:18 +01:00
ea0362c3da
Making lines shorter [HFP-277]
2016-12-16 13:27:40 +01:00
a1e68d212b
Updated comments [HFP-277]
2016-12-16 11:38:47 +01:00
cfd6cb1e63
Fixed download/embed button bug when permissions are used
2016-12-13 15:57:05 +01:00
a326066c97
Only set tutorial url if it exists.
...
HFP-348
2016-12-13 11:36:28 +01:00
e69a81f403
Added description of new interface method [HFP-277]
2016-12-13 10:33:59 +01:00
0a23dc043d
Download and embed granularity (HFP-277)
2016-12-13 10:29:33 +01:00
a4d6f3aaab
Restore deprecated variable H5P.canHasFullScreen for backwards compatability
...
HFP-339
2016-12-12 11:28:59 +01:00
47c35d5135
Merge branches 'master' and 'stable' of https://github.com/h5p/h5p-php-library
2016-12-06 11:35:24 +01:00
4d010ef38f
Improved message presented to user
2016-12-01 11:34:28 +01:00
ed1fb00745
Merge branch 'release' into improved-file-handling
2016-11-30 11:19:08 +01:00
32d06356b1
Bump to version 1.11
...
Relates to: #HFP-285
2016-11-29 16:44:20 +01:00
5494443533
validateGroup must handle isSubContent
...
* Update validateGroup in h4p.classes.php to allow subContentId into the data
* Fix h5p-content-upgrade-process.js to take into account isSubContent
Relates to: #HFP-285
2016-11-29 15:44:32 +01:00
0882879552
Allow subContentId in group validation. Relates to: #HFP-285
2016-11-28 14:55:57 +01:00
b4615e01b1
Allow subContentId in group validation. Relates to: #HFP-285
2016-11-28 14:54:33 +01:00
08a1cece26
Merge branch 'master' into improved-file-handling
2016-10-27 11:20:18 +02:00
f28036ca0e
Bumped core API version because of API changes in editor
2016-10-21 09:53:59 +02:00
c9e5680e85
Merge branch 'master' into improved-file-handling
2016-10-03 15:12:32 +02:00
e4266efb22
Added framework method to clear dirsize cache
...
HFP-23
2016-09-30 13:41:50 +02:00
ce796cf0cf
don't fail silently in createExportFile
2016-09-26 12:05:02 +02:00
1c5b9707e5
Regenerate export if missing on view
...
Thanks to paravibe on Drupal.org for contributing.
2016-09-23 10:52:40 +02:00
263a987eeb
Added document root when creating zip
...
Thanks to paravibe on Drupal.org for contributing.
2016-09-23 10:31:55 +02:00
f0e7ea1283
Merge branch 'moodle-rc3' into improved-file-handling
2016-09-23 10:14:19 +02:00
5f38e2b7f8
Bumped core because of bugfix for optional selects [HFJ-2183]
2016-09-21 13:22:35 +02:00
fd34af6964
Use content array instead of just id
...
Makes it easier when additional properties are needed.
Also, don't try to translate PHP exception messages.
h5p/h5p-moodle-plugin#112
2016-09-14 10:44:10 +02:00
2896c9fdab
Revert "Added content ID to export handlers"
...
This reverts commit 7fca1d100d
2016-09-08 14:48:08 +02:00
7fca1d100d
Added content ID to export handlers
...
This is to enable for proper access control.
h5p/h5p-moodle-plugin#112
2016-09-08 13:32:57 +02:00
5b8836b5be
Making select beeing able to be optional
2016-08-29 15:54:48 +02:00
888a46844b
Bumped core version
2016-08-02 12:57:43 +02:00
832aebf5e0
Moved regexp from editor to core
...
HFJ-2099
2016-07-29 14:15:00 +02:00
1ef52dfafe
Merge branch 'release' of github.com:h5p/h5p-php-library into release
2016-07-29 13:47:17 +02:00
44633fc1db
Updated regexp to support existing content to new content copy
...
HFJ-2099
2016-07-29 13:46:14 +02:00
8b31f88ca8
Increase performance by removing unused code
2016-07-27 16:17:58 +02:00
43748bc4b8
Add documentation regarding stylePatterns
2016-07-15 15:33:11 +02:00
406a55be5c
Excessive calls to variable_set HFJ-1893
2016-06-21 13:26:39 +02:00
18e2b79cc6
Merge branch 'master' of github.com:h5p/h5p-php-library
2016-06-21 09:34:37 +02:00
8cb0aad09e
Allow hyphens in HTML tags HFJ-1951
2016-06-21 09:34:27 +02:00
6caf44e54b
Added checks for mbstring PHP extension [HFJ-1996]
2016-06-08 11:28:07 +02:00
0d6fac4099
Merge branch 'release' of github.com:h5p/h5p-php-library into release
2016-06-03 12:53:12 +02:00
c2f5feaae5
Improved error message for req core version
...
HFJ-1959
2016-05-31 10:51:59 +02:00
cc121b2f53
Bugfix: Must be able to run from CLI
2016-05-13 13:42:44 +02:00
76e813a32e
Update h5p.classes.php
...
Prevents H5P From breaking console PHP commands
2016-04-23 23:40:46 -04:00
414751aad2
Fixed uploading packages and export functionality with development mode.
...
Changed update package to save package, update package was moved from interface in january, replaced with savePackage.
Added optional parameter to exportLibrary where you can pass in development folder path for the library if it lives inside development folder.
HVP-147
2016-04-21 11:38:14 +02:00
29a8601595
Major clean up of both syntactical errors and spelling
2016-04-13 00:01:15 -04:00
cdfb810501
Merge branch 'release'
2016-04-12 14:39:59 +02:00
7474916f3a
scripts and styles arrays must always be defined
2016-04-12 11:37:55 +02:00
41c98cc13c
Merge branch 'master' of github.com:h5p/h5p-php-library
2016-04-06 11:47:16 +02:00
e0d3c2e1e0
Merge branch 'release'
2016-04-06 11:47:06 +02:00
35a7213a67
Added confirmation dialog.
...
HFJ-1572
2016-04-05 18:35:02 +02:00
127dc4f0e1
Use correct ID when copying package
2016-04-05 16:06:09 +02:00
cdfab4d4b6
Merge branch 'master' of github.com:h5p/h5p-php-library
2016-04-04 11:12:16 +02:00
a11e8d4365
Bumped coreApi version to reflect editor changes
2016-04-04 11:11:18 +02:00
17ad3d4825
Merge branch 'master' of https://github.com/h5p/h5p-php-library
2016-03-31 16:09:23 +02:00
4d277b2304
Added version number and links to licenses.
...
HFJ-1734
2016-03-31 16:07:45 +02:00
d912232433
Merge remote-tracking branch 'origin/more-font-styling' into release
2016-03-29 12:24:42 +02:00
f05d3b3bf5
Merge branch 'image-editing' into release
2016-03-29 11:43:30 +02:00
41464cb98c
Corrected lib array
2016-03-21 12:35:44 +01:00
62e2f41884
Merged stuff
2016-03-21 11:56:56 +01:00
007137c257
Merge branch 'master' of github.com:h5p/h5p-php-library
...
Conflicts:
h5p.classes.php
2016-03-21 11:51:45 +01:00
b8a3965c6e
Merge branch 'master' into file-storage-interface
...
Conflicts:
h5p.classes.php
2016-03-16 10:01:13 +01:00
5229e82764
Merge branch 'improved-ajax'
2016-03-15 16:09:01 +01:00
de175737ea
Use correct variable
2016-03-10 16:33:53 +01:00
89227e4639
Merge branch 'master' into image-editing
2016-03-10 14:22:04 +01:00
61ae8899cb
Merge branch 'master' into event-logging
...
Conflicts:
h5p.classes.php
2016-03-10 14:21:04 +01:00
f05a370b42
Merge branch 'event-logging' of github.com:h5p/h5p-php-library into event-logging
...
Conflicts:
h5p.classes.php
2016-03-10 14:19:30 +01:00
5b965636e0
Revert "HFJ-1610 - Gather statistics on dev or prod server."
...
This reverts commit 9b76fccfce
2016-03-10 14:14:39 +01:00
36c8bf3362
Revert "HFJ-1610 - Track number of contents per library type."
...
This reverts commit 2e0498cd3a
2016-03-10 14:14:33 +01:00
13a2988414
Revert "HFJ-1610 - Track libraries installed."
...
This reverts commit 5287d455b2
2016-03-10 14:14:00 +01:00
0218493eab
Added support for two more font styling options
...
HFJ-1646
2016-03-09 11:18:21 +01:00
437598aa8e
Use key to avoid bugs
2016-03-07 10:58:39 +01:00
4ed368f5e7
Ratio added as field instead of parameter, removed from whitelist.
...
HFJ-1645
2016-03-06 13:40:50 +01:00
ee245f9344
Whitelisted originalImage and ratio when validating Image.
...
HFJ-1645
2016-03-06 13:27:10 +01:00
fa7b42120d
Merge branch 'master' of https://github.com/h5p/h5p-php-library into image-editing
2016-03-06 11:42:37 +01:00
54ca645e2c
Whitelisted originalImage attribute when filtering params.
...
HFJ-1645
2016-03-06 11:42:24 +01:00
93fd710509
Fixed typo
...
HFJ-1610
2016-03-04 13:56:05 +01:00
b42193729e
Merge branch 'improved-ajax' into improved-ajax-moodle
...
Conflicts:
h5p.classes.php
2016-02-25 14:55:27 +01:00
0430e6ba28
Put AJAX response functions in core
2016-02-25 13:46:05 +01:00
92e4ab0f9e
Merge branches 'file-storage-interface' and 'master' of https://github.com/h5p/h5p-php-library into file-storage-interface
2016-02-24 09:49:11 +01:00
6bfffbcf30
Added woff2 as a safe file type
2016-02-23 13:10:08 +01:00
7a87735f02
Removed sub_type from stats
...
HFJ-1610
2016-02-11 09:53:16 +01:00
4cf7a32b4a
Get data from counters instead of log
...
HFJ-1610
2016-02-10 11:54:20 +01:00
2a20dc23ae
Use correct format
...
HFJ-1610
2016-02-09 13:52:35 +01:00
b16b0c1e0b
We're going to need authors
2016-02-09 10:55:44 +01:00
cf3373d4ee
Changes in format to be more POST friendly
...
HFJ-1610
2016-02-09 10:54:04 +01:00
c4011e3bbb
Use POST to get H5P updates
...
HFJ-1610
2016-02-08 11:39:21 +01:00
70baeb55a1
Add local ID from path
...
HFJ-1610
2016-02-08 10:38:53 +01:00
fa90b0a1c3
Use correct variable
2016-02-05 11:09:57 +01:00
292e04de5d
Combine library statistics
...
HFJ-1610
2016-02-04 16:34:32 +01:00
971e035626
Skip local check if network
...
HFJ-1610
2016-02-04 15:15:35 +01:00
5287d455b2
HFJ-1610 - Track libraries installed.
2016-02-03 15:58:49 +01:00
2e0498cd3a
HFJ-1610 - Track number of contents per library type.
2016-02-03 15:36:35 +01:00
9b76fccfce
HFJ-1610 - Gather statistics on dev or prod server.
2016-02-02 16:29:48 +01:00
fb9a84e665
Dependencies may be indexed differently
2016-01-25 14:44:40 +01:00
5eb0e0e14c
Avoid caching dependencies without assets
2016-01-25 14:44:10 +01:00
a65625d123
Merge branch 'master' into file-storage-interface
2016-01-21 09:57:23 +01:00
f8c2a47580
Get the lastest version of a given library.
...
h5p/h5p-wordpress-plugin#28
2016-01-20 13:21:51 +01:00
dc69181025
Removed debug
2016-01-14 15:39:01 +01:00
12032461bc
Follow existing naming conv. removed namespace
2016-01-14 09:46:00 +01:00
11481c3b4b
Merge branch 'master' into file-storage-interface
2016-01-13 15:44:31 +01:00
00686b733d
Added support for aggregating and caching library assets
2016-01-13 14:23:34 +01:00
b4fd0e098c
Aggregate and cache content assets to improve performance
2016-01-12 18:09:31 +01:00
808e43bc66
Disable generating export on each request
2016-01-12 10:31:47 +01:00
0125afb440
Refactor for consistency
2016-01-12 10:31:36 +01:00
2bd972168e
Isolate file operations in a separate class
2016-01-11 18:31:04 +01:00
b85ee0bd0b
Merge branch 'auto-install'
2015-12-10 10:22:19 +01:00
5aec15061c
Make copyright fields translatable
...
https://github.com/h5p/h5p-image/issues/2
2015-11-23 14:35:51 +01:00
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
Frode Petterson
Paal Joergensen
thomasmars
Timothy Lim
Tom Arild Jakobsen
Mikael Lindqvist
Svein-Tore Griff With
ndobromirov
andyrandom
Dave Richer
Dave Richer
Svein-Tore Griff With