Frode Petterson
|
8cee9820b0
|
Merge branch 'master' into text-editor
|
2015-01-13 13:38:51 +01:00 |
Svein-Tore Griff With
|
1420a96a2c
|
Merge branch 'atomic-dev-mode'
|
2015-01-08 11:20:49 +01:00 |
|
Svein-Tore Griff With
|
fb517c7592
|
Merge branch 'master' into atomic-dev-mode
|
2015-01-08 11:20:18 +01:00 |
|
Frode Petterson
|
74fc840366
|
Added support for debugging events.
|
2014-12-17 16:57:46 +01:00 |
|
Frode Petterson
|
1aef9e376d
|
Removed ulgy border from full screen.
|
2014-12-15 16:04:01 +01:00 |
|
Frode Petterson
|
acb36845c0
|
Fixed wrong args.
|
2014-12-15 11:50:48 +01:00 |
|
falcon
|
fb07f54e35
|
Make it possible to do the dependency transactions in an atomic way
|
2014-11-27 23:14:15 +01:00 |
|
Svein-Tore Griff With
|
e2abcd20b1
|
Merge branch 'master' of https://github.com/h5p/h5p-php-library
|
2014-11-27 11:14:12 +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 |
|
Svein-Tore Griff With
|
6e17c540fc
|
Merge branch 'fix-for-empty-string-language-in-h5p-json'
|
2014-11-11 11:14:03 +01:00 |
|
Svein-Tore Griff With
|
e8a1b1e4e7
|
Merge branch 'master' of https://github.com/h5p/h5p-php-library
|
2014-11-11 11:12:06 +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 |
|
Frode Petterson
|
2727c1eb2d
|
Merge branch 'master' of github.com:h5p/h5p-php-library
|
2014-11-03 11:30:42 +01:00 |
|
Svein-Tore Griff With
|
57db1d9926
|
Revert "Add htmlSpecialChars"
This reverts commit 41ed0c18e4.
|
2014-11-03 10:15:23 +01:00 |
|
Svein-Tore Griff With
|
a61744b20a
|
Merge branch 'master' of https://github.com/h5p/h5p-php-library
|
2014-11-03 10:14:57 +01:00 |
|
Pål Jørgensen
|
415e217134
|
Fixed URL to h5p.org
|
2014-11-03 07:02:45 +01:00 |
|
Pål Jørgensen
|
48dd1333a8
|
Merge branch 'master' of github.com:h5p/h5p-php-library
|
2014-11-03 07:00:05 +01:00 |
|
Frode Petterson
|
77b2f0a426
|
Merge branch 'master' of github.com:h5p/h5p-php-library
|
2014-11-02 21:24:21 +01:00 |
|
Svein-Tore Griff With
|
7c3ddea71a
|
Become node_clone compatible again
|
2014-11-02 19:13:14 +01:00 |
|
Frode Petterson
|
e39e6ad136
|
Merge branch 'master' of github.com:h5p/h5p-php-library
|
2014-11-02 17:59:37 +01:00 |
|
Svein-Tore Griff With
|
41ed0c18e4
|
Add htmlSpecialChars
|
2014-11-02 17:52:39 +01:00 |
|
Frode Petterson
|
9b236da2d7
|
Merge branch 'master' of github.com:h5p/h5p-php-library
|
2014-11-02 17:26:36 +01:00 |
|
Svein-Tore Griff With
|
686d2e650a
|
Merge branch 'master' of https://github.com/h5p/h5p-php-library
|
2014-11-02 17:10:27 +01:00 |
|
Pål Jørgensen
|
48f7969ff9
|
Whitespaces?
|
2014-11-02 16:57:57 +01:00 |
|
Pål Jørgensen
|
7f7e8a1e37
|
Merge branch 'fetch-libraries-metadata'
Conflicts:
h5p.classes.php
|
2014-11-02 16:40:05 +01:00 |
|
Pål Jørgensen
|
21af665370
|
Merge branch 'master' of github.com:h5p/h5p-php-library
|
2014-11-02 16:37:12 +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 |
|
Svein-Tore Griff With
|
c1f403af3f
|
Comment out old interface functions
|
2014-11-02 13:38:56 +01:00 |
|
Svein-Tore Griff With
|
729a38cd72
|
Merge branch 'master' of https://github.com/h5p/h5p-php-library
|
2014-11-02 12:58:49 +01:00 |
|
Frode Petterson
|
f008d0e330
|
Merge branch 'master' of github.com:h5p/h5p-php-library
|
2014-11-02 12:05:04 +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
|
cea519bd9a
|
Merge branch 'master' of github.com:h5p/h5p-php-library
|
2014-11-02 11:07:32 +01:00 |
|
Pål Jørgensen
|
f01d002f66
|
Major post review changes
|
2014-11-01 17:05:15 +01:00 |
|
Svein-Tore Griff With
|
fa402916d5
|
Merge branch 'flat-copyrights'
|
2014-11-01 13:49:40 +01:00 |
|
Svein-Tore Griff With
|
f22cfb05b7
|
Merge branch 'master' into flat-copyrights
|
2014-11-01 13:49:26 +01:00 |
|
Svein-Tore Griff With
|
dd83933a0a
|
Remove }
|
2014-11-01 13:47:24 +01:00 |
|
Svein-Tore Griff With
|
a97a8d296c
|
Merge branch 'whitelist'
|
2014-11-01 12:57:15 +01:00 |
|
Svein-Tore Griff With
|
73c9f2768d
|
Resolve conflict
|
2014-11-01 12:56:38 +01:00 |
|
Svein-Tore Griff With
|
bcedede174
|
Merge branch 'user-results'
|
2014-11-01 12:52:26 +01:00 |
|
Svein-Tore Griff With
|
37ad033e33
|
Resolve conflict
|
2014-11-01 12:50:40 +01:00 |
|
Svein-Tore Griff With
|
a59f88026b
|
Merge branch 'always-set-language-on-export'
|
2014-11-01 12:42:54 +01:00 |
|
Svein-Tore Griff With
|
9f0da3119e
|
Merge branch 'master' into always-set-language-on-export
|
2014-11-01 12:42:41 +01:00 |
|
Pål Jørgensen
|
1752d4eccf
|
Merge branch 'master' of github.com:h5p/h5p-php-library
|
2014-11-01 09:28:23 +01:00 |
|
Frode Petterson
|
ad03edf662
|
Added generic fallback for libraries that hasn't implemented getCopyrights.
|
2014-10-30 15:51:20 +01:00 |
|
Frode Petterson
|
3b240b4d76
|
Merge branch 'user-results' into whitelist
|
2014-10-28 10:04:58 +01:00 |