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 |