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
Thomas Marstrander
9b76fccfce
HFJ-1610 - Gather statistics on dev or prod server.
2016-02-02 16:29:48 +01:00
Frode Petterson
fb9a84e665
Dependencies may be indexed differently
2016-01-25 14:44:40 +01:00
Frode Petterson
5eb0e0e14c
Avoid caching dependencies without assets
2016-01-25 14:44:10 +01:00
Frode Petterson
a65625d123
Merge branch 'master' into file-storage-interface
2016-01-21 09:57:23 +01:00
Frode Petterson
f8c2a47580
Get the lastest version of a given library.
...
h5p/h5p-wordpress-plugin#28
2016-01-20 13:21:51 +01:00
Frode Petterson
dc69181025
Removed debug
2016-01-14 15:39:01 +01:00
Frode Petterson
12032461bc
Follow existing naming conv. removed namespace
2016-01-14 09:46:00 +01:00
Frode Petterson
11481c3b4b
Merge branch 'master' into file-storage-interface
2016-01-13 15:44:31 +01:00
Frode Petterson
00686b733d
Added support for aggregating and caching library assets
2016-01-13 14:23:34 +01:00
Frode Petterson
b4fd0e098c
Aggregate and cache content assets to improve performance
2016-01-12 18:09:31 +01:00
Frode Petterson
808e43bc66
Disable generating export on each request
2016-01-12 10:31:47 +01:00
Frode Petterson
0125afb440
Refactor for consistency
2016-01-12 10:31:36 +01:00
Frode Petterson
2bd972168e
Isolate file operations in a separate class
2016-01-11 18:31:04 +01:00
Frode Petterson
b85ee0bd0b
Merge branch 'auto-install'
2015-12-10 10:22:19 +01:00
Frode Petterson
5aec15061c
Make copyright fields translatable
...
https://github.com/h5p/h5p-image/issues/2
2015-11-23 14:35:51 +01:00
Frode Petterson
0c24965305
Keep track of the latest H5P release
2015-11-11 14:13:05 +01:00
Frode Petterson
4bca7055ab
Merge branch 'master' into copy-and-paste
2015-11-04 11:38:52 +01:00
Frode Petterson
ee02f08bdb
Prevent warnings when reading the directory fails
...
(There will still be error messages)
2015-10-14 14:43:03 +02:00
Paal Joergensen
78c06fb42a
Merge branch 'master' into copy-and-paste
2015-10-06 14:00:08 +02:00
Svein-Tore Griff With
1c99d7ed61
Remove the https since there are some servers that doesn't support it
2015-09-22 17:58:55 +02:00
Frode Petterson
8e3d78a2f6
Prevent use of files that belongs to other content.
2015-09-18 12:55:58 +02:00
Frode Petterson
46183a3a2e
Fixed missing equal sign.
2015-09-15 09:26:58 +02:00
Paal Joergensen
cb59b9b79f
Allowing text-align on wysiwygs [HPN-115]
2015-09-09 13:28:16 +02:00
Frode Petterson
07b085e326
Use HTTPS, much safer.
2015-08-31 15:46:59 +02:00
Frode Petterson
1298643ab1
Merge branch 'master' of github.com:h5p/h5p-php-library
2015-08-10 13:04:44 +02:00
Frode Petterson
600975db8b
Inconsistent placeholder format. Causes issues in WP.
2015-08-10 13:04:38 +02:00
Svein-Tore Griff With
aa96d726bd
Merge branch 'master' of https://github.com/h5p/h5p-php-library
2015-07-20 13:05:48 +02:00
Svein-Tore Griff With
769fd219bc
API 1.6
2015-07-20 13:03:05 +02:00
Paal Joergensen
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
Frode Petterson
f9e07f4b80
Merge branch 'master' of github.com:h5p/h5p-php-library
2015-06-23 11:22:41 +02:00
Frode Petterson
18638f4913
Merge branch 'master' of github.com:h5p/h5p-php-library
2015-06-22 11:23:40 +02:00
Frode Petterson
d4ea0a1255
Use warnings to tell the admin what is wrong. Removed duplicate message
2015-06-22 11:22:49 +02:00
Frode Petterson
6ad53d66f3
Improve error handling.
2015-06-22 10:02:07 +02:00
Frode Petterson
2beff66195
Do not try to validate empty params.
2015-06-16 14:52:22 +02:00
Frode Petterson
aa49bc88a2
Merge branch 'release'
2015-06-15 16:11:21 +02:00
Frode Petterson
36558b0846
Options are optional.
2015-06-15 16:11:11 +02:00
Frode Petterson
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
Frode Petterson
b399a68adc
Merge branch 'release'
...
Conflicts:
h5p.classes.php
2015-06-04 14:47:34 +02:00
Frode Petterson
aded8d1f43
Avoid errors. Merged in from D7.
2015-05-27 10:11:01 +02:00
Frode Petterson
3460e400a0
Fixed special case for export/download.
2015-05-22 15:50:00 +02:00
Frode Petterson
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
Frode Petterson
9db33dd61b
Merge branch 'release' of github.com:h5p/h5p-php-library into release
2015-05-22 13:29:04 +02:00
Frode Petterson
6ecb15a1d0
There is no disable about for content, it's only a global setting.
2015-05-22 13:28:52 +02:00
Frode Petterson
101d5aab31
There is no disable all option. Disabling frame does the same.
2015-05-22 13:28:45 +02:00
Frode Petterson
52dca53883
There is no disable all option. Disabling frame does the same.
2015-05-22 13:20:44 +02:00
Frode Petterson
7e009d00ca
There is no disable about for content, it's only a global setting.
2015-05-22 13:18:13 +02:00
Thomas Marstrander
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
Frode Petterson
834764e316
Eliminate warnings.
2015-05-20 10:55:02 +02:00
Frode Petterson
ac96408bc9
Merge branch 'release'
2015-05-18 09:41:07 +02:00
Svein-Tore Griff With
e2b6f3527e
Merge branch 'semantics-font' into release
2015-05-13 14:06:56 +02:00
Svein-Tore Griff With
85d66d52c0
Add DISABLE_ALL constant
2015-05-13 11:48:56 +02:00
Paal Joergensen
a8b465adb7
Merge branch 'smart-file-names'
2015-05-13 10:16:13 +02:00
Frode Petterson
cee887901b
Make sure styles are filtered if they're not specified in the semantics.
2015-05-11 14:15:16 +02:00
Frode Petterson
e404c3ac68
Allow certain style tags on spans.
2015-05-08 16:06:04 +02:00
Frode Petterson
467f97c11f
Use correct uuid variable
2015-04-28 12:42:36 +02:00
Frode Petterson
31872111eb
Use content.
2015-04-27 15:20:40 +02:00
Frode Petterson
4683e61fa7
Delete correct export file.
2015-04-27 13:13:00 +02:00
Frode Petterson
ccccec84e7
Use correct path.
2015-04-22 15:19:01 +02:00
Frode Petterson
3eea931332
Merge branch 'release' into smart-file-names
2015-04-22 13:42:17 +02:00
Frode Petterson
9a37a99574
Re-added "Remove empty params." to master.
...
This reverts commit 31ee0bd51a
.
2015-04-22 10:44:16 +02:00
Frode Petterson
31ee0bd51a
Removed "Remove empty params." from release.
...
This reverts commit 8c68f23823
.
2015-04-22 10:43:18 +02:00
Frode Petterson
8c68f23823
Remove empty params.
2015-04-20 15:10:31 +02:00
Svein-Tore Griff With
cf7ae066ad
Add disable support for uploads as well
2015-04-15 13:54:46 +02:00
Svein-Tore Griff With
0b609e882d
Add about to disable sources and make sure each source is set
2015-04-13 19:58:41 +02:00
Svein-Tore Griff With
868c06929d
Whitespace changes
2015-04-13 18:41:53 +02:00
Svein-Tore Griff With
fba425220e
Resolve conflicts
2015-04-13 18:32:33 +02:00
Svein-Tore Griff With
5c3620c637
Bubbling for event system
2015-04-07 19:33:21 +02:00
Svein-Tore Griff With
efbe56001d
User data fixes
2015-04-07 19:32:44 +02:00
Svein-Tore Griff With
cfa747f20c
Add path fixes
2015-04-07 19:30:46 +02:00
Frode Petterson
5adffcaeb8
Added content id.
2015-04-07 15:36:28 +02:00
Svein-Tore Griff With
61a8e7e9e9
Make view work again as well
2015-03-24 19:36:13 +01:00
Svein-Tore Griff With
065ee4e8a2
Make editor work again
2015-03-24 19:29:28 +01:00
Svein-Tore Griff With
ef7a31d2e1
Try to get back the no url branch
2015-03-24 18:55:13 +01:00
Svein-Tore Griff With
44e8cba365
Merge branch 'master' into aggregated-xapi
2015-03-22 13:14:40 +01:00
Svein-Tore Griff With
1c4a5e014b
Comment out prefixing that isn't working
2015-03-22 13:12:44 +01:00
Svein-Tore Griff With
e76fc9eff3
Merge branch 'no-url-fopen' of https://github.com/h5p/h5p-php-library
2015-03-22 12:46:41 +01:00
Svein-Tore Griff With
b79a5b61b8
uuid consists of lowercase letters
2015-03-22 12:42:07 +01:00
Svein-Tore Griff With
313bb757ba
Add bubble system and xAPI context
2015-03-21 16:45:38 +01:00
Frode Petterson
e6e3ee7559
Allow assets to be relative to another location.
...
Allow assets to contain external URLs.
2015-03-20 11:28:21 +01:00
Svein-Tore Griff With
8494e85c3e
Remove todo items
2015-03-19 19:27:44 +01:00
Frode Petterson
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
Frode Petterson
1b28c7b128
Use different vars for URL and file path to avoid having allow_url_fopen = On.
2015-03-18 14:25:55 +01:00
Frode Petterson
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
Frode Petterson
c35d7f8334
Added support for generating human readable H5P file names.
2015-03-12 14:38:10 +01:00
Frode Petterson
2b1c894307
Merge branch 'master' into settings
...
Conflicts:
h5p.classes.php
2015-02-19 15:50:04 +01:00
Svein-Tore Griff With
95a0b000db
Remove scary error messages
2015-02-18 19:58:03 +01:00
Svein-Tore Griff With
3d4d72c5a7
Avoid exporting git files
2015-02-18 19:50:23 +01:00
Svein-Tore Griff With
c330282351
Refactor xAPI code
2015-02-16 16:47:04 +01:00
Frode Petterson
84f8fb1cff
Merge branch 'master' of github.com:h5p/h5p-php-library
2015-02-12 16:00:41 +01:00
Frode Petterson
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
Svein-Tore Griff With
8d7ce8f4f1
Merge branch 'master' of https://github.com/h5p/h5p-php-library
2015-02-12 15:46:55 +01:00
Svein-Tore Griff With
c4aedca522
Resolve conflicts
2015-02-11 18:02:25 +01:00
Frode Petterson
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
Frode Petterson
fb77a4d20d
bugfix.
2015-02-10 16:40:23 +01:00
Frode Petterson
c764d13b32
Moved display options helpers into core.
2015-02-10 16:29:16 +01:00
Svein-Tore Griff With
a090468657
Merge branch 'text-editor'
2015-02-05 12:01:16 +01:00
Svein-Tore Griff With
fc4f791e6e
Bump core api version
2015-02-03 20:15:15 +01:00
Svein-Tore Griff With
efdd7f9f7a
Moving x-api and Event handling code to separate files and refining it
2015-02-03 20:11:01 +01:00
Svein-Tore Griff With
f66e6a3ce9
Merge branch 'manually-move-files'
2015-02-03 14:02:54 +01:00
Svein-Tore Griff With
e12ba70b95
Merge branch 'master' into adaptivity
2015-02-03 13:44:52 +01:00
Svein-Tore Griff With
daa91b1372
Merge branch 'master' into text-editor
2015-02-02 14:28:52 +01:00
Svein-Tore Griff With
ae6329595b
Add ordering of libraries
2015-01-30 10:59:40 +01:00
Frode Petterson
ead790ae1a
Make sure fields in optional groups also becomes optional.
2015-01-20 14:48:22 +01:00
Frode Petterson
8cee9820b0
Merge branch 'master' into text-editor
2015-01-13 13:38:51 +01:00
Frode Petterson
ae8609dd86
Replaced another rename function.
2015-01-09 10:00:40 +01:00
git
e7b7cd2abe
Issue https://www.drupal.org/node/2402099 by drinkdecaf: H5P on Pantheon Environments
2015-01-09 09:59:29 +01:00
Svein-Tore Griff With
7dfab8393f
Merge branch 'atomic-dev-mode' into text-editor
2014-12-03 16:10:50 +01:00
falcon
fb07f54e35
Make it possible to do the dependency transactions in an atomic way
2014-11-27 23:14:15 +01:00
Frode Petterson
9ed2e48fb5
Fixed parse error.
2014-11-25 10:55:32 +01:00
Pål Jørgensen
60d166c6da
Made creation of h5p export file overwrite existing file
2014-11-19 12:43:59 +01:00
Frode Petterson
2bba9a183b
Bumped api version.
2014-11-10 11:35:15 +01:00
Frode Petterson
bc5159e272
Added event dispatcher.
2014-11-10 11:31:23 +01:00
Pål Jørgensen
2d7824aa93
Fix for language containing empty string in H5P export (h5p.json)
2014-11-06 11:13:24 +01:00
Svein-Tore Griff With
57db1d9926
Revert "Add htmlSpecialChars"
...
This reverts commit 41ed0c18e4
.
2014-11-03 10:15:23 +01:00
Pål Jørgensen
415e217134
Fixed URL to h5p.org
2014-11-03 07:02:45 +01:00
Svein-Tore Griff With
7c3ddea71a
Become node_clone compatible again
2014-11-02 19:13:14 +01:00
Svein-Tore Griff With
41ed0c18e4
Add htmlSpecialChars
2014-11-02 17:52:39 +01:00
Pål Jørgensen
48f7969ff9
Whitespaces?
2014-11-02 16:57:57 +01:00
Pål Jørgensen
3d370da1e1
Fixed usage of non-existent function
2014-11-02 16:22:27 +01:00
Pål Jørgensen
a2c84189b0
Moving external file fetching out of core
2014-11-02 14:29:13 +01:00
Pål Jørgensen
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
Pål Jørgensen
cc40f2316c
Merge branch 'master' into fetch-libraries-metadata
2014-11-02 11:08:56 +01:00
Pål Jørgensen
f01d002f66
Major post review changes
2014-11-01 17:05:15 +01:00
Svein-Tore Griff With
73c9f2768d
Resolve conflict
2014-11-01 12:56:38 +01:00
Frode Petterson
2737f3c721
Merge branch 'without-pal'
...
Conflicts:
h5p.classes.php
js/h5p-library-list.js
2014-10-23 15:18:03 +02:00
Frode Petterson
072edf55e7
Made it possible to bypass file extension check.
2014-10-21 15:42:47 +02:00
Frode Petterson
6c471529b1
Updated comment
2014-10-17 11:38:35 +02:00
Frode Petterson
a8e6854324
Use correct semantics.
2014-10-14 14:06:49 +02:00
Frode Petterson
0a8bd6a5b5
Fixed typos.
2014-10-10 13:57:43 +02:00
Frode Petterson
c9914966f3
Space fix.
2014-10-10 13:56:48 +02:00
falcon
c131a339a1
Finish up commenting the interface functions
2014-10-09 19:29:20 +02:00
falcon
a7939bf5ad
Improve comments
2014-10-08 10:16:16 +02:00
Frode Petterson
a38a0f1253
Removed old caching system.
...
Use content variable for filtered parameters.
Added getOption/setOption.
2014-09-26 15:56:42 +02:00
Frode Petterson
09bf13ee8f
Merge branch 'without-pal'
...
Conflicts:
js/h5p-library-list.js
2014-09-26 12:37:11 +02:00
Frode Petterson
4b8804988e
Revert "Merge branch 'adding-htmlspecialchars-to-h5p' into without-pal"
...
This reverts commit ab1b691a27
, reversing
changes made to 2b12bf4441
.
2014-09-24 15:34:55 +02:00
Frode Petterson
909fb3aca3
Merge branch 'without-pal' of github.com:h5p/h5p-php-library into without-pal
2014-09-23 15:10:42 +02:00
Frode Petterson
7fd333088b
Added missing translation.
2014-09-23 15:10:23 +02:00
Pål Jørgensen
ab1b691a27
Merge branch 'adding-htmlspecialchars-to-h5p' into without-pal
2014-09-23 12:59:37 +02:00
Pål Jørgensen
24be95a78e
Bumped core version because of the new function added
2014-09-23 12:59:08 +02:00
Pål Jørgensen
f207c3be9b
Setting language on export to 'und' if not defined
2014-09-23 10:44:22 +02:00
Pål Jørgensen
7cb2ebe17c
Fixed bug in validation, which made library-upload on library admin page fail
2014-09-17 15:04:55 +02:00
Pål Jørgensen
764ba2761d
Fixed bug in validation, which made library-upload on library admin page fail
2014-09-05 14:12:46 +02:00
Pål Jørgensen
4729287406
Added H5PCore::getLibrariesMetadata and H5PFrameworkInterface::getPlatformInfo
2014-09-05 09:59:16 +02:00
Frode Petterson
68e7c00145
Merge branch 'master' of github.com:h5p/h5p-php-library
2014-08-26 13:24:20 +02:00
Pål Jørgensen
f65af6b758
Merge branch 'master' of github.com:h5p/h5p-php-library
...
Conflicts:
h5p.classes.php
2014-08-26 12:08:35 +02:00
Pål Jørgensen
a75928d5a4
Updates relevant for upgrade-all-libraries feature
2014-08-26 12:00:14 +02:00
Frode Petterson
2ef3b206dc
Added missing $this->.
2014-08-26 11:45:00 +02:00
Frode Petterson
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
Pål Jørgensen
86507a456b
Changes related to listing unsupported libraries, and upgrade of all installed libraries
2014-08-22 14:03:00 +02:00
Frode Petterson
be44d1fac9
Fixed so that filtered params can be stored in the contents table.
2014-08-22 11:39:15 +02:00
Frode Petterson
1da58ef039
Merge branch 'master' of github.com:h5p/h5p-php-library
...
Conflicts:
h5p.classes.php
2014-08-22 11:38:10 +02:00
Frode Petterson
1a1e261dd5
Made it possible to delete libraries without having to load them again.
2014-08-22 11:36:58 +02:00
Frode Petterson
89bacfdb88
Made sure main content id isn't required.
...
Conflicts:
h5p.classes.php
2014-08-22 11:36:54 +02:00
Pål Jørgensen
e97fc0ae12
Merge branch 'master' of github.com:h5p/h5p-php-library
2014-08-19 10:15:14 +02:00
Pål Jørgensen
426a08e33e
Added loadLibraries() to interface
2014-08-19 10:14:55 +02:00
Frode Petterson
89d437774e
Added 7.x-1.x changes.
2014-08-18 14:09:38 +02:00
Frode Petterson
9adc12ea37
Added function to help convert object and array properties after getting them from the database.
2014-07-18 11:26:46 +02:00
Frode Petterson
db5243383d
Added support for sub-libraries in content upgrade. Also made upgrades async.
2014-06-13 15:02:26 +02:00
Frode Petterson
dc2c092bc7
Added content upgrade.
2014-06-03 16:07:50 +02:00
Frode Petterson
27a5c4e2a7
Fixed cache invalidation bug.
2014-05-27 14:12:54 +02:00
Frode Petterson
2053b43024
Recreate .h5p when content cache is rebuilt. Avoid loading content dependencies multiple times.
2014-05-27 14:05:20 +02:00
Frode Petterson
43d239c6f1
Temporarily disabled content development mode until we can work out how it should work.
2014-05-27 13:07:53 +02:00
Frode Petterson
c5b32fb621
Moved content cache control to core. Made sure updating a library invalidates caches for all content who uses it. All saving of content and filtering of parameters is now handled by core.
...
ContentValidator now collects a flat list of content dependencies.
2014-05-27 10:55:46 +02:00
Frode Petterson
4a32f976e5
Bumped api version.
2014-05-23 16:15:15 +02:00
Frode Petterson
08f8c46544
Changed getDependenciesFiles format to make it easier to use on all systems.
2014-05-09 10:48:05 +02:00
Frode Petterson
86441f4bec
Be able to skip cache busting on dependency files.
...
Renamed tmp to temp.
Suppress errors when moving content folder.
Made sure loaded development libraries bring their semantics.
2014-05-08 16:28:36 +02:00
Frode Petterson
48b07c46f5
Adapted and simplified export, makes it easier to implement on new systems and improves performance.
2014-05-07 16:43:48 +02:00
Frode Petterson
34d65b9601
Changed savePackage so it's easier to send along extra content data.
2014-05-06 16:52:43 +02:00
Frode Petterson
700fc1c67b
Added individual cache busting to dependency files. Improves performance and is useful for systems without a cache buster string / js aggr.
2014-05-06 11:48:36 +02:00
Frode Petterson
fd9a41f957
Quickfix so WP can get the id of new content. (used for redirect)
2014-04-28 15:09:07 +02:00
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