Commit Graph

1091 Commits (93e9d6e0ec7db72624c5eeb69e1b46fda4afaca0)

Author SHA1 Message Date
Svein-Tore Griff With 658db52f89 Resolve conflicts 2014-11-02 21:07:08 +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
Frode Petterson d0e8bfe0b1 Merge branch 'master' of github.com:h5p/h5p-php-library 2014-11-02 17:04:28 +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
Frode Petterson 3220cea7af Merge branch 'master' of github.com:h5p/h5p-php-library 2014-11-02 10:22:37 +01:00
Svein-Tore Griff With 9391b60a03 Refactoring xAPI to use inheritence and event classes 2014-11-01 21:54:42 +01:00
Svein-Tore Griff With b3da2c5b32 Resolving conflicts 2014-11-01 20:42:34 +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
Svein-Tore Griff With af0ec62d02 Merge branch 'xAPI' of https://github.com/h5p/h5p-php-library into xAPI 2014-11-01 12:31:27 +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 0d874e11f8 Merge branch 'whitelist' into settings 2014-10-28 10:05:38 +01:00
Frode Petterson 3b240b4d76 Merge branch 'user-results' into whitelist 2014-10-28 10:04:58 +01:00
Frode Petterson ca3b994a08 Removed IE's special input field clearing. 2014-10-28 10:03:16 +01:00
falcon 22a559ccd8 Shorter function names and a few bugfixes 2014-10-26 22:18:28 +01:00
Frode Petterson 6c38bfe38c Merge branch 'whitelist' into settings 2014-10-23 15:31:34 +02:00
Frode Petterson ae51b429d3 Merge branch 'user-results' into whitelist 2014-10-23 15:30:48 +02:00
Frode Petterson 2f160909e3 Merge branch 'without-pal' into user-results 2014-10-23 15:19:52 +02: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 af2f01cbb7 Added support for real fullscreen on Android devices. 2014-10-23 15:00:37 +02:00
Frode Petterson 2636ddc393 Make it easy to disable generic content features. 2014-10-23 14:02:34 +02:00
Frode Petterson cc8bfa4b98 Merge branch 'user-results' into whitelist 2014-10-22 14:32:09 +02:00
Frode Petterson 9f85ea370a Merge branch 'without-pal' into user-results 2014-10-22 14:31:46 +02:00
Frode Petterson f0cbb24cc6 Merge branch 'without-pal' of github.com:h5p/h5p-php-library into without-pal 2014-10-22 14:22:56 +02:00
Frode Petterson 072edf55e7 Made it possible to bypass file extension check. 2014-10-21 15:42:47 +02:00
Frode Petterson 68f1e89ca5 Removed source map ref. 2014-10-21 11:34:14 +02:00
Frode Petterson 062a8921e2 Added loaded callback and support for column classes. 2014-10-20 16:52:44 +02:00