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 |
Thomas Marstrander
|
ab62111f31
|
Fixed nn and nb languge semantics
|
2014-12-17 13:33:59 +01:00 |
|
Svein-Tore Griff With
|
e4491980bb
|
Merge branch 'override-buttons'
|
2014-12-16 09:12:38 +01:00 |
|
Svein-Tore Griff With
|
82898e6fac
|
Merge branch 'override-buttons' of github.com:h5p/h5p-question-set into override-buttons
|
2014-12-15 09:09:44 +01:00 |
|
Thomas Marstrander
|
41063026b4
|
Fixed so not all behaviour of subcontent will be overwritten.
|
2014-12-05 11:55:36 +01:00 |
|
Svein-Tore Griff With
|
3f7d5a52f8
|
Merge branch 'override-buttons' of github.com:h5p/h5p-question-set into override-buttons
|
2014-12-04 12:44:56 +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
|
1d5dd18742
|
Updated question minor versions.
|
2014-12-04 10:13:06 +01:00 |
|
Frode Petterson
|
0165ebb695
|
Added textual editor.
|
2014-12-03 13:02:31 +01:00 |
|
Svein-Tore Griff With
|
549216fd31
|
Merge branch 'override-buttons' of github.com:h5p/h5p-question-set into override-buttons
|
2014-12-02 13:09:50 +01:00 |
|
Thomas Marstrander
|
4897db48fd
|
Semantics description for overrideRetry changed.
|
2014-11-28 15:39:19 +01:00 |
|
Svein-Tore Griff With
|
e465c08953
|
Merge branch 'override-buttons' of github.com:h5p/h5p-question-set into override-buttons
|
2014-11-28 14:55:59 +01:00 |
|
Thomas Marstrander
|
587c593474
|
changed semantics enableRetryButton to enableRetry.
|
2014-11-28 13:51:26 +01:00 |
|
Svein-Tore Griff With
|
02589ff35a
|
Textual improvements in semantics
|
2014-11-27 13:39:39 +01:00 |
|
Thomas Marstrander
|
5510959615
|
Added override-buttons branch.
|
2014-11-27 11:01:47 +01:00 |
|
Svein-Tore Griff With
|
6a064e70b5
|
Merge branch 'markTheWords'
|
2014-11-25 13:07:44 +01:00 |
|
Svein-Tore Griff With
|
cd4fae18e4
|
Merge branch 'master' into markTheWords
|
2014-11-25 13:07:36 +01:00 |
|
Svein-Tore Griff With
|
a6df5c670d
|
Merge branch 'stable' of github.com:h5p/h5p-question-set into stable
|
2014-11-18 16:48:56 +01:00 |
|
Svein-Tore Griff With
|
b69fd8c33b
|
Merge branch 'master' of github.com:h5p/h5p-question-set
|
2014-11-18 16:48:00 +01:00 |
|
Svein-Tore Griff With
|
fd7399343a
|
Merge branch 'markTheWordsIntegration' into markTheWords
|
2014-11-17 14:13:19 +01:00 |
Pål Jørgensen
|
890b479179
|
Merge tag '1.0.58' into stable
|
2014-11-17 09:33:19 +01:00 |