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 |
|
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 |