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