Commit Graph

350 Commits (70ecfd889e306923ccbcb832f6aba87d26b28993)

Author SHA1 Message Date
Frode Petterson 70ecfd889e Merge branch 'release' into stable 2016-02-19 09:30:11 +01:00
Frode Petterson 2fd04da428 Merge branch 'master' into release 2016-02-08 13:21:21 +01:00
Frode Petterson 6257e576ca Corrected german translation format 2016-02-08 09:37:26 +01:00
Frode Petterson 23c04a2f88 Merge pull request #3 from docmoritz/master
created de.json
2016-02-08 09:29:37 +01:00
Sven Peter c393f43292 Merge pull request #1 from docmoritz/docmoritz-patch-1
Create de.json
2016-02-06 15:01:38 +01:00
Frode Petterson 7919ebbf39 Updated FontAwesome dependency 2016-02-05 12:47:53 +01:00
Frode Petterson d8af1ac8d7 Increased patch version 2016-02-03 11:30:38 +01:00
Frode Petterson 4b49a4ff0d Merge branch 'master' into release 2016-02-03 11:28:39 +01:00
Sven Peter 5e1c0c07ba Create de.json
First file I commit, so please look careful!
2016-02-02 21:00:40 +01:00
Frode Petterson bf0dd46cc9 Merge branch 'stable' 2016-01-21 14:35:06 +01:00
Frode Petterson c63a4795ac Merge branch 'release' into stable 2016-01-21 14:34:34 +01:00
Svein-Tore Griff With c24ed57231 Allow links in the success and fail comments (h5p.org/node/6812) HFJ-1539 2016-01-12 17:03:09 +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