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

515 Commits (db3da7a1441ae6c9ffacbb8110f41758c85beaa0)

Author SHA1 Message Date
Thomas Marstrander 4d277b2304 Added version number and links to licenses. 
HFJ-1734
 2016-03-31 16:07:45 +02:00
Frode Petterson 6b31d467a0 Merge branch 'master' of github.com:h5p/h5p-php-library 2016-03-21 12:51:04 +01:00
Frode Petterson 2ac631458f Merge branch 'master' into content-tags 2016-03-18 13:52:53 +01:00
Frode Petterson 14605dc790 A more natural tabindex 
HFJ-1549
 2016-03-17 14:22:23 +01:00
Frode Petterson 35a0d09b9b Only use one filter for each column 
HFJ-1620
 2016-03-01 11:34:34 +01:00
Frode Petterson a41ecccb9a Added em-dash when facet cell is empty. 
Other minor visual adjustments.
HFJ-1620
 2016-03-01 10:43:13 +01:00
Frode Petterson a398589c80 Added support for Tags in data views 
HFJ-1620
 2016-02-29 16:35:22 +01:00
Frode Petterson b42193729e Merge branch 'improved-ajax' into improved-ajax-moodle 
Conflicts:
	h5p.classes.php
 2016-02-25 14:55:27 +01:00
Thomas Marstrander 92e4ab0f9e Merge branches 'file-storage-interface' and 'master' of https://github.com/h5p/h5p-php-library into file-storage-interface 2016-02-24 09:49:11 +01:00
Frode Petterson 4e06733ffb Use correct message 2016-02-22 12:01:18 +01:00
Frode Petterson 0aebdb345b Lets use a simpler solution 2016-02-22 11:58:25 +01:00
Frode Petterson 256bf1b6d2 Revert "Improved results and contentuserdata saving by queueing requests" 
This reverts commit 3849f3a054.
 2016-02-22 11:56:52 +01:00
Thomas Marstrander bfcf4228db Use variable with complete path HFJ-1695 2016-02-22 10:38:33 +01:00
Frode Petterson 3849f3a054 Improved results and contentuserdata saving by queueing requests 2016-02-19 12:57:53 +01:00
Frode Petterson b42b28ab03 Use correct jQuery 
HFJ-1610
 2016-02-11 15:00:08 +01:00
Frode Petterson dc8b70748f Fixed once() 
HFJ-1646
 2016-02-09 13:53:17 +01:00
Frode Petterson 3991875439 Avoid navigating inside iframe 
HFJ-1479
 2016-01-27 12:42:55 +01:00
Frode Petterson 604218f2e3 Hide buttons if there are no URLs 2016-01-15 14:12:24 +01:00
Frode Petterson 11481c3b4b Merge branch 'master' into file-storage-interface 2016-01-13 15:44:31 +01:00
Frode Petterson 1bf393a9af Allow custom URL for libraries 2016-01-13 08:45:00 +01:00
Frode Petterson 510016b1cc Merge branch 'release' of github.com:h5p/h5p-php-library into release 2016-01-05 13:58:20 +01:00
Frode Petterson 59901fd1c9 Fixed resizing script trying to access iframe content 
HFJ-1512
 2016-01-05 13:57:16 +01:00
Paal Joergensen 919ac77f35 Readded check for undefined contentid in setActivityStarted() 2015-12-18 10:26:59 +01:00
Paal Joergensen e83b213183 Made content state saving more robust [HFJ-1450] 2015-12-18 10:06:33 +01:00
Frode Petterson 5e45e7d7dd Merge branch 'master' into release 
Conflicts:
	js/h5p-x-api.js
 2015-12-17 14:04:58 +01:00
