Frode Petterson
|
c63a4795ac
|
Merge branch 'release' into stable
|
2016-01-21 14:34:34 +01:00 |
|
Frode Petterson
|
51c614a2be
|
Updated MarkTheWords
|
2015-12-11 12:51:27 +01:00 |
Paal Joergensen
|
bc1dd91715
|
Bumped version
|
2015-12-02 15:45:43 +01:00 |
|
Paal Joergensen
|
e30df40148
|
Merge remote-tracking branch 'origin/master' into release
|
2015-12-02 14:05:28 +01:00 |
|
Paal Joergensen
|
1e4ec27ae3
|
currentQuestion had to be set earlier [HFJ-1400]
|
2015-12-01 14:42:04 +01:00 |
Svein-Tore Griff With
|
db69bc60a3
|
Add question number to interactions - HFJ-1400
|
2015-11-28 21:00:16 +01:00 |
Svein-Tore Griff With
|
370c5c8803
|
Trigger attempted event the first time a user sees a question - HFJ-1397
|
2015-11-27 20:40:48 +01:00 |
Thomas Marstrander
|
93a6fbdfc9
|
Let Question and QuestionSet behaviour settings decide if try again and show solution buttons should be shown. [HFJ-1363]
|
2015-11-23 15:26:15 +01:00 |
|
Frode Petterson
|
fcbcfc951e
|
Only pause is needed in Question Set
(questions only have pause)
HFJ-1218
|
2015-11-18 10:00:44 +01:00 |
|
Frode Petterson
|
a36014c1e0
|
Stop video when finished
HFJ-1218
|
2015-11-18 10:00:19 +01:00 |
|
Frode Petterson
|
2d9a7cccda
|
Added missing semi colon
HFJ-1218
|
2015-11-18 09:59:45 +01:00 |
|
Thomas Marstrander
|
3a038ea027
|
Fixed stopping media when changing question.[HFJ-1218]
|
2015-11-18 09:38:44 +01:00 |
|
Paal Joergensen
|
45a22dec8d
|
Merge branch 'resizing-not-working-for-safari'
Conflicts:
library.json
|
2015-11-09 13:14:05 +01:00 |
|
Paal Joergensen
|
3111ef3fa6
|
Bump
|
2015-11-09 13:12:46 +01:00 |
|
Paal Joergensen
|
9badc69edf
|
Disabled max-height transistion on H5P.Question buttons
|
2015-11-09 13:11:36 +01:00 |
|
Paal Joergensen
|
3423fabc15
|
Revert "Added wysiwyg support to title field."
This reverts commit b00490bbe6.
|
2015-11-06 14:24:11 +01:00 |
|
Frode Petterson
|
f66b7452b7
|
Updated MC
|
2015-11-06 09:20:36 +01:00 |
Svein-Tore Griff With
|
cbf3cb25c4
|
Merge pull request #2 from garemoko/patch-1
Report quiz set success
|
2015-11-01 00:24:15 +01:00 |
|
Frode Petterson
|
b57423bdc7
|
Updated italian translation.
|
2015-10-27 10:48:43 +01:00 |
Andrew Downes
|
4a0d548c64
|
Report quiz set success
Depends on https://github.com/h5p/h5p-php-library/pull/4
|
2015-10-20 11:32:51 +01:00 |
|
Frode Petterson
|
2bc6b0598c
|
Merge branch 'stable'
|
2015-10-12 09:26:04 +02:00 |
|
Frode Petterson
|
7e398ff1da
|
Upped patch version.
|
2015-10-12 09:24:33 +02:00 |
|
Frode Petterson
|
80c6b0678d
|
Resize QS container when Q changes size.
|
2015-10-12 09:22:37 +02:00 |
|
Frode Petterson
|
767ec106a5
|
Merge branch 'stable'
|
2015-10-08 13:06:01 +02:00 |
|
Frode Petterson
|
7bb0a928f1
|
Merge branch 'release' into stable
|
2015-10-07 10:02:12 +02:00 |
|
falcon
|
0b7d2e2b36
|
Merge branch 'release'
|
2015-10-01 09:41:34 +02:00 |
|
Thomas Marstrander
|
a6299e94e4
|
Do not show try-again and show-solution button for questions inside a question set. [HFJ-1110]
|
2015-09-27 19:12:40 +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
|
2e307e8e55
|
Increased minor version and dependency to JoubelUI. [HFJ-1088]
|
2015-09-24 15:39:12 +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
|
848a680de4
|
Increase patch version
|
2015-09-15 09:49:28 +02:00 |
|
Thomas Marstrander
|
e1ce82fcf4
|
Merge branch 'release'
|
2015-09-10 13:30:12 +02:00 |
|
Thomas Marstrander
|
4f7c4e7771
|
Increased dependencies to match other content types [HFJ-1007]
|
2015-09-09 16:22:46 +02:00 |
|
Thomas Marstrander
|
312a2a3874
|
Merge branch 'master' into release
|
2015-09-04 09:39:56 +02:00 |
|
Frode Petterson
|
ef302b1173
|
Updated title and description.
|
2015-08-28 10:41:49 +02:00 |
|
Frode Petterson
|
5bd2d30b01
|
Merge pull request #1 from Stephlabaraque/patch-1
Update fr.json
|
2015-08-26 11:01:11 +02:00 |
Stephlabaraque
|
a6b11ba71c
|
Update fr.json
|
2015-08-25 19:08:14 +02:00 |
|
Frode Petterson
|
031b4bb8e8
|
Merge branch 'always-continue'
|
2015-08-25 08:49:11 +02:00 |
|
Frode Petterson
|
5e1874d9a8
|
Merge branch 'master' into always-continue
|
2015-08-24 14:38:27 +02:00 |
|
Frode Petterson
|
7da44eb0f9
|
Added French language support.
|
2015-08-21 16:38:26 +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
|
b9cd56820f
|
Adjusted paddings/margins for H5P.Question
HFJ-942
|
2015-08-19 16:05:16 +02:00 |
|
Thomas Marstrander
|
8623bb5670
|
Repositioned buttons, added bottom margin, repositioned feedback-text.
HFJ-946
|
2015-08-18 14:16:07 +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
|
396abf92b7
|
No left, right, top or bot margins for Questions inside QS without frame.
HFJ-949
|
2015-08-12 15:30:10 +02:00 |