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

169 Commits (7737559decf3ef579c2cad97193d9532390d2988)

Author SHA1 Message Date
Svein-Tore Griff With 553ae243d2 UX improvements to embed code system 2015-03-02 15:01:05 +01:00
Frode Petterson 07cd5c0d42 Added a floating touch. 2015-02-27 15:37:16 +01:00
Frode Petterson f2595b2bce Change how H5Ps are integrated. 2015-02-27 13:59:42 +01:00
Frode Petterson 77d589ec68 Fixed absolute URLs violating its parent. 2015-02-27 10:55:47 +01:00
Frode Petterson 4e594dd573 Fixed dialog pos and expand. 2015-02-27 10:26:57 +01:00
Frode Petterson 037e26f42b Space support. 2015-02-27 08:57:02 +01:00
Frode Petterson fabde2f1ce Automatic positioning. 2015-02-25 13:05:45 +01:00
Frode Petterson 1861f696c1 Added new embed design. 2015-02-25 12:10:07 +01:00
Frode Petterson 0c5aacfa24 Fixed old fullscreen exit in iframe. 2015-02-24 16:02:14 +01:00
Frode Petterson 971a55df58 Satisfy JSHint and prevent crashing. 2015-02-20 10:26:33 +01:00
Frode Petterson 688b00f55e Merge branch 'master' into new-embed 
Conflicts:
	js/h5p.js
 2015-02-20 10:15:36 +01:00
Frode Petterson 2b1c894307 Merge branch 'master' into settings 
Conflicts:
	h5p.classes.php
 2015-02-19 15:50:04 +01:00
Svein-Tore Griff With c7c46bc779 Fix spelling error 2015-02-18 15:20:20 +01:00
Svein-Tore Griff With 0d8fe7498c Remove code not being used 2015-02-18 15:08:55 +01:00
Svein-Tore Griff With d6db07481e Make sure the contentId is set on content types 2015-02-18 09:07:57 +01:00
Svein-Tore Griff With 1995da20bb Remove old todo items 2015-02-18 09:07:38 +01:00
Svein-Tore Griff With 0a6dd4808b Rename the external api 2015-02-17 10:57:21 +01:00
Svein-Tore Griff With c330282351 Refactor xAPI code 2015-02-16 16:47:04 +01:00
Frode Petterson 9fc5f82b2f Fixed empty frame. 2015-02-12 11:52:55 +01:00
Frode Petterson a0c5fe0e18 Comment out semi full screen. 2015-02-09 11:51:39 +01:00
Frode Petterson 11d9cb2f35 Trigger events. 2015-02-09 11:47:33 +01:00
Frode Petterson 18a3ed4a8f Simplified integration code to avoid to much duplication. 
Added resizing script for new embed code.
Added iframe communicator when embedding.
 2015-02-09 10:22:14 +01:00
Svein-Tore Griff With c8a2465827 Add documentation and change function names for deprecated functions 2015-02-04 18:43:06 +01:00
Frode Petterson 21674d31ac Merge branch 'master' into settings 
Conflicts:
	js/h5p.js
 2015-02-04 09:32:03 +01:00
Svein-Tore Griff With efdd7f9f7a Moving x-api and Event handling code to separate files and refining it 2015-02-03 20:11:01 +01:00
Svein-Tore Griff With 3beaa8302a Remove H5P special chars 2015-01-14 18:13:23 +01:00
Svein-Tore Griff With 62618104af Resolve conflict 2015-01-14 18:09:18 +01:00
Svein-Tore Griff With 64dd059c03 Add support for deprecated event system 2015-01-14 18:08:36 +01:00
Svein-Tore Griff With 61eb998d48 Add xAPI todo list 2015-01-14 17:27:32 +01:00
Pål Jørgensen ec4678bf0b Fixed issue #2397891 (drupal.org), and made jshint a little happier 2014-12-30 10:54:26 +01:00
Svein-Tore Griff With cc455f2b2d Implement changes after testing against Scrom Cloud 2014-11-17 11:08:43 +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 05d9982070 Add code to make it easy for others to register for xAPI events 2014-11-02 21:37:30 +01:00
Svein-Tore Griff With 5d32c4451c Add real url to statement object 2014-11-02 21:30:19 +01:00
Svein-Tore Griff With 378224f7c6 Get real actor 2014-11-02 21:16:27 +01:00
Svein-Tore Griff With 01779c0004 Use score instead of points 2014-11-02 21:16:19 +01:00
Svein-Tore Griff With 658db52f89 Resolve conflicts 2014-11-02 21:07:08 +01:00
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
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 6c38bfe38c Merge branch 'whitelist' into settings 2014-10-23 15:31:34 +02:00
Frode Petterson 2f160909e3 Merge branch 'without-pal' into user-results 2014-10-23 15:19:52 +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 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 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 7e669884ce Correct capitalization of H5P.htmlspecialchars function 2014-09-23 13:01:39 +02:00
Pål Jørgensen 212f8c6f0f Added H5P.htmlspecialchars() 2014-09-23 12:00:21 +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 d42f6f6760 Removed FontAwesome and added a custom MIT Licensed font. 2014-05-23 15:48:51 +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 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
Frode Petterson 133f0a94f9 Made summary scale! 2013-04-24 16:28:38 +02:00