Paal Joergensen e6ec257c6d Made setActivityStarted a little more robust [HFJ-1474] 2015-12-16 15:42:26 +01:00
Paal Joergensen 2d0e409ac4 Made content state beeing saved on safari@iPad when closing tab and leaving tab 2015-12-16 09:50:58 +01:00
Frode Petterson 2bc4dee85a Prevent crashing editor for old libraries 2015-12-10 14:49:30 +01:00
Svein-Tore Griff With 3a2bb0a2fd Trigger attempted event the first time a user sees a question - HFJ-1397 2015-11-27 20:49:49 +01:00
Frode Petterson 3c34ab223a Prevent assigning to the htmlcollection. 2015-11-13 11:18:53 +01:00
Frode Petterson 16aa6813ae Use correct variable 2015-11-06 15:35:06 +01:00
Frode Petterson 2f5e1fcc91 Use correct variable. 2015-11-05 16:52:38 +01:00
Frode Petterson 7a369de7e7 Avoid undefined errors 2015-11-04 17:30:58 +01:00
Svein-Tore Griff With e29be52de5 Merge branch 'master' of https://github.com/h5p/h5p-php-library 2015-11-01 00:32:55 +01:00
Svein-Tore Griff With b077af0981 Merge branch 'stable' 2015-11-01 00:32:47 +01:00
Svein-Tore Griff With ccfa2d516f Make sure we get answered statements in the result log 2015-11-01 00:30:45 +01:00
Svein-Tore Griff With 844883a1cf triggerXAPICompleted is deprecated so we don't change it. Also fixes doc 2015-11-01 00:23:10 +01:00
Svein-Tore Griff With cc6521c4a1 completed default value depends on verb 2015-11-01 00:19:56 +01:00
Svein-Tore Griff With e7fe53c235 Merge pull request #4 from garemoko/garemoko-issue-2 
Add support for result.success & completion
 2015-11-01 00:14:42 +01:00
Frode Petterson f0530957ad Improved semi-fullscreen for iPad. 2015-10-27 16:57:28 +01:00
Frode Petterson 876135436c Made resize script smarter to avoid flickering. 2015-10-26 14:13:21 +01:00
Andrew Downes 76a02867aa Update triggerXAPICompleted and triggerXAPIScored 
Added support for completion and success.
 2015-10-20 11:29:01 +01:00
Andrew Downes f9ea9adb1b Add support for result.success & completion 2015-10-20 11:13:08 +01:00
Frode Petterson 2d43942c48 Use parent window instead of top for communications. 2015-09-10 14:27:12 +02:00
Frode Petterson 47d0f830d3 Removed asd 2015-09-02 15:44:38 +02:00
Frode Petterson 7737559dec Fixed off(). 2015-08-27 11:36:07 +02:00
Frode Petterson d8d7fdabdd Replaced nbsp. 2015-08-26 15:58:49 +02:00
Svein-Tore Griff With 8d9781f4ae Also add class when framed 2015-07-30 18:11:59 +02:00
Svein-Tore Griff With 71f147058d Rename isStandalone to isRoot and use ned libraryInfo instead of the so called ubername 2015-07-20 13:40:59 +02:00
Svein-Tore Griff With aa96d726bd Merge branch 'master' of https://github.com/h5p/h5p-php-library 2015-07-20 13:05:48 +02:00
Svein-Tore Griff With 5d1cd188d0 Add duration and scaled to result 2015-07-20 13:05:41 +02:00
Paal Joergensen 56e74c2d68 Renamed H5P.Base to H5P.ContentType. 
Moved H5P.ContentType code to separate file.
Made H5P.ContentType extend H5P.EventDispatcher.
 2015-07-17 13:32:35 +02:00
