EDUCATIC
/
h5p-php-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
365 Commits
28 Branches
133 Tags
3.5 MiB
Commit Graph

365 Commits (f008d0e3304824ca05dcb80cd6846ea20b86d8c1)

Author SHA1 Message Date
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 cea519bd9a Merge branch 'master' of github.com:h5p/h5p-php-library 2014-11-02 11:07:32 +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
Frode Petterson ca3b994a08 Removed IE's special input field clearing. 2014-10-28 10:03:16 +01: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 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
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 c167b11f5e Merge branch 'without-pal' into user-results 2014-10-17 11:38:45 +02:00
Frode Petterson 6c471529b1 Updated comment 2014-10-17 11:38:35 +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
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 43188bb7e0 Specifying language code is now required when getting library translations. 2014-10-07 14:46:35 +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 a38a0f1253 Removed old caching system. 
Use content variable for filtered parameters.
Added getOption/setOption.
 2014-09-26 15:56:42 +02:00
Frode Petterson 39ea23b861 Text align 2014-09-26 13:29:07 +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 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 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