Frode Petterson
|
20e133b441
|
Get generic copyrights from content types that doesnt implement getCopyrights.
|
2015-06-19 15:40:35 +02:00 |
Svein-Tore Griff With
|
3cab3010fa
|
Update call to newRunnable to use update api
|
2015-04-07 19:16:44 +02:00 |
Svein-Tore Griff With
|
ab00c5cc94
|
Experiment with bubble system
|
2015-03-21 16:48:32 +01:00 |
Svein-Tore Griff With
|
f064ad59d5
|
resize when displaying solution
|
2015-02-18 18:08:57 +01:00 |
Svein-Tore Griff With
|
061c15a2d6
|
Update to video 1.2 api
|
2015-02-17 11:14:49 +01:00 |
Svein-Tore Griff With
|
d6ecc1705a
|
xAPI update
|
2015-02-13 10:37:59 +01:00 |
Svein-Tore Griff With
|
00e5e81c0b
|
Resolve conflicts and refine
|
2015-02-04 16:40:29 +01:00 |
Thomas Marstrander
|
41063026b4
|
Fixed so not all behaviour of subcontent will be overwritten.
|
2014-12-05 11:55:36 +01:00 |
Thomas Marstrander
|
33f9ea3ba1
|
Added the override settings into the correct subcontent semantics group.
|
2014-12-04 10:26:52 +01:00 |
Thomas Marstrander
|
4897db48fd
|
Semantics description for overrideRetry changed.
|
2014-11-28 15:39:19 +01:00 |
Thomas Marstrander
|
587c593474
|
changed semantics enableRetryButton to enableRetry.
|
2014-11-28 13:51:26 +01:00 |
Thomas Marstrander
|
5510959615
|
Added override-buttons branch.
|
2014-11-27 11:01:47 +01:00 |
Pål Jørgensen
|
f07bd8dfc3
|
Changing background-color from black to white when using background image
|
2014-11-14 15:06:07 +01:00 |
falcon
|
e2efc849c9
|
Shorter function names
|
2014-10-26 22:14:26 +01:00 |
Svein-Tore Griff With
|
f491786c47
|
Added xAPI support
|
2014-10-13 21:51:36 +02:00 |
Frode Petterson
|
8a71d3689e
|
Merge branch 'api-1.1' into api-1.2
|
2014-06-27 11:12:53 +02:00 |
Frode Petterson
|
1a6cc9b09d
|
Merge branch 'master' into api-1.1
|
2014-06-27 11:12:42 +02:00 |
Frode Petterson
|
76fb66317c
|
Added back text to finish button.
|
2014-06-27 11:12:31 +02:00 |
Frode Petterson
|
cdbcc3ad92
|
Merge branch 'api-1.1' into api-1.2
|
2014-06-26 16:23:46 +02:00 |
Frode Petterson
|
4c5c3ffe86
|
Merge branch 'master' into api-1.1
|
2014-06-26 16:23:35 +02:00 |
Frode Petterson
|
24f877cc8e
|
Removed text from nav buttons.
|
2014-06-26 16:23:12 +02:00 |
Frode Petterson
|
5ec069dad4
|
Merge branch 'api-1.1' into api-1.2
|
2014-04-30 12:20:51 +02:00 |
Frode Petterson
|
dd52d82dcf
|
Merge branch 'master' into api-1.1
|
2014-04-30 12:20:33 +02:00 |
Frode Petterson
|
ada5e81c87
|
Added support for custom background on intro page.
|
2014-04-30 12:19:55 +02:00 |
Pål Jørgensen
|
df90fb8e70
|
Merge branch 'api-1.1' into api-1.2
|
2014-04-15 14:48:53 +02:00 |
Pål Jørgensen
|
8f7c1b0817
|
Merge branch 'master' into api-1.1
|
2014-04-15 14:48:40 +02:00 |
Pål Jørgensen
|
b6ba0e4c34
|
Made title text div not beeing rendered if no title set
|
2014-04-15 14:48:28 +02:00 |
Pål Jørgensen
|
0bc40d1ef2
|
Merge branch 'api-1.1' into api-1.2
|
2014-04-15 11:33:31 +02:00 |
Pål Jørgensen
|
272f8febb1
|
Merge branch 'master' into api-1.1
|
2014-04-15 11:33:21 +02:00 |
Pål Jørgensen
|
61e62185a6
|
Made introduction text div not beeing rendered if no intro text set
|
2014-04-15 11:33:01 +02:00 |
Frode Petterson
|
10f9a0b447
|
Merge branch 'master' into api-1.1
|
2014-04-11 15:50:48 +02:00 |
Frode Petterson
|
bc9b787e78
|
Fixed resize bug when embedded.
|
2014-04-11 15:50:22 +02:00 |
Pål Jørgensen
|
282e9e77e4
|
Merge branch 'api-1.1' into api-1.2
|
2014-04-03 10:21:02 +02:00 |
Pål Jørgensen
|
ce5d97b485
|
Merge branch 'master' into api-1.1
|
2014-04-03 10:20:35 +02:00 |
Pål Jørgensen
|
9179f6209a
|
Added transparent background-color to title and description fields on intro-page
|
2014-04-03 10:19:47 +02:00 |
Pål Jørgensen
|
b289d25949
|
Merge branch 'api-1.1' into api-1.2
|
2014-04-02 15:17:45 +02:00 |
Pål Jørgensen
|
8f62a51fe5
|
Merge branch 'master' into api-1.1
|
2014-04-02 15:17:25 +02:00 |
Pål Jørgensen
|
31ddbd8379
|
Made getCopyrights work with empty optional fields
|
2014-04-02 00:10:30 +02:00 |
Frode Petterson
|
4c777b3397
|
Merge branch 'api-1.0'
|
2014-03-23 01:34:13 +01:00 |
Frode Petterson
|
7eca1c8c0b
|
HFJ-256: Added missing copyrights to boardgame.
|
2014-03-23 01:32:38 +01:00 |
Frode Petterson
|
aa5387feef
|
HFJ-256: Added missing copyrights to boardgame.
|
2014-03-23 01:27:49 +01:00 |
Pål Jørgensen
|
0f8892d697
|
Merge branch 'api-1.2' of b.amendor.com:h5p into api-1.2
Conflicts:
example_content/boardgame/H5P.Boardgame/js/boardgame.js
|
2014-03-21 13:50:44 +01:00 |
Pål Jørgensen
|
8b50061e01
|
Fixed resizing in embed-iframe
|
2014-03-21 13:49:38 +01:00 |
Frode Petterson
|
2d95ac1d7a
|
Merge branch 'master' into api-1.2
Conflicts:
example_content/coursepresentation/H5P.CoursePresentation/library.json
example_content/coursepresentation/H5P.Image/library.json
example_content/interactive-video/H5P.InteractiveVideo/library.json
example_content/interactive-video/H5P.InteractiveVideo/scripts/interactive-video.js
|
2014-03-21 12:26:58 +01:00 |
Frode Petterson
|
4171fd0327
|
Merge branch 'api-1.0'
|
2014-03-21 12:23:23 +01:00 |
Frode Petterson
|
6c9634eae7
|
HFJ-187: Fixed copyrights for boardgame and libraries used there.
|
2014-03-21 09:37:39 +01:00 |
Frode Petterson
|
36237099d6
|
HFJ-188: Fixed libraries resize support.
|
2014-03-19 10:13:37 +01:00 |
Frode Petterson
|
856f0e8412
|
HFJ-179: Fixed usage of api-1.1
|
2014-03-19 09:26:33 +01:00 |
Frode Petterson
|
eb7ccdd523
|
HFJ-179: Prepared for new API version. Using new resize events, removed some deprecated stuff. Fixed a bug in CP editor.
|
2014-02-24 16:26:07 +01:00 |
Svein-Tore Griff With
|
bf3f3d0518
|
Fix a bug so that result heading in questionset translateable
|
2014-01-15 20:35:48 +01:00 |