ed1fb00745
Merge branch 'release' into improved-file-handling
2016-11-30 11:19:08 +01:00
9b0d77a721
Check instanceof score as well to validate number.
...
HFP-215
2016-11-19 12:29:38 +01:00
f82f3a354c
Removed debug
...
HFP-86
2016-11-17 13:27:41 +01:00
d55134151c
Moved registering of external dispatcher listener.
...
- This will dispatch events that are dispatched inside the constructor of
content types
HFP-86
2016-11-17 12:56:15 +01:00
6001b68b99
Making naming harder to misunderstand
2016-11-11 11:57:54 +01:00
7e90871cb7
Fixing typo
2016-11-11 11:51:20 +01:00
96f84a430a
Added semi fullscreen function
2016-11-11 11:45:59 +01:00
1173341b76
Merge branch 'release' into improved-file-handling
2016-11-01 16:30:32 +01:00
426f51caa0
Check that score is a number before storing it to the database.
...
HFP-173
(cherry picked from commit bae3145
2016-10-28 13:49:03 +02:00
b4949c0d83
Don't store results if they have no score.
...
HFP-173
(cherry picked from commit 516c70a
2016-10-28 10:46:40 +02:00
c88c049438
Check if contents is set before using
...
h5p/h5p-moodle-plugin#112
2016-09-09 09:19:55 +02:00
e8f90c9116
Allow overriding of content URLs
...
h5p/h5p-moodle-plugin#112
2016-09-08 16:34:53 +02:00
d946f32b81
Merge branch 'master' into improved-file-handling
2016-08-02 13:37:26 +02:00
9f7b545f02
Added lost part of old fix
...
HVP-212
2016-07-15 16:14:32 +02:00
fca0537a4d
Use context and token in URL prefix
2016-06-13 10:31:09 +02:00
b261754cf1
Merge branch 'release' into improved-file-handling
2016-06-07 14:28:12 +02:00
f4cee6e284
Moved deletion of content user data to after dialog is closed [HFJ-1989]
2016-06-07 11:09:42 +02:00
7807b8af68
Making sure reset dialog is only shown once [HFJ-1989]
2016-06-06 16:09:35 +02:00
b102a7de21
Only add editor context when in editor.
...
HFJ-1972
2016-05-31 14:43:12 +02:00
73a23d4679
Send context id together with post data in order to determine our context.
...
HFJ-1964
2016-05-30 10:35:06 +02:00
6869ecbb09
Handling several digits in major and minor version
2016-04-21 13:22:01 +02:00
84d93af447
Merge branch 'master' of github.com:h5p/h5p-php-library
2016-04-08 13:19:31 +02:00
9741dd882d
Improved action bar buttons
...
Now supports space bar.
HFJ-1549
2016-04-08 13:18:35 +02:00
bf7f5c863c
Confirmation dialog adjustments.
...
Translated copyright dialog default texts.
Removed focus on click.
Adjusted left positioning when showing dialog.
Adjusted max width of dialog.
HFJ-1572
2016-04-07 14:51:56 +02:00
4d277b2304
Added version number and links to licenses.
...
HFJ-1734
2016-03-31 16:07:45 +02:00
14605dc790
A more natural tabindex
...
HFJ-1549
2016-03-17 14:22:23 +01:00
b42193729e
Merge branch 'improved-ajax' into improved-ajax-moodle
...
Conflicts:
h5p.classes.php
2016-02-25 14:55:27 +01:00
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
4e06733ffb
Use correct message
2016-02-22 12:01:18 +01:00
0aebdb345b
Lets use a simpler solution
2016-02-22 11:58:25 +01:00
256bf1b6d2
Revert "Improved results and contentuserdata saving by queueing requests"
...
This reverts commit 3849f3a054
2016-02-22 11:56:52 +01:00
bfcf4228db
Use variable with complete path HFJ-1695
2016-02-22 10:38:33 +01:00
3849f3a054
Improved results and contentuserdata saving by queueing requests
2016-02-19 12:57:53 +01:00
3991875439
Avoid navigating inside iframe
...
HFJ-1479
2016-01-27 12:42:55 +01:00
11481c3b4b
Merge branch 'master' into file-storage-interface
2016-01-13 15:44:31 +01:00
1bf393a9af
Allow custom URL for libraries
2016-01-13 08:45:00 +01:00
510016b1cc
Merge branch 'release' of github.com:h5p/h5p-php-library into release
2016-01-05 13:58:20 +01:00
59901fd1c9
Fixed resizing script trying to access iframe content
...
HFJ-1512
2016-01-05 13:57:16 +01:00
e83b213183
Made content state saving more robust [HFJ-1450]
2015-12-18 10:06:33 +01:00
2d0e409ac4
Made content state beeing saved on safari@iPad when closing tab and leaving tab
2015-12-16 09:50:58 +01:00
3c34ab223a
Prevent assigning to the htmlcollection.
2015-11-13 11:18:53 +01:00
16aa6813ae
Use correct variable
2015-11-06 15:35:06 +01:00
2f5e1fcc91
Use correct variable.
2015-11-05 16:52:38 +01:00
7a369de7e7
Avoid undefined errors
2015-11-04 17:30:58 +01:00
f0530957ad
Improved semi-fullscreen for iPad.
2015-10-27 16:57:28 +01:00
2d43942c48
Use parent window instead of top for communications.
2015-09-10 14:27:12 +02:00
d8d7fdabdd
Replaced nbsp.
2015-08-26 15:58:49 +02:00
8d9781f4ae
Also add class when framed
2015-07-30 18:11:59 +02:00
71f147058d
Rename isStandalone to isRoot and use ned libraryInfo instead of the so called ubername
2015-07-20 13:40:59 +02:00
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
8cf384f46a
Fixed H5P.Base.getLibraryFilePath() bug
2015-07-14 14:46:35 +02:00
e36582c714
Added H5P base class that all H5P libraries automatically extends
2015-07-14 14:37:39 +02:00
03370c9500
Add info about the library being used to the xAPI statements
2015-07-10 12:58:02 +02:00
8431304dd0
Remove todos
2015-07-10 11:41:28 +02:00
1764e80511
Merge branch 'master' of github.com:h5p/h5p-php-library
2015-06-25 15:15:04 +02:00
3e21226b3b
No decimals in embed dialog.
2015-06-25 15:14:55 +02:00
3d4165df55
Use local variable.
2015-06-23 14:24:19 +02:00
b9229ba75f
Don't try to get data when there's no user.
2015-06-23 11:12:29 +02:00
c40d273704
Fixed this arg for external dispatcher.
2015-06-04 14:39:02 +02:00
227e0829fd
Avoid printing very scary error message for all old interactive videos
2015-05-18 15:14:33 +02:00
3f6abd722d
Prevent crashing if getCopyrights fail.
2015-05-15 12:21:23 +02:00
ca0c848e0f
Use correct element.
2015-05-12 10:04:21 +02:00
5568a59854
Pre-generate copyright information.
2015-05-11 16:00:55 +02:00
ba862f0078
Embed: Always br. Get w/h from correct el.
2015-05-07 15:16:59 +02:00
e0534dd778
Fixed frame disable broken. Probably a merge gone wrong.
2015-05-07 15:13:28 +02:00
ccc03782df
Cleaned up docs to make JSdoc generation more meaningful.
2015-05-05 13:13:57 +02:00
9ee8130aae
Added copyrights fix.
2015-04-27 13:21:31 +02:00
260b6fe044
Restrict IE FullScreen.
2015-04-22 12:55:18 +02:00
886c631461
Use correct variable.
2015-04-22 10:58:59 +02:00
1c6b818841
Merge branch 'release'
...
Conflicts:
js/h5p.js
2015-04-22 09:51:36 +02:00
af8e9e8f30
Relay events to top window.
2015-04-22 09:49:58 +02:00
c13e0a0a9a
Fixed fullscreen checker.
2015-04-21 16:55:23 +02:00
fba8badf1a
Use URL template to support URLs of different formatting.
2015-04-20 10:30:52 +02:00
cf7ae066ad
Add disable support for uploads as well
2015-04-15 13:54:46 +02:00
9a92a61484
Make sure state is ignored when disabled
2015-04-13 20:31:21 +02:00
ba2355c2ec
Make sure state is ignored when disabled
2015-04-13 20:30:40 +02:00
868c06929d
Whitespace changes
2015-04-13 18:41:53 +02:00
fba425220e
Resolve conflicts
2015-04-13 18:32:33 +02:00
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
5b55b78ded
createH5PTitle->createTitle
2015-04-07 19:52:18 +02:00
efbe56001d
User data fixes
2015-04-07 19:32:44 +02:00
58d0d3e32c
Merge branch 'no-url-fopen' into aggregated-xapi
2015-03-24 18:27:23 +01:00
9ae40ad739
Merge branch 'master' into no-url-fopen
2015-03-23 10:53:47 +01:00
acd3aa2dba
Merge branch 'master' of github.com:h5p/h5p-php-library
2015-03-23 10:53:30 +01:00
cfe73006a2
Added back deprecated function.
2015-03-23 10:53:21 +01:00
eee77519b7
Always use complete URLs.
2015-03-23 09:45:02 +01:00
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
5a882e4d55
Improve title generator
2015-03-22 12:45:03 +01:00
313bb757ba
Add bubble system and xAPI context
2015-03-21 16:45:38 +01:00
76b0fc04f8
Make UUID creator available for everyone
2015-03-21 14:16:31 +01:00
fb82328535
Fullscreen fix
2015-03-13 12:51:31 +01:00
efd79c9e79
Support init target.
2015-03-10 10:09:31 +01:00
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
b45bfe770b
Critical bug fix for safari
2015-03-06 12:56:41 +01:00
acca962775
Fixed misplaced stash (after merge).
2015-03-03 11:03:18 +01:00
e961f614a4
Fixed so that iframes can be loaded before resizer script.
2015-03-02 15:53:29 +01:00
553ae243d2
UX improvements to embed code system
2015-03-02 15:01:05 +01:00
07cd5c0d42
Added a floating touch.
2015-02-27 15:37:16 +01:00
f2595b2bce
Change how H5Ps are integrated.
2015-02-27 13:59:42 +01:00
77d589ec68
Fixed absolute URLs violating its parent.
2015-02-27 10:55:47 +01:00
4e594dd573
Fixed dialog pos and expand.
2015-02-27 10:26:57 +01:00
037e26f42b
Space support.
2015-02-27 08:57:02 +01:00
fabde2f1ce
Automatic positioning.
2015-02-25 13:05:45 +01:00
1861f696c1
Added new embed design.
2015-02-25 12:10:07 +01:00
0c5aacfa24
Fixed old fullscreen exit in iframe.
2015-02-24 16:02:14 +01:00
971a55df58
Satisfy JSHint and prevent crashing.
2015-02-20 10:26:33 +01:00
688b00f55e
Merge branch 'master' into new-embed
...
Conflicts:
js/h5p.js
2015-02-20 10:15:36 +01:00
2b1c894307
Merge branch 'master' into settings
...
Conflicts:
h5p.classes.php
2015-02-19 15:50:04 +01:00
c7c46bc779
Fix spelling error
2015-02-18 15:20:20 +01:00
0d8fe7498c
Remove code not being used
2015-02-18 15:08:55 +01:00
d6db07481e
Make sure the contentId is set on content types
2015-02-18 09:07:57 +01:00
1995da20bb
Remove old todo items
2015-02-18 09:07:38 +01:00
0a6dd4808b
Rename the external api
2015-02-17 10:57:21 +01:00
c330282351
Refactor xAPI code
2015-02-16 16:47:04 +01:00
9fc5f82b2f
Fixed empty frame.
2015-02-12 11:52:55 +01:00
a0c5fe0e18
Comment out semi full screen.
2015-02-09 11:51:39 +01:00
11d9cb2f35
Trigger events.
2015-02-09 11:47:33 +01:00
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
c8a2465827
Add documentation and change function names for deprecated functions
2015-02-04 18:43:06 +01:00
21674d31ac
Merge branch 'master' into settings
...
Conflicts:
js/h5p.js
2015-02-04 09:32:03 +01:00
efdd7f9f7a
Moving x-api and Event handling code to separate files and refining it
2015-02-03 20:11:01 +01:00
3beaa8302a
Remove H5P special chars
2015-01-14 18:13:23 +01:00
62618104af
Resolve conflict
2015-01-14 18:09:18 +01:00
64dd059c03
Add support for deprecated event system
2015-01-14 18:08:36 +01:00
61eb998d48
Add xAPI todo list
2015-01-14 17:27:32 +01:00
ec4678bf0b
Fixed issue #2397891 (drupal.org), and made jshint a little happier
2014-12-30 10:54:26 +01:00
cc455f2b2d
Implement changes after testing against Scrom Cloud
2014-11-17 11:08:43 +01:00
57db1d9926
Revert "Add htmlSpecialChars"
...
This reverts commit 41ed0c18e4
2014-11-03 10:15:23 +01:00
05d9982070
Add code to make it easy for others to register for xAPI events
2014-11-02 21:37:30 +01:00
5d32c4451c
Add real url to statement object
2014-11-02 21:30:19 +01:00
378224f7c6
Get real actor
2014-11-02 21:16:27 +01:00
01779c0004
Use score instead of points
2014-11-02 21:16:19 +01:00
658db52f89
Resolve conflicts
2014-11-02 21:07:08 +01:00
41ed0c18e4
Add htmlSpecialChars
2014-11-02 17:52:39 +01:00
9391b60a03
Refactoring xAPI to use inheritence and event classes
2014-11-01 21:54:42 +01:00
b3da2c5b32
Resolving conflicts
2014-11-01 20:42:34 +01:00
f22cfb05b7
Merge branch 'master' into flat-copyrights
2014-11-01 13:49:26 +01:00
dd83933a0a
Remove }
2014-11-01 13:47:24 +01:00
ad03edf662
Added generic fallback for libraries that hasn't implemented getCopyrights.
2014-10-30 15:51:20 +01:00
22a559ccd8
Shorter function names and a few bugfixes
2014-10-26 22:18:28 +01:00
6c38bfe38c
Merge branch 'whitelist' into settings
2014-10-23 15:31:34 +02:00
2f160909e3
Merge branch 'without-pal' into user-results
2014-10-23 15:19:52 +02:00
af2f01cbb7
Added support for real fullscreen on Android devices.
2014-10-23 15:00:37 +02:00
2636ddc393
Make it easy to disable generic content features.
2014-10-23 14:02:34 +02:00
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
5922786982
xAPI
2014-10-13 22:19:59 +02:00
1479138abb
Did some jshint cleanup and removal of empty spaces.
2014-10-01 10:18:04 +02:00
3442954971
Revert "Merge branch 'adding-htmlspecialchars-to-h5p' into without-pal"
...
This reverts commit 9f19f64bab38c98202f4
2014-09-24 15:35:47 +02:00
1236eb5fd1
Revert "Merge branch 'adding-htmlspecialchars-to-h5p' into without-pal"
...
This reverts commit 687fd8ddbcab1b691a27
2014-09-24 15:34:34 +02:00
7e669884ce
Correct capitalization of H5P.htmlspecialchars function
2014-09-23 13:01:39 +02:00
Paal Joergensen
thomasmars
Frode Petterson
Svein-Tore Griff With
Pål Jørgensen