Frode Petterson
9abe7ef321
Merge branch 'master' of github.com:h5p/h5p-php-library
2017-01-26 15:35:53 +01:00
Timothy Lim
5dc9e3ddd1
HFP-580 Handle language files with hyphens
2017-01-26 15:31:51 +01:00
Frode Petterson
95cfaf6b9e
Merge branch 'master' into improved-file-handling
2017-01-26 14:12:43 +01:00
Frode Petterson
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
Paal Joergensen
a41df0ad9e
Merge branch 'master' into improved-file-handling
2016-12-21 15:17:56 +01:00
Paal Joergensen
e00bdbd125
Making sure displayoptions.icon is a boolean [HFP-277]
2016-12-21 15:17:36 +01:00
Paal Joergensen
20042fba85
Merge branch 'master' into improved-file-handling
2016-12-21 13:34:06 +01:00
Paal Joergensen
117e1457b7
Merge branch 'master' into improved-embed-and-download
2016-12-20 14:37:52 +01:00
Paal Joergensen
87ec43d687
Using constants for the different display options, and avoid special cases [HFP-277]
2016-12-16 14:22:03 +01:00
Paal Joergensen
7b39a6900c
Inheriting global disable setting for export & embed when saving [HFP-277]
2016-12-16 13:29:18 +01:00
Paal Joergensen
ea0362c3da
Making lines shorter [HFP-277]
2016-12-16 13:27:40 +01:00
Paal Joergensen
a1e68d212b
Updated comments [HFP-277]
2016-12-16 11:38:47 +01:00
Paal Joergensen
cfd6cb1e63
Fixed download/embed button bug when permissions are used
2016-12-13 15:57:05 +01:00
thomasmars
a326066c97
Only set tutorial url if it exists.
...
HFP-348
2016-12-13 11:36:28 +01:00
Paal Joergensen
e69a81f403
Added description of new interface method [HFP-277]
2016-12-13 10:33:59 +01:00
Paal Joergensen
0a23dc043d
Download and embed granularity (HFP-277)
2016-12-13 10:29:33 +01:00
Timothy Lim
a4d6f3aaab
Restore deprecated variable H5P.canHasFullScreen for backwards compatability
...
HFP-339
2016-12-12 11:28:59 +01:00
thomasmars
47c35d5135
Merge branches 'master' and 'stable' of https://github.com/h5p/h5p-php-library
2016-12-06 11:35:24 +01:00
Paal Joergensen
4d010ef38f
Improved message presented to user
2016-12-01 11:34:28 +01:00
Paal Joergensen
ed1fb00745
Merge branch 'release' into improved-file-handling
2016-11-30 11:19:08 +01:00
Tom Arild Jakobsen
32d06356b1
Bump to version 1.11
...
Relates to: #HFP-285
2016-11-29 16:44:20 +01:00
Tom Arild Jakobsen
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
Tom Arild Jakobsen
0882879552
Allow subContentId in group validation. Relates to: #HFP-285
2016-11-28 14:55:57 +01:00
Tom Arild Jakobsen
b4615e01b1
Allow subContentId in group validation. Relates to: #HFP-285
2016-11-28 14:54:33 +01:00
Frode Petterson
08a1cece26
Merge branch 'master' into improved-file-handling
2016-10-27 11:20:18 +02:00
thomasmars
f28036ca0e
Bumped core API version because of API changes in editor
2016-10-21 09:53:59 +02:00
Frode Petterson
c9e5680e85
Merge branch 'master' into improved-file-handling
2016-10-03 15:12:32 +02:00
Frode Petterson
e4266efb22
Added framework method to clear dirsize cache
...
HFP-23
2016-09-30 13:41:50 +02:00
Mikael Lindqvist
ce796cf0cf
don't fail silently in createExportFile
2016-09-26 12:05:02 +02:00
Frode Petterson
1c5b9707e5
Regenerate export if missing on view
...
Thanks to paravibe on Drupal.org for contributing.
2016-09-23 10:52:40 +02:00
Frode Petterson
263a987eeb
Added document root when creating zip
...
Thanks to paravibe on Drupal.org for contributing.
2016-09-23 10:31:55 +02:00
Frode Petterson
f0e7ea1283
Merge branch 'moodle-rc3' into improved-file-handling
2016-09-23 10:14:19 +02:00
Paal Joergensen
5f38e2b7f8
Bumped core because of bugfix for optional selects [HFJ-2183]
2016-09-21 13:22:35 +02:00
Frode Petterson
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
Frode Petterson
2896c9fdab
Revert "Added content ID to export handlers"
...
This reverts commit 7fca1d100d
.
Holding off on the exports for now
2016-09-08 14:48:08 +02:00
Frode Petterson
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
Paal Joergensen
5b8836b5be
Making select beeing able to be optional
2016-08-29 15:54:48 +02:00
Frode Petterson
888a46844b
Bumped core version
2016-08-02 12:57:43 +02:00
Frode Petterson
832aebf5e0
Moved regexp from editor to core
...
HFJ-2099
2016-07-29 14:15:00 +02:00
Frode Petterson
1ef52dfafe
Merge branch 'release' of github.com:h5p/h5p-php-library into release
2016-07-29 13:47:17 +02:00
Frode Petterson
44633fc1db
Updated regexp to support existing content to new content copy
...
HFJ-2099
2016-07-29 13:46:14 +02:00
Frode Petterson
8b31f88ca8
Increase performance by removing unused code
2016-07-27 16:17:58 +02:00
Svein-Tore Griff With
43748bc4b8
Add documentation regarding stylePatterns
2016-07-15 15:33:11 +02:00
ndobromirov
406a55be5c
Excessive calls to variable_set HFJ-1893
2016-06-21 13:26:39 +02:00
Frode Petterson
18e2b79cc6
Merge branch 'master' of github.com:h5p/h5p-php-library
2016-06-21 09:34:37 +02:00
andyrandom
8cb0aad09e
Allow hyphens in HTML tags HFJ-1951
2016-06-21 09:34:27 +02:00
Paal Joergensen
6caf44e54b
Added checks for mbstring PHP extension [HFJ-1996]
2016-06-08 11:28:07 +02:00
Frode Petterson
0d6fac4099
Merge branch 'release' of github.com:h5p/h5p-php-library into release
2016-06-03 12:53:12 +02:00
Frode Petterson
c2f5feaae5
Improved error message for req core version
...
HFJ-1959
2016-05-31 10:51:59 +02:00
Frode Petterson
cc121b2f53
Bugfix: Must be able to run from CLI
2016-05-13 13:42:44 +02:00
Dave Richer
76e813a32e
Update h5p.classes.php
...
Prevents H5P From breaking console PHP commands
2016-04-23 23:40:46 -04:00
Thomas Marstrander
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
Dave Richer
29a8601595
Major clean up of both syntactical errors and spelling
2016-04-13 00:01:15 -04:00
Frode Petterson
cdfb810501
Merge branch 'release'
2016-04-12 14:39:59 +02:00
Frode Petterson
7474916f3a
scripts and styles arrays must always be defined
2016-04-12 11:37:55 +02:00
Frode Petterson
41c98cc13c
Merge branch 'master' of github.com:h5p/h5p-php-library
2016-04-06 11:47:16 +02:00
Frode Petterson
e0d3c2e1e0
Merge branch 'release'
2016-04-06 11:47:06 +02:00
Thomas Marstrander
35a7213a67
Added confirmation dialog.
...
HFJ-1572
2016-04-05 18:35:02 +02:00
Frode Petterson
127dc4f0e1
Use correct ID when copying package
2016-04-05 16:06:09 +02:00
Frode Petterson
cdfab4d4b6
Merge branch 'master' of github.com:h5p/h5p-php-library
2016-04-04 11:12:16 +02:00
Frode Petterson
a11e8d4365
Bumped coreApi version to reflect editor changes
2016-04-04 11:11:18 +02:00
Thomas Marstrander
17ad3d4825
Merge branch 'master' of https://github.com/h5p/h5p-php-library
2016-03-31 16:09:23 +02:00
Thomas Marstrander
4d277b2304
Added version number and links to licenses.
...
HFJ-1734
2016-03-31 16:07:45 +02:00
Paal Joergensen
d912232433
Merge remote-tracking branch 'origin/more-font-styling' into release
2016-03-29 12:24:42 +02:00
Paal Joergensen
f05d3b3bf5
Merge branch 'image-editing' into release
2016-03-29 11:43:30 +02:00
Frode Petterson
41464cb98c
Corrected lib array
2016-03-21 12:35:44 +01:00
Frode Petterson
62e2f41884
Merged stuff
2016-03-21 11:56:56 +01:00
Frode Petterson
007137c257
Merge branch 'master' of github.com:h5p/h5p-php-library
...
Conflicts:
h5p.classes.php
2016-03-21 11:51:45 +01:00
Frode Petterson
b8a3965c6e
Merge branch 'master' into file-storage-interface
...
Conflicts:
h5p.classes.php
2016-03-16 10:01:13 +01:00
Paal Joergensen
5229e82764
Merge branch 'improved-ajax'
2016-03-15 16:09:01 +01:00
Frode Petterson
de175737ea
Use correct variable
2016-03-10 16:33:53 +01:00
Frode Petterson
89227e4639
Merge branch 'master' into image-editing
2016-03-10 14:22:04 +01:00
Frode Petterson
61ae8899cb
Merge branch 'master' into event-logging
...
Conflicts:
h5p.classes.php
2016-03-10 14:21:04 +01:00
Frode Petterson
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
Frode Petterson
5b965636e0
Revert "HFJ-1610 - Gather statistics on dev or prod server."
...
This reverts commit 9b76fccfce
.
2016-03-10 14:14:39 +01:00
Frode Petterson
36c8bf3362
Revert "HFJ-1610 - Track number of contents per library type."
...
This reverts commit 2e0498cd3a
.
2016-03-10 14:14:33 +01:00
Frode Petterson
13a2988414
Revert "HFJ-1610 - Track libraries installed."
...
This reverts commit 5287d455b2
.
2016-03-10 14:14:00 +01:00
Frode Petterson
0218493eab
Added support for two more font styling options
...
HFJ-1646
2016-03-09 11:18:21 +01:00
Frode Petterson
437598aa8e
Use key to avoid bugs
2016-03-07 10:58:39 +01:00
Thomas Marstrander
4ed368f5e7
Ratio added as field instead of parameter, removed from whitelist.
...
HFJ-1645
2016-03-06 13:40:50 +01:00
Thomas Marstrander
ee245f9344
Whitelisted originalImage and ratio when validating Image.
...
HFJ-1645
2016-03-06 13:27:10 +01:00
Thomas Marstrander
fa7b42120d
Merge branch 'master' of https://github.com/h5p/h5p-php-library into image-editing
2016-03-06 11:42:37 +01:00
Thomas Marstrander
54ca645e2c
Whitelisted originalImage attribute when filtering params.
...
HFJ-1645
2016-03-06 11:42:24 +01:00
Frode Petterson
93fd710509
Fixed typo
...
HFJ-1610
2016-03-04 13:56:05 +01:00
Frode Petterson
b42193729e
Merge branch 'improved-ajax' into improved-ajax-moodle
...
Conflicts:
h5p.classes.php
2016-02-25 14:55:27 +01:00
Frode Petterson
0430e6ba28
Put AJAX response functions in core
2016-02-25 13:46:05 +01:00
Thomas Marstrander
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
Frode Petterson
6bfffbcf30
Added woff2 as a safe file type
2016-02-23 13:10:08 +01:00
Frode Petterson
7a87735f02
Removed sub_type from stats
...
HFJ-1610
2016-02-11 09:53:16 +01:00
Frode Petterson
4cf7a32b4a
Get data from counters instead of log
...
HFJ-1610
2016-02-10 11:54:20 +01:00
Frode Petterson
2a20dc23ae
Use correct format
...
HFJ-1610
2016-02-09 13:52:35 +01:00
Frode Petterson
b16b0c1e0b
We're going to need authors
2016-02-09 10:55:44 +01:00
Frode Petterson
cf3373d4ee
Changes in format to be more POST friendly
...
HFJ-1610
2016-02-09 10:54:04 +01:00
Frode Petterson
c4011e3bbb
Use POST to get H5P updates
...
HFJ-1610
2016-02-08 11:39:21 +01:00
Frode Petterson
70baeb55a1
Add local ID from path
...
HFJ-1610
2016-02-08 10:38:53 +01:00
Frode Petterson
fa90b0a1c3
Use correct variable
2016-02-05 11:09:57 +01:00
Frode Petterson
292e04de5d
Combine library statistics
...
HFJ-1610
2016-02-04 16:34:32 +01:00
Frode Petterson
971e035626
Skip local check if network
...
HFJ-1610
2016-02-04 15:15:35 +01:00
Thomas Marstrander
5287d455b2
HFJ-1610 - Track libraries installed.
2016-02-03 15:58:49 +01:00
Thomas Marstrander
2e0498cd3a
HFJ-1610 - Track number of contents per library type.
2016-02-03 15:36:35 +01:00