falcon
|
0b7d2e2b36
|
Merge branch 'release'
|
2015-10-01 09:41:34 +02:00 |
Thomas Marstrander
|
198ae5fd3e
|
Add 'finish' button as hidden, do not show it before all questions has been answered. [HFJ-1029]
|
2015-09-26 17:38:07 +02:00 |
Frode Petterson
|
b00490bbe6
|
Added wysiwyg support to title field.
|
2015-09-25 11:13:05 +02:00 |
|
Frode Petterson
|
439f850729
|
Prevent crashing JS.
|
2015-09-25 10:57:23 +02:00 |
|
Thomas Marstrander
|
e0f8afb3f9
|
Make sure content is resized after images in content types are laoded. [HFJ-1091]
|
2015-09-24 13:16:54 +02:00 |
|
Thomas Marstrander
|
9b0844c480
|
Display error stack as well as useful error message.
HFJ-946
|
2015-08-20 16:16:02 +02:00 |
|
Thomas Marstrander
|
7c6aa504fd
|
Replaced console logs with useful error messages.
HFJ-946
|
2015-08-20 16:14:29 +02:00 |
|
Thomas Marstrander
|
fdc91abcf8
|
Removed debugging lines
HFJ-946
|
2015-08-18 14:02:13 +02:00 |
|
Thomas Marstrander
|
0fb9b8882f
|
Added Question design to QS
HFJ-946
|
2015-08-18 13:58:33 +02:00 |
|
Thomas Marstrander
|
ad0acb2898
|
Changed retry icon for whole task for consistency.
Accepts answered and attempted xapi verbs as well to mark a question as answered.
HFJ-946
|
2015-08-13 10:35:55 +02:00 |
|
Thomas Marstrander
|
c4a78bfdcd
|
Use new button design.
Add navigation buttons to Question, instead of to QS.
Added specific stylings for new button design.
HFJ-946
|
2015-08-12 14:46:49 +02:00 |
|
Svein-Tore Griff With
|
b399f9530d
|
xAPI update - add duration to xAPI
|
2015-07-20 13:22:22 +02:00 |
|
Svein-Tore Griff With
|
436b9d572c
|
Sub content is not allowed to generate completed statements
|
2015-07-10 13:41:16 +02:00 |
|
Svein-Tore Griff With
|
cce3af6078
|
Replace attempted with interacted
|
2015-07-10 13:15:37 +02:00 |
|
Thomas Marstrander
|
02d3585425
|
Resize on video loaded and when results are already rendered.
(cherry picked from commit b02fe7c)
|
2015-07-08 15:08:43 +02:00 |
|
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 |