Commit Graph

764 Commits (bc88381ec476013d4419e25380b29f650fbf0444)

Author SHA1 Message Date
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
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
Svein-Tore Griff With b9d8321c3e Merge branch 'stable' 2015-07-09 15:49:20 +02:00
Svein-Tore Griff With 729842a41a Merge branch 'release' into stable 2015-07-09 15:20:31 +02:00
Svein-Tore Griff With d38867bfd0 bump 2015-07-09 15:19:18 +02:00
Frode Petterson 18e2168383 Added missing translation. 2015-07-08 15:31:50 +02:00
Frode Petterson 56bb61352e Added missing translation. 2015-07-08 15:27:16 +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
Thomas Marstrander b02fe7c668 Resize on video loaded and when results are already rendered. 2015-07-08 11:01:20 +02:00
Paal Joergensen 12818e2684 Merge branch 'stable' of github.com:h5p/h5p-question-set into stable 2015-06-22 14:52:17 +02:00
Svein-Tore Griff With 3f0c1ee0bf bump 2015-06-22 14:49:16 +02:00
Paal Joergensen 997db862e7 Bump 2015-06-22 14:22:25 +02:00
Paal Joergensen 15c3e72c52 Merge branch 'release' into stable 2015-06-22 14:16:48 +02:00
Frode Petterson e090c94444 Translations. 2015-06-22 13:51:30 +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 c282dbf72f Merge branch 'stable' 2015-06-12 11:06:37 +02:00
Svein-Tore Griff With 25df26cdba Merge branch 'release' into stable 2015-06-09 15:49:15 +02:00
Thomas Marstrander ea6af64c31 New DragQ version dependency, version bump 2015-05-15 10:42:20 +02:00
Svein-Tore Griff With d28cba03a3 Merge branch 'master' into release 2015-05-12 14:15:22 +02:00
Svein-Tore Griff With dda734b793 Merge branch 'stable' 2015-04-22 23:38:41 +02:00
Svein-Tore Griff With 85c5f54593 Merge branch 'release' into stable 2015-04-22 23:00:40 +02:00
Svein-Tore Griff With 3cc6337c81 Question set minor version has been bumped twice, correct this 2015-04-14 13:56:32 +02:00
Svein-Tore Griff With d43fa38f29 Add upgrade script for adding sub content id 2015-04-08 15:04:29 +02:00