Paal Joergensen 8cf384f46a Fixed H5P.Base.getLibraryFilePath() bug 2015-07-14 14:46:35 +02:00
Paal Joergensen e36582c714 Added H5P base class that all H5P libraries automatically extends 2015-07-14 14:37:39 +02:00
Svein-Tore Griff With 03370c9500 Add info about the library being used to the xAPI statements 2015-07-10 12:58:02 +02:00
Svein-Tore Griff With 8431304dd0 Remove todos 2015-07-10 11:41:28 +02:00
Frode Petterson 1764e80511 Merge branch 'master' of github.com:h5p/h5p-php-library 2015-06-25 15:15:04 +02:00
Frode Petterson 3e21226b3b No decimals in embed dialog. 2015-06-25 15:14:55 +02:00
Frode Petterson 3d4165df55 Use local variable. 2015-06-23 14:24:19 +02:00
Frode Petterson b9229ba75f Don't try to get data when there's no user. 2015-06-23 11:12:29 +02:00
Frode Petterson c40d273704 Fixed this arg for external dispatcher. 2015-06-04 14:39:02 +02:00
Frode Petterson 8e82b515a2 Prevent updating pagination when there's no table. 2015-05-21 09:50:58 +02:00
Svein-Tore Griff With 227e0829fd Avoid printing very scary error message for all old interactive videos 2015-05-18 15:14:33 +02:00
Frode Petterson 3f6abd722d Prevent crashing if getCopyrights fail. 2015-05-15 12:21:23 +02:00
Svein-Tore Griff With eb6ec29cb6 Remove deprecated name 2015-05-12 16:09:36 +02:00
Frode Petterson ca0c848e0f Use correct element. 2015-05-12 10:04:21 +02:00
Frode Petterson 5568a59854 Pre-generate copyright information. 2015-05-11 16:00:55 +02:00
Frode Petterson ba862f0078 Embed: Always br. Get w/h from correct el. 2015-05-07 15:16:59 +02:00
Frode Petterson e0534dd778 Fixed frame disable broken. Probably a merge gone wrong. 2015-05-07 15:13:28 +02:00
Frode Petterson ccc03782df Cleaned up docs to make JSdoc generation more meaningful. 2015-05-05 13:13:57 +02:00
Thomas Marstrander 9ee8130aae Added copyrights fix. 2015-04-27 13:21:31 +02:00
Frode Petterson 260b6fe044 Restrict IE FullScreen. 2015-04-22 12:55:18 +02:00
Frode Petterson 886c631461 Use correct variable. 2015-04-22 10:58:59 +02:00
Frode Petterson 1c6b818841 Merge branch 'release' 
Conflicts:
	js/h5p.js
 2015-04-22 09:51:36 +02:00
