39323b6710
Merge branch 'release' into stable
2017-02-10 08:59:15 +01:00
a39e7f1dbb
Merge branch 'release'
2017-02-07 11:46:12 +01:00
1e645d6b7b
Bumping versions
2017-02-07 11:39:34 +01:00
395648c78f
Merge branch 'master' into release
2017-02-07 10:55:02 +01:00
9306ec6a3e
Add missing norwegian label
2017-01-24 08:49:30 +01:00
34ac93cce8
Update translations with new semantic fields
2017-01-24 08:47:18 +01:00
e8622a3f42
Improve positioning of description dialog
2017-01-24 08:35:21 +01:00
6d1ceccecd
Add behavioural settings for the game
...
Option to use grid (implemented earlier).
Option for picking a given number of images.
Option to retry (currently, not working).
Add upgrade script to preserve old behavior for old games.
2017-01-23 15:46:06 +01:00
e308d4a69e
Help avoid markup for list items
2017-01-23 14:45:55 +01:00
0f0f1c693a
Set crop ratio for images to 1:1
2017-01-23 14:41:41 +01:00
4a53203247
Clean up
2017-01-23 14:32:33 +01:00
923aa80cae
Merge branch 'master' of github.com:h5p/h5p-memory-game
2017-01-23 14:13:39 +01:00
7f800195e2
Put cards in square grid and add scaling
2017-01-23 14:12:33 +01:00
13cda50928
Merge pull request #17 from otacke/H5P-Timer
...
fix bug
2017-01-20 15:07:53 +01:00
2ef07b2b20
fix bug
2017-01-20 14:15:59 +01:00
300eac9377
Merge branch 'stable'
2017-01-20 13:51:04 +01:00
e60a425f2c
Add greyscale to matched pairs
...
Makes them less distractive.
2017-01-20 13:42:35 +01:00
9b6b2ba0e3
Fix cards disappearing when found in Firefox
2017-01-20 13:33:58 +01:00
20850b6346
Match two different images instead of clones
...
This will resolve #5
2017-01-20 11:58:08 +01:00
370bafde64
Merge branch 'otacke-H5P-Timer'
2017-01-20 11:16:22 +01:00
b21bcf552b
Bump Timer required version
2017-01-20 11:15:45 +01:00
586ddad32e
Merge branch 'H5P-Timer' of https://github.com/otacke/h5p-memory-game into otacke-H5P-Timer
2017-01-20 11:10:32 +01:00
4e70a0b4fc
Merge branch 'release' into stable
2017-01-19 15:19:19 +01:00
eec46d1ac2
Merge branch 'release'
2017-01-11 15:41:14 +01:00
b873e14275
Bumped patch - preparing release
2017-01-11 15:20:14 +01:00
b54842e13e
Merge branch 'master' into release
2017-01-11 14:58:02 +01:00
a53e4140d5
Added missing required name attribute [HFP-424]
2017-01-02 12:00:16 +01:00
8df6fdaaf1
Merge pull request #16 from otacke/german_translation
...
add German translation
2016-12-28 08:34:31 +01:00
82fea8aa44
add missing entity
2016-12-23 16:39:55 +01:00
a3fcf0d47d
add missing label
2016-12-23 16:37:22 +01:00
2f6198b316
add German translation
2016-12-23 16:35:29 +01:00
22b39a2072
Change importance
2016-12-16 11:30:32 +01:00
9fd5d5c7d1
Add importance to semantics
...
HFP-344
2016-12-12 16:07:42 +01:00
cce9c48fa3
Merge branch 'stable'
2016-10-31 10:04:58 +01:00
505eae6bd6
Merge branch 'release' into stable
2016-10-28 15:40:03 +02:00
b014e51585
Merge branch 'master' into release
2016-10-25 19:50:29 +02:00
05d71ee3d4
Bumping for release
2016-10-25 19:41:16 +02:00
953dbab15e
Added norwegian translation
...
HFP-67
2016-10-14 13:59:21 +02:00
d18cd343ad
change API calls to v0.4 of H5P-Timer
2016-10-11 18:47:26 +02:00
8718f5d584
increase required version of H5P-Timer
2016-10-04 19:50:44 +02:00
3b04b43972
adhere to JSDoc style
2016-10-03 17:07:41 +02:00
996b5e31f3
use H5P-Timer
2016-10-02 16:09:34 +02:00
634a85f980
Merge branch 'stable'
2016-09-23 13:37:31 +02:00
c88815a8ee
Merge branch 'release' into stable
2016-09-23 11:51:56 +02:00
1dabdfb4df
Merge branch 'master' into release
2016-09-12 10:56:45 +02:00
0f938f77a9
Merge branch 'stable'
2016-08-02 13:49:14 +02:00
b64f83cc02
Merge branch 'release' into stable
2016-08-02 13:45:15 +02:00
ee3a4d2c4a
Bumped patch version
2016-07-29 14:38:03 +02:00
fbfd769349
Merge branch 'master' into release
2016-07-27 12:40:01 +02:00
56480ae110
Merge pull request #12 from isa-realia/patch-1
...
Updated fr.json
2016-07-05 11:27:13 +02:00
Paal Joergensen
Frode Petterson
Oliver Tacke
Timothy Lim
thomasmars