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
|
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 |
|
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
|
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 |