Commit Graph

104 Commits (8631a9379f5ad7c6c967ad97aaf6ef81dc88ffa1)

Author SHA1 Message Date
Timothy Lim 8631a9379f Merge branch 'master' of https://github.com/h5p/h5p-memory-game 2017-02-20 11:26:32 +01:00
Timothy Lim ec76d44a2b Set up crowdin translation service 2017-02-20 11:26:21 +01:00
Timothy Lim 00c7273f13 Update Crowdin configuration file 2017-02-20 05:25:18 -05:00
Frode Petterson fa66937750 Merge branch 'release' 2017-02-15 10:36:50 +01:00
Frode Petterson d11a8cf6b4 Improve behavior option description 2017-02-13 15:54:06 +01:00
Frode Petterson 83c278a071 Flip cards back on next click 2017-02-13 15:41:06 +01:00
Frode Petterson 2a92e640ef Add default string for try again button 2017-02-13 14:49:53 +01:00
Frode Petterson dff2c90df6 Localize try again button text 2017-02-13 14:47:40 +01:00
Frode Petterson 0bc76c6ce8 Add support for try again 2017-02-13 14:42:34 +01:00
Frode Petterson 6b6f5e92f1 Improve popup size and position 2017-02-13 12:35:10 +01:00
Paal Joergensen 284c1e475f Merge branch 'stable' 2017-02-10 09:09:52 +01:00
Paal Joergensen 39323b6710 Merge branch 'release' into stable 2017-02-10 08:59:15 +01:00
Paal Joergensen a39e7f1dbb Merge branch 'release' 2017-02-07 11:46:12 +01:00
Paal Joergensen 1e645d6b7b Bumping versions 2017-02-07 11:39:34 +01:00
Paal Joergensen 395648c78f Merge branch 'master' into release 2017-02-07 10:55:02 +01:00
Frode Petterson 9306ec6a3e Add missing norwegian label 2017-01-24 08:49:30 +01:00
Frode Petterson 34ac93cce8 Update translations with new semantic fields 2017-01-24 08:47:18 +01:00
Frode Petterson e8622a3f42 Improve positioning of description dialog 2017-01-24 08:35:21 +01:00
Frode Petterson 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
Frode Petterson e308d4a69e Help avoid markup for list items 2017-01-23 14:45:55 +01:00
Frode Petterson 0f0f1c693a Set crop ratio for images to 1:1 2017-01-23 14:41:41 +01:00
Frode Petterson 4a53203247 Clean up 2017-01-23 14:32:33 +01:00
Frode Petterson 923aa80cae Merge branch 'master' of github.com:h5p/h5p-memory-game 2017-01-23 14:13:39 +01:00
Frode Petterson 7f800195e2 Put cards in square grid and add scaling 2017-01-23 14:12:33 +01:00
Frode Petterson 13cda50928 Merge pull request #17 from otacke/H5P-Timer
fix bug
2017-01-20 15:07:53 +01:00
Oliver Tacke 2ef07b2b20 fix bug 2017-01-20 14:15:59 +01:00
Paal Joergensen 300eac9377 Merge branch 'stable' 2017-01-20 13:51:04 +01:00
Frode Petterson e60a425f2c Add greyscale to matched pairs
Makes them less distractive.
2017-01-20 13:42:35 +01:00
Frode Petterson 9b6b2ba0e3 Fix cards disappearing when found in Firefox 2017-01-20 13:33:58 +01:00
Frode Petterson 20850b6346 Match two different images instead of clones
This will resolve #5
2017-01-20 11:58:08 +01:00
Frode Petterson 370bafde64 Merge branch 'otacke-H5P-Timer' 2017-01-20 11:16:22 +01:00
Frode Petterson b21bcf552b Bump Timer required version 2017-01-20 11:15:45 +01:00
Frode Petterson 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
Paal Joergensen 4e70a0b4fc Merge branch 'release' into stable 2017-01-19 15:19:19 +01:00
Paal Joergensen eec46d1ac2 Merge branch 'release' 2017-01-11 15:41:14 +01:00
Paal Joergensen b873e14275 Bumped patch - preparing release 2017-01-11 15:20:14 +01:00
Paal Joergensen b54842e13e Merge branch 'master' into release 2017-01-11 14:58:02 +01:00
Paal Joergensen a53e4140d5 Added missing required name attribute [HFP-424] 2017-01-02 12:00:16 +01:00
Pål Jørgensen 8df6fdaaf1 Merge pull request #16 from otacke/german_translation
add German translation
2016-12-28 08:34:31 +01:00
otacke 82fea8aa44 add missing entity 2016-12-23 16:39:55 +01:00
otacke a3fcf0d47d add missing label 2016-12-23 16:37:22 +01:00
otacke 2f6198b316 add German translation 2016-12-23 16:35:29 +01:00
Frode Petterson 22b39a2072 Change importance 2016-12-16 11:30:32 +01:00
Timothy Lim 9fd5d5c7d1 Add importance to semantics
HFP-344
2016-12-12 16:07:42 +01:00
Paal Joergensen cce9c48fa3 Merge branch 'stable' 2016-10-31 10:04:58 +01:00
Paal Joergensen 505eae6bd6 Merge branch 'release' into stable 2016-10-28 15:40:03 +02:00
Paal Joergensen b014e51585 Merge branch 'master' into release 2016-10-25 19:50:29 +02:00
Paal Joergensen 05d71ee3d4 Bumping for release 2016-10-25 19:41:16 +02:00
thomasmars 953dbab15e Added norwegian translation
HFP-67
2016-10-14 13:59:21 +02:00
otacke d18cd343ad change API calls to v0.4 of H5P-Timer 2016-10-11 18:47:26 +02:00