Frode Petterson af8e9e8f30 Relay events to top window. 2015-04-22 09:49:58 +02:00
Frode Petterson c13e0a0a9a Fixed fullscreen checker. 2015-04-21 16:55:23 +02:00
Frode Petterson cdceb41d74 Prevent running multiple resizer. 2015-04-21 16:55:04 +02:00
Frode Petterson b3dea65fd8 Remove element from DOM the correct way. 2015-04-21 16:54:31 +02:00
Frode Petterson 28f8a8dc8a Create a spaceholder when resizing iframes. 2015-04-21 09:09:41 +02:00
Frode Petterson fba8badf1a Use URL template to support URLs of different formatting. 2015-04-20 10:30:52 +02:00
Svein-Tore Griff With 165db6ff6c externalEmbed is either false or undefined it seems 2015-04-16 20:14:53 +02:00
Svein-Tore Griff With cf7ae066ad Add disable support for uploads as well 2015-04-15 13:54:46 +02:00
Svein-Tore Griff With 09c6d5c4f8 Handle cases where a field don't have params 2015-04-14 14:01:28 +02:00
Svein-Tore Griff With 80a80aef7a Better debugging 2015-04-14 14:01:14 +02:00
Svein-Tore Griff With 9a92a61484 Make sure state is ignored when disabled 2015-04-13 20:31:21 +02:00
Svein-Tore Griff With ba2355c2ec Make sure state is ignored when disabled 2015-04-13 20:30:40 +02:00
Svein-Tore Griff With 868c06929d Whitespace changes 2015-04-13 18:41:53 +02:00
Svein-Tore Griff With fba425220e Resolve conflicts 2015-04-13 18:32:33 +02:00
Svein-Tore Griff With 912a670607 Merge branch 'master' into upgrade-speed 2015-04-13 18:16:19 +02:00
Svein-Tore Griff With 497301d6ad Add triggerXAPIScored and deprecate triggerXAPICompleted 2015-04-09 19:42:05 +02:00
Svein-Tore Griff With 5b36e468ac Rewrite so that we add options as an object instead of a very long list of parameters 2015-04-09 14:00:00 +02:00
Frode Petterson ea26ae95db Merge tag 'wp-1.4.0' into upgrade-speed 2015-04-08 09:35:57 +02:00
Svein-Tore Griff With 5b55b78ded createH5PTitle->createTitle 2015-04-07 19:52:18 +02:00
Svein-Tore Griff With 5c3620c637 Bubbling for event system 2015-04-07 19:33:21 +02:00
Svein-Tore Griff With efbe56001d User data fixes 2015-04-07 19:32:44 +02:00
Svein-Tore Griff With 58d0d3e32c Merge branch 'no-url-fopen' into aggregated-xapi 2015-03-24 18:27:23 +01:00
Svein-Tore Griff With c746457a87 Make xAPI work in editor 2015-03-24 18:24:07 +01:00
Frode Petterson 9ae40ad739 Merge branch 'master' into no-url-fopen 2015-03-23 10:53:47 +01:00
Frode Petterson acd3aa2dba Merge branch 'master' of github.com:h5p/h5p-php-library 2015-03-23 10:53:30 +01:00
Frode Petterson cfe73006a2 Added back deprecated function. 2015-03-23 10:53:21 +01:00
Frode Petterson eee77519b7 Always use complete URLs. 2015-03-23 09:45:02 +01:00
Svein-Tore Griff With 8e113ff792 Add parameter set as parameter 5 to new runnable, and blacklist libraries that already have a custom third parameter for their constructor 2015-03-22 20:39:16 +01:00
Svein-Tore Griff With 9d38f83886 Refactor completed listener to use more of the new xAPI api functions 2015-03-22 20:38:57 +01:00
Svein-Tore Griff With eb02a5942d Make externalDispatcher from framed content work again 2015-03-22 20:38:33 +01:00
Svein-Tore Griff With d3453b8637 Context bug fix 2015-03-22 20:38:17 +01:00
Svein-Tore Griff With 5d6d22a13f Accept other verbs than the adl verbs 2015-03-22 20:37:48 +01:00
Svein-Tore Griff With 46c9260755 Don't bubble by default 2015-03-22 20:37:28 +01:00
Svein-Tore Griff With 6b3e550a48 Don't bubble by default 2015-03-22 20:37:10 +01:00
Svein-Tore Griff With 9a204b3d8f Make sure title are added 2015-03-22 15:14:28 +01:00
Svein-Tore Griff With c4e488f9c8 Get contentId from the right place in the statement 2015-03-22 13:27:40 +01:00
Svein-Tore Griff With 5a882e4d55 Improve title generator 2015-03-22 12:45:03 +01:00
Svein-Tore Griff With 93f2bcc01a Use uuid instead of h5pUUID 2015-03-22 12:44:55 +01:00
Svein-Tore Griff With e14c24cc07 Fix xAPI statement structure to follow the standard better 2015-03-22 12:43:07 +01:00
Svein-Tore Griff With 3da0de4626 Fix bubble system 2015-03-22 11:17:58 +01:00
Svein-Tore Griff With 313bb757ba Add bubble system and xAPI context 2015-03-21 16:45:38 +01:00
Svein-Tore Griff With 76b0fc04f8 Make UUID creator available for everyone 2015-03-21 14:16:31 +01:00
Frode Petterson fb82328535 Fullscreen fix 2015-03-13 12:51:31 +01:00
Frode Petterson 7ef9ffbf1f Added default sort option to data view. Improved buttons. 2015-03-11 11:40:07 +01:00
Frode Petterson efd79c9e79 Support init target. 2015-03-10 10:09:31 +01:00
Frode Petterson 72db596bac Make sure H5P.externalEmbed is set inside the iframe. Run H5P.init from external resource to ensure correct execution order in IE9. 2015-03-10 09:53:33 +01:00
Svein-Tore Griff With b45bfe770b Critical bug fix for safari 2015-03-06 12:56:41 +01:00
Frode Petterson 6d4caf855d Fixed error handling. 2015-03-04 11:30:20 +01:00
Frode Petterson c91391e0bc Fixed URLs. 
Finishing touches on the time tracking.
 2015-03-04 11:13:32 +01:00
