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

170 Commits (1e4a7ff26f418fde8164053b865369638bfb0a0f)

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
Frode Petterson 526e8f62d3 Added error if upgrades are missing. 2014-06-16 15:21:40 +02:00
Frode Petterson f688e1b7ab Made it possible to translate content upgrade script. 2014-06-16 14:04:53 +02:00
Frode Petterson 928e58c98b Fixed field processing in content upgrade and removed debugging. 2014-06-16 13:52:35 +02:00
Frode Petterson db5243383d Added support for sub-libraries in content upgrade. Also made upgrades async. 2014-06-13 15:02:26 +02:00
Frode Petterson 8599f2381d Fixed not cached bug in library list. 2014-06-11 15:37:34 +02:00
Frode Petterson dc2c092bc7 Added content upgrade. 2014-06-03 16:07:50 +02:00
Frode Petterson 08b4888b1e Made it possible to rebuild all content caches from library admin. This is needed to able to view content usage for each library. 2014-05-28 13:18:24 +02:00
Frode Petterson d42f6f6760 Removed FontAwesome and added a custom MIT Licensed font. 2014-05-23 15:48:51 +02:00
Frode Petterson c6ff5c52ed Updated embed fullscreen. Added support for Safari 7. 2014-05-22 11:46:28 +02:00
Frode Petterson 191a6a575c Renamed export JS variable because it's reserved in some browsers. 2014-05-22 11:18:39 +02:00
Frode Petterson 4d5e7a4d4a Added support for real fullscreen on >Safari 7. 
Adjusted fullscreen to work better on all browsers.
 2014-05-22 11:17:30 +02:00
Frode Petterson dd52ec332e Made sure the browsers built-in JSON is used everywhere. 2014-05-22 11:15:16 +02:00
Frode Petterson 4ffbf2bace Removed old flowplayer. 2014-05-22 08:59:30 +02:00
Frode Petterson 73836a0660 Imported changes from D6. 2014-05-02 15:45:45 +02:00
Frode Petterson d53c1877ea Removed deprecated resize loop. Should not be needed anymore. 2014-04-30 16:02:19 +02:00
Frode Petterson 1566c4e2b4 Small updated to the resize system. Should now handle libraries without .$ and FF fullscreen events on Windows. 2014-04-30 15:59:19 +02:00
Frode Petterson c83092f747 Imported changes from 7.x-1.x 2014-04-14 10:50:37 +02:00
Frode Petterson 9e01bbfb81 Imported changes from Drupal 6.x. 2014-04-13 15:52:12 +02:00
Frode Petterson 81feec677d Synced library with module 6.x-1.x. 2014-03-26 08:43:29 +01:00
Frode Petterson ced3f8e711 Moved css into library. 2014-01-29 16:03:51 +01:00
Frode Petterson b65e28f449 HFJ-146: Disabled real full screen in Safari. 2014-01-20 14:05:10 +01:00
Frode Petterson a41a8f82f9 HFJ-93: Removed check that prevents iframe from getting bigger than window. 2013-12-13 14:26:36 +01:00
Frode Petterson bb496b4d29 HPN-36: Fixed semi-fullscreen exit with key. 2013-12-04 15:21:34 +01:00
Frank Ronny Larsen c87b233482 Polished function comments to keep a constant style, added sanity check in shuffleArray 2013-11-26 14:56:31 +01:00
Svein-Tore Griff With 69ad6c9370 Add button stylings (By magnuma) 2013-11-23 01:31:12 +01:00
Svein-Tore Griff With cab8e258be Export improvements 2013-11-15 01:13:00 +01:00
Svein-Tore Griff With 9dd710a8fb Renaming functions 2013-11-14 23:42:10 +01:00
Svein-Tore Griff With 5ca6a5f39a Issue #2120227 by gafolini, Ellinokon and falcon: Add export feature to H5P 2013-11-14 13:48:07 +01:00
Svein-Tore Griff With 0d97f6952c Add iframe support and more license types 2013-11-08 18:16:41 +01:00
Svein-Tore Griff With 12523d810c Fix styling issues for sites that has uncleard floating blocks 2013-10-21 13:23:36 +02:00
Svein-Tore Griff With f939e00f44 Fix styling issues for sites that has uncleard floating blocks 2013-10-21 13:22:13 +02:00
Frode Petterson d633697065 Added users stats function: setFinished. 2013-09-18 15:52:06 +02:00
Svein-Tore Griff With 6f46c5a5fa Move H5P content to top of body 2013-09-10 22:43:31 +02:00
Svein-Tore Griff With 022fee6036 Remove the contains array prototype extension 2013-07-25 01:56:20 +02:00
Svein-Tore Griff With 26240d2887 Do not add shuffle to array prototype 2013-07-25 01:50:16 +02:00
Frank Ronny Larsen bd1f25448b OPPG-473: Safari now use fake fullscreen. 
Which is better than real fullscreen IMNSVHO...
 2013-07-18 15:58:52 +02:00
Pål Jørgensen 54040c273e Implemented String.prototype.trim if not defined to support IE8 2013-07-09 10:36:27 +02:00
Pål Jørgensen aba62d5b48 Merge branch 'master' of b.amendor.com:h5p 
Conflicts:
	example_content/coursepresentation/H5P.CoursePresentation/library.json
	example_content/coursepresentation/H5P.CoursePresentation/styles/cp.css
 2013-07-08 09:39:39 +02:00
Pål Jørgensen 38d8269a76 Added new element type in coursepresentation: ExportableTextArea 2013-07-08 08:59:14 +02:00
Svein-Tore Griff With 59025c8e68 OPPG-376: Added comment about the getContentPath function beeing deprecated 2013-07-03 14:24:09 +02:00
Svein-Tore Griff With 9d9b3bbc51 OPPG-376: Added api function that was removed in previous commit by Frode Petterson 2013-07-03 14:22:00 +02:00
Frode Petterson b21d129d2c OPPG-376: The forgotten code! 2013-06-27 14:29:56 +02:00
Frode Petterson ea9dd199aa Fixed file upload system. 2013-06-20 14:49:56 +02:00
Frode Petterson 152a5f956a Fixed keyboard in full screen when using webkit. 2013-06-07 19:09:10 +02:00
Frode Petterson 4f9827f035 Fixed rewrite of css urls when concatenating. 
Fixed double insert of css and js.
 2013-05-24 13:24:01 +02:00
Frode Petterson f3ba9224f1 Fixed so change callbacks also runs when files are removed. 
Refactored cloneObject.
Added electure player to editor.
Removed hard coded video urls.
 2013-05-23 13:00:58 +02:00
Frode Petterson 2ff1c26b23 Added support for resize and fullscreen. 
Removed fullscreen from Android. (does not work)
Removed mute from Android and iPad. (does not work)
 2013-05-21 16:53:38 +02:00
Svein-Tore Griff With 45627c8c65 Add specific resize function for when the window goes out of resize mode 2013-05-21 00:07:51 +02:00
Frode Petterson 5156cbd479 Fine tuning on the editor and the boardgame. 2013-04-30 17:07:14 +02:00
Frode Petterson 9c0fb69e27 Improved boardgame flexibility. 2013-04-26 17:27:35 +02:00