Commit graph

170 commits

Author SHA1 Message Date
Svein-Tore Griff With
41ed0c18e4 Add htmlSpecialChars 2014-11-02 17:52:39 +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
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
37ad033e33 Resolve conflict 2014-11-01 12:50:40 +01:00
Frode Petterson
ad03edf662 Added generic fallback for libraries that hasn't implemented getCopyrights. 2014-10-30 15:51:20 +01:00
falcon
22a559ccd8 Shorter function names and a few bugfixes 2014-10-26 22:18:28 +01: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
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
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
Frode Petterson
36ed607f9e Updated js doc. 2014-10-17 16:06:47 +02:00
Frode Petterson
9ef34c2119 Added support for sorting. 2014-10-17 15:01:45 +02:00
Frode Petterson
c6f92ea49b Improved messaging 2014-10-17 11:54:28 +02:00
Frode Petterson
245cf3c2a0 Merge branch 'without-pal' of github.com:h5p/h5p-php-library into without-pal
Conflicts:
	js/h5p-content-upgrade.js
2014-10-17 11:36:16 +02:00
Frode Petterson
e6125f5c61 Merge branch 'without-pal' of github.com:h5p/h5p-php-library into user-results
Conflicts:
	js/h5p-content-upgrade.js
	styles/h5p-admin.css
2014-10-16 16:11:12 +02:00
Frode Petterson
04b8c8a8a1 Added support for text filters in data view. 2014-10-16 16:07:52 +02:00
Frode Petterson
86c18476cd Created a new table data view from library management and library details that is more generic.
Added support for finish event from H5Ps.
JS now also log to results when the H5P was opened and finished.
2014-10-15 11:38:29 +02:00
Svein-Tore Griff With
5922786982 xAPI 2014-10-13 22:19:59 +02:00
Frode Petterson
1479138abb Did some jshint cleanup and removal of empty spaces. 2014-10-01 10:18:04 +02:00
Frode Petterson
2011e856c0 Improved error handling when upgrading content. 2014-09-29 17:13:47 +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
53ceb6156b Improved content check, supporting blank fields. 2014-09-25 14:38:05 +02:00
Frode Petterson
d359ce52ca Help make libraries admin easier. 2014-09-24 16:24:56 +02:00
Frode Petterson
3442954971 Revert "Merge branch 'adding-htmlspecialchars-to-h5p' into without-pal"
This reverts commit 9f19f64bab, reversing
changes made to 38c98202f4.
2014-09-24 15:35:47 +02:00
Frode Petterson
1236eb5fd1 Revert "Merge branch 'adding-htmlspecialchars-to-h5p' into without-pal"
This reverts commit 687fd8ddbc, reversing
changes made to ab1b691a27.
2014-09-24 15:34:34 +02:00
Pål Jørgensen
687fd8ddbc Merge branch 'adding-htmlspecialchars-to-h5p' into without-pal 2014-09-23 13:01:59 +02:00
Pål Jørgensen
7e669884ce Correct capitalization of H5P.htmlspecialchars function 2014-09-23 13:01:39 +02:00
Pål Jørgensen
9f19f64bab Merge branch 'adding-htmlspecialchars-to-h5p' into without-pal 2014-09-23 12:05:50 +02:00
Pål Jørgensen
212f8c6f0f Added H5P.htmlspecialchars() 2014-09-23 12:00:21 +02:00
Frode Petterson
38c98202f4 Added info message when there's no installed libraries. 2014-09-23 11:35:21 +02:00
Frode Petterson
576f77cc81 Merge branch 'master' of github.com:h5p/h5p-php-library 2014-08-29 16:31:03 +02:00
Frode Petterson
79223e6a0d Adde support for restricted h5p content types. 2014-08-29 16:30:44 +02:00
Frode Petterson
50b00e6459 Dramatically improved content upgrade performance by caching libraries.
Added real async function to avoid using up the stack.
2014-08-28 09:40:02 +02:00
Frode Petterson
67da268c44 Fixed correct disabling of delete button. 2014-08-27 09:52:15 +02:00
Pål Jørgensen
a75928d5a4 Updates relevant for upgrade-all-libraries feature 2014-08-26 12:00:14 +02:00
Frode Petterson
ffaad3b20b Merge branch 'master' of github.com:h5p/h5p-php-library 2014-08-22 12:00:56 +02:00
Frode Petterson
4a9e6d620f Made sure only content libraries can be upgraded. 2014-08-22 12:00:06 +02:00
Frode Petterson
952b6e6368 Made it possible to display the library list in a human readable form. 2014-08-22 11:39:45 +02:00
Pål Jørgensen
d3cd7aced4 Made changes to structure of upgrades.js. Makes it possible in the future to add stuff for a upgrade 2014-08-04 10:49:49 +02:00
Pål Jørgensen
9b46c8a173 Bugfixes 2014-07-18 10:50:23 +02:00
Pål Jørgensen
4d0a7df486 Made a null-error-object a non-error 2014-07-17 15:04:24 +02:00
Frode Petterson
c9d66ec3e9 Make sure H5Ps work in nested iframes. 2014-06-24 15:31:02 +02:00
Frode Petterson
1575e0102e Fixed embed script. 2014-06-24 14:41:35 +02:00
Frode Petterson
41f7039cbf Did some optimization, moved more func to core and added some comments. 2014-06-19 16:09:23 +02:00
Frode Petterson
0bcfa16861 Upgraded icons, throbber and texts. 2014-06-18 11:05:09 +02:00