Commit Graph

689 Commits (0d62e5eccb06895947dbc904ef587931ec1e7c12)

Author SHA1 Message Date
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
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 4aef67c14f Update dependencies 2015-04-07 19:00:11 +02:00
Svein-Tore Griff With 10ab46e91e Merge branch 'aggregated-xapi' 2015-04-07 18:41:59 +02:00
Frode Petterson c64e8285a1 Added italian translation 2015-04-07 10:21:35 +02:00
Svein-Tore Griff With 2bd5843e97 Use correct mc version 2015-03-22 20:59:59 +01:00
Svein-Tore Griff With ab00c5cc94 Experiment with bubble system 2015-03-21 16:48:32 +01:00
Frode Petterson fffe9d318e Updated AR translation. Thanks to community user farrisimin for contributing. 2015-03-20 14:35:34 +01:00
Frode Petterson 8ab4bd5b76 Added AR language support. Big thanks to community user farrisimin for contributing. 2015-03-18 15:21:22 +01:00
Svein-Tore Griff With 84eea1e44a Merge branch 'master' into stable 2015-02-19 02:18:17 +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 8c6fb5c2e5 Resolve conflict 2015-02-12 14:08:44 +01:00
Svein-Tore Griff With aeee49e85e dependency version updates 2015-02-12 14:07:07 +01:00
Svein-Tore Griff With 186ef396e2 Merge branch 'text-editor' 2015-02-05 12:11:47 +01:00
Svein-Tore Griff With 9777d3964e Correct author 2015-02-04 20:57:49 +01:00
Svein-Tore Griff With 7c519e770d Update core version and minor version 2015-02-04 18:13:03 +01:00
Svein-Tore Griff With 00e5e81c0b Resolve conflicts and refine 2015-02-04 16:40:29 +01:00
Svein-Tore Griff With 5c158d235f Run in iframe since drag and drop needs iframe 2015-01-29 13:13:07 +01:00
Svein-Tore Griff With 2e3736c22b Merge branch 'text-editor' of github.com:h5p/h5p-question-set into text-editor 2015-01-19 12:11:53 +01:00
Frode Petterson 894220c525 Merge branch 'master' into text-editor 2015-01-16 15:55:25 +01:00
Svein-Tore Griff With 07e49c69e9 Merge branch 'master' into stable 2015-01-13 18:41:53 +01:00
Svein-Tore Griff With 7f97c036ba Merge branch 'master' of github.com:h5p/h5p-question-set 2015-01-13 15:02:57 +01:00
Frode Petterson 1e2f94c15a Changed version to make upgraded question types work. 2015-01-08 14:39:55 +01:00
Svein-Tore Griff With b85f744541 Merge branch 'master' of github.com:h5p/h5p-question-set 2014-12-17 13:37:44 +01:00