Commit Graph

101 Commits (cae7bd5301a443accdc04b614549115758625f57)

Author SHA1 Message Date
thomasmars 634a85f980 Merge branch 'stable' 2016-09-23 13:37:31 +02:00
thomasmars c88815a8ee Merge branch 'release' into stable 2016-09-23 11:51:56 +02:00
thomasmars 1dabdfb4df Merge branch 'master' into release 2016-09-12 10:56:45 +02:00
Frode Petterson 0f938f77a9 Merge branch 'stable' 2016-08-02 13:49:14 +02:00
Frode Petterson b64f83cc02 Merge branch 'release' into stable 2016-08-02 13:45:15 +02:00
Frode Petterson ee3a4d2c4a Bumped patch version 2016-07-29 14:38:03 +02:00
Frode Petterson fbfd769349 Merge branch 'master' into release 2016-07-27 12:40:01 +02:00
Frode Petterson 56480ae110 Merge pull request #12 from isa-realia/patch-1
Updated fr.json
2016-07-05 11:27:13 +02:00
isa-realia 212219e3fc Updated fr.json
- translated new strings to french and / or modified some translations
- added default strings and translated them to french
2016-07-04 19:14:13 +02:00
Frode Petterson 743980eae6 Merge branch 'stable' 2016-06-21 16:35:04 +02:00
Frode Petterson 7cf1e5a15b Merge branch 'release' into stable 2016-06-21 16:28:43 +02:00
Frode Petterson 5ceb12d8df Merge pull request #10 from h5p/falcon-git-patch-1
Don't require that the user removes the final description to trigger …
2016-06-20 15:05:55 +02:00
Svein-Tore Griff With c6b8ad44e4 Don't require that the user removes the final description to trigger completed
https://www.drupal.org/node/2730223
2016-05-26 14:07:14 +02:00
Frode Petterson 3b79752b86 Validate memory card params before use
HFJ-1914
2016-05-19 09:40:22 +02:00
Svein-Tore Griff With dea9e3cb8d Update README.md 2016-05-04 13:42:55 +02:00
Frode Petterson e8ad552266 Merge branch 'master' into release 2016-05-02 10:22:08 +02:00
Frode Petterson cffdb198d5 Bumped patch 2016-04-15 12:45:16 +02:00
Frode Petterson 8af3eccd46 Merge branch 'stable' 2016-04-05 12:06:39 +02:00
Frode Petterson 48f92d699b Merge branch 'release' into stable 2016-04-05 11:56:03 +02:00
Frode Petterson c07ba5adca Bumped patch version 2016-03-21 10:41:55 +01:00
Frode Petterson ea359e3f8c Merge branch 'master' into release 2016-03-21 10:01:34 +01:00
Frode Petterson 92e9cd5273 Adjustments to status text
Does not display properly in all themes
2016-03-04 12:44:30 +01:00
Frode Petterson 7bbcba57a2 Adjust description dialog
Fits better when there's only a single row
2016-03-04 12:43:32 +01:00
Frode Petterson bccbb427ca Description is HTML not text
Thanks to Realia on the forum for reporting this bug
2016-03-04 12:42:01 +01:00
Frode Petterson b064846d3f Merge branch 'stable' 2016-02-19 09:39:32 +01:00
Frode Petterson d0f1da9e47 Merge branch 'release' into stable 2016-02-19 09:30:11 +01:00
Frode Petterson c9d5d93ff7 Increased patch version 2016-02-03 11:30:38 +01:00
Frode Petterson d647de6fbe Merge branch 'master' into release 2016-02-03 11:28:39 +01:00
Svein-Tore Griff With 2ed388abee Add attempted, interacted and completed statements - HFJ-1402 2015-11-28 22:06:19 +01:00
Frode Petterson c209673bd6 Merge branch 'stable' 2015-10-21 10:32:53 +02:00
Frode Petterson a58411cdcf Split up into multiple files. Updated docs. 2015-10-19 11:17:38 +02:00
Frode Petterson 236065c69d Merge branch 'master' of github.com:h5p/h5p-memory-game 2015-08-26 15:54:43 +02:00
Frode Petterson 34e774aad4 Replaced nbsp with normal space. 2015-08-26 15:51:43 +02:00
Frode Petterson ce15562c7a Merge pull request #6 from Stephlabaraque/patch-2
Update fr.json
2015-08-26 10:05:50 +02:00
Stephlabaraque b7f64fa346 Update fr.json
Tested and working.
2015-08-25 18:32:00 +02:00
Frode Petterson c0958bafe7 Added French language support. 2015-08-21 16:38:26 +02:00
Svein-Tore Griff With addc88cc8b Merge branch 'stable' 2015-06-12 11:06:37 +02:00
Svein-Tore Griff With a4206059c2 Merge branch 'release' into stable 2015-06-09 15:49:15 +02:00
Svein-Tore Griff With 242c27275b Merge branch 'master' into release 2015-05-12 14:15:22 +02:00
Svein-Tore Griff With cd9d38be2d Merge branch 'stable' 2015-04-22 23:38:41 +02:00
Svein-Tore Griff With 304cec22fe Bump patch version 2015-04-22 23:28:56 +02:00
Svein-Tore Griff With cd65548fcf Merge branch 'release' into stable 2015-04-22 23:00:40 +02:00
Frode Petterson 0b7fcd3eee Added italian translation. 2015-04-07 10:16:52 +02:00
Frode Petterson e2f127968c Added AR language support. Big thanks to community user farrisimin for contributing. 2015-03-18 15:25:19 +01:00
Svein-Tore Griff With b4af7c1cad Bump patch version 2014-11-02 19:55:58 +01:00
Svein-Tore Griff With a691693302 Merge branch 'master' of github.com:h5p/h5p-memory-game 2014-11-01 16:39:52 +01:00
Frode Petterson 5d04c1a164 Merge branch '1.1' 2014-10-31 10:48:44 +01:00
Frode Petterson f69703825c Improve theme support. 2014-10-27 14:49:41 +01:00
Frode Petterson f4b2801218 Added new version, 1.1.
The new version supports small dialogs that pops up as you find the matching cards.
2014-09-16 14:33:14 +02:00
Frode Petterson 4eb75ce462 Updated README and CSS. 2014-05-13 10:04:25 +02:00