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
|
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
|
c40d273704
|
Fixed this arg for external dispatcher.
|
2015-06-04 14:39:02 +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
|
d5979f1bcc
|
Merge branch 'release' of https://github.com/h5p/h5p-php-library into release
|
2015-05-21 13:03:28 +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
|
3a0abf935e
|
Merge branch 'release'
|
2015-05-21 10:17:06 +02:00 |
|
Frode Petterson
|
8e82b515a2
|
Prevent updating pagination when there's no table.
|
2015-05-21 09:50:58 +02:00 |
|
Frode Petterson
|
834764e316
|
Eliminate warnings.
|
2015-05-20 10:55:02 +02:00 |
Svein-Tore Griff With
|
227e0829fd
|
Avoid printing very scary error message for all old interactive videos
|
2015-05-18 15:14:33 +02:00 |
|
Frode Petterson
|
ac96408bc9
|
Merge branch 'release'
|
2015-05-18 09:41:07 +02:00 |
|
Frode Petterson
|
3f6abd722d
|
Prevent crashing if getCopyrights fail.
|
2015-05-15 12:21:23 +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 |
|
Svein-Tore Griff With
|
eb6ec29cb6
|
Remove deprecated name
|
2015-05-12 16:09:36 +02:00 |
|
Frode Petterson
|
ca0c848e0f
|
Use correct element.
|
2015-05-12 10:04:21 +02:00 |
|
Frode Petterson
|
5568a59854
|
Pre-generate copyright information.
|
2015-05-11 16:00:55 +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
|
ba862f0078
|
Embed: Always br. Get w/h from correct el.
|
2015-05-07 15:16:59 +02:00 |
|
Frode Petterson
|
e0534dd778
|
Fixed frame disable broken. Probably a merge gone wrong.
|
2015-05-07 15:13:28 +02:00 |
|
Frode Petterson
|
ccc03782df
|
Cleaned up docs to make JSdoc generation more meaningful.
|
2015-05-05 13:13:57 +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 |
|
Thomas Marstrander
|
9ee8130aae
|
Added copyrights fix.
|
2015-04-27 13:21:31 +02:00 |
|
Frode Petterson
|
4683e61fa7
|
Delete correct export file.
|
2015-04-27 13:13:00 +02:00 |
|
Frode Petterson
|
66928f397e
|
Merge branch 'master' of github.com:h5p/h5p-php-library
|
2015-04-27 10:15:11 +02:00 |
|
Frode Petterson
|
e6ce2780fa
|
Merge branch 'semi-fullscreen-z-index-fix'
|
2015-04-27 10:15:00 +02:00 |
|
Svein-Tore Griff With
|
a0501eb861
|
Merge branch 'stable'
|
2015-04-22 22:58:00 +02:00 |
|
Frode Petterson
|
ccccec84e7
|
Use correct path.
|
2015-04-22 15:19:01 +02:00 |
|
Svein-Tore Griff With
|
ae512b2b03
|
Merge branch 'release' into stable
|
2015-04-22 14:01:56 +02:00 |
|
Frode Petterson
|
3eea931332
|
Merge branch 'release' into smart-file-names
|
2015-04-22 13:42:17 +02:00 |
|
Frode Petterson
|
260b6fe044
|
Restrict IE FullScreen.
|
2015-04-22 12:55:18 +02:00 |
|
Frode Petterson
|
886c631461
|
Use correct variable.
|
2015-04-22 10:58:59 +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
|
540c96178d
|
Merge branch 'master' of github.com:h5p/h5p-php-library
|
2015-04-22 09:51:45 +02:00 |
|
Frode Petterson
|
1c6b818841
|
Merge branch 'release'
Conflicts:
js/h5p.js
|
2015-04-22 09:51:36 +02:00 |