Frode Petterson 812c3b5e7c Merge branch 'master' into upgrade-speed 2015-03-04 10:21:29 +01:00
Svein-Tore Griff With 96b1014f80 Merge branch 'master' into new-embed 2015-03-03 18:10:07 +01:00
Frode Petterson acca962775 Fixed misplaced stash (after merge). 2015-03-03 11:03:18 +01:00
Frode Petterson 22d085386e Merge branch 'new-embed' of github.com:h5p/h5p-php-library into new-embed 2015-03-02 16:03:48 +01:00
Frode Petterson e961f614a4 Fixed so that iframes can be loaded before resizer script. 2015-03-02 15:53:29 +01:00
Svein-Tore Griff With 99db5699fb Handle anonymous users 2015-03-02 15:49:27 +01:00
Svein-Tore Griff With 553ae243d2 UX improvements to embed code system 2015-03-02 15:01:05 +01:00
Frode Petterson 8e53f62679 Make sure admin container is empty. 2015-03-02 13:42:15 +01:00
Frode Petterson 07cd5c0d42 Added a floating touch. 2015-02-27 15:37:16 +01:00
Frode Petterson 1c1829b13b Fixed integration bug. 2015-02-27 14:53:38 +01:00
Frode Petterson aac10b86fa Make old embed code insert new. 2015-02-27 14:53:26 +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 1e4a7ff26f Removed unused code. 2015-02-27 10:29:43 +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 3463a3c671 Added support for multiple workers during content upgrade. 2015-02-26 16:16:20 +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
Svein-Tore Griff With d6e69e63ee Use this instead of self so that we're compatible with jsdoc 2015-02-20 15:34:38 +01:00
Frode Petterson 1fef537c8c Merge branch 'new-embed' of github.com:h5p/h5p-php-library into new-embed 2015-02-20 13:17:52 +01:00
Frode Petterson 93cd6eea28 Removed empty file. 2015-02-20 13:17:41 +01:00
Frode Petterson f76290cdde Made user results work in new embed. 2015-02-20 11:41:09 +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 e981e7d605 Trigger xAPI events on top as well if inside ifra 2015-02-18 10:59:47 +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 a96e5cc7b9 Make the xAPI integration work for stuff that aren't content types 2015-02-18 09:07:19 +01:00
Svein-Tore Griff With 0a6dd4808b Rename the external api 2015-02-17 10:57:21 +01:00
Svein-Tore Griff With 537c62ab33 Get url to the H5P content from the framework 2015-02-17 10:57:12 +01:00
Svein-Tore Griff With c330282351 Refactor xAPI code 2015-02-16 16:47:04 +01:00
Svein-Tore Griff With b575426f83 Add documentation 2015-02-16 15:30:49 +01:00
Svein-Tore Griff With 2237f026c9 Documentation updates 2015-02-16 14:26:09 +01:00
Svein-Tore Griff With 10fbca1549 Documentation updates 2015-02-16 14:22:54 +01:00
Svein-Tore Griff With 83a077be15 Rename api function 2015-02-12 15:46:25 +01:00
Frode Petterson 9fc5f82b2f Fixed empty frame. 2015-02-12 11:52:55 +01:00
Svein-Tore Griff With 36b1fd2d8c Add helper function to get verbs 2015-02-11 20:06:40 +01:00
Svein-Tore Griff With 5483a3f151 Remove event dispatcher 2015-02-11 18:02:58 +01:00
Svein-Tore Griff With c4aedca522 Resolve conflicts 2015-02-11 18:02:25 +01:00
Svein-Tore Griff With f8434bf788 Add scopes to event system 2015-02-11 17:31:01 +01:00
Svein-Tore Griff With 079f4992b4 bugfixes 2015-02-11 15:56:35 +01:00
Frode Petterson c764d13b32 Moved display options helpers into core. 2015-02-10 16:29:16 +01:00
Frode Petterson 3c712193b3 Merge branch 'master' into settings 
Conflicts:
	styles/h5p.css
 2015-02-09 15:25:09 +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 9a0da8614b Add helper functions 2015-02-05 10:46:55 +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
Frode Petterson 74fc840366 Added support for debugging events. 2014-12-17 16:57:46 +01:00
Frode Petterson acb36845c0 Fixed wrong args. 2014-12-15 11:50:48 +01:00
Svein-Tore Griff With cc455f2b2d Implement changes after testing against Scrom Cloud 2014-11-17 11:08:43 +01:00
Frode Petterson bc5159e272 Added event dispatcher. 2014-11-10 11:31:23 +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
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 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 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 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