Commit Graph

143 Commits (6d8752dd38fc6b0c66df49d4d75625f5c1532b3c)

Author SHA1 Message Date
Paal Joergensen 6d8752dd38 Merge branch 'stable' 2017-09-04 14:47:17 +02:00
Paal Joergensen 65f2d1d5e3 Merge branch 'release' into stable 2017-09-04 14:07:40 +02:00
Paal Joergensen 472507f943 Bump patch before release 2017-09-04 13:08:23 +02:00
Paal Joergensen 459455f3ae Merge branch 'release' 2017-08-25 10:14:03 +02:00
Paal Joergensen d69df7b899 Revert "HFP-1343 Using iframe as embed type"
This reverts commit 252bae0220.
2017-08-25 10:08:27 +02:00
timothyylim 3fa7df69fb Merge translations 2017-08-21 14:01:10 +02:00
Paal Joergensen 1927eda0b4 Merge branch 'release' 2017-08-07 14:36:56 +02:00
Paal Joergensen 252bae0220 HFP-1343 Using iframe as embed type 2017-08-07 13:38:24 +02:00
Paal Joergensen fcee67e2f8 Made reset button's text displayed on one line 2017-08-07 13:32:20 +02:00
Paal Joergensen 4e134784a2 Merge branch 'release' 2017-08-04 08:46:27 +02:00
Paal Joergensen 23c477c1f0 Preparing release - updating version 2017-08-04 08:40:47 +02:00
Paal Joergensen f00b632cc1 Merge branch 'release' 2017-08-03 11:20:41 +02:00
Paal Joergensen 9bd173ebe0 Merge branch 'master' into release 2017-08-03 10:55:04 +02:00
Timothy Lim 26cccd6530 HFP-1210 Update .en.json 2017-06-26 14:29:52 +02:00
Timothy Lim f08b18bbaf HFP-1210 Update english source file 2017-06-23 14:20:33 +02:00
Timothy Lim 4cedecf944 HFP-1210 Set up Crowdin 2017-06-23 14:13:15 +02:00
Frode Petterson aead8728d8 Adjust button size 2017-06-20 14:29:23 +02:00
Frode Petterson 746e599208 Add vertical tabs + new styling for retry button + effects 2017-06-20 14:25:31 +02:00
Frode Petterson 857b5069b6 Make sure card back covers popup image 2017-06-20 13:42:14 +02:00
Frode Petterson 1ca7cc70f4 Remove theme styling of popup 2017-06-20 13:28:15 +02:00
Frode Petterson 11bc5fa2a2 Add duration, completion and success to xAPI completed event 2017-06-20 13:17:49 +02:00
Frode Petterson aa5cc002b3 Add close button to dialog 2017-06-20 11:52:30 +02:00
Frode Petterson 7dd0d60758 Perfect image aligment 2017-06-20 11:25:04 +02:00
Frode Petterson 8289ff5f8c Fix issues with old content 2017-06-20 10:58:13 +02:00
Frode Petterson 2ac7ca6721 Patch version bump 2017-06-20 10:37:55 +02:00
Frode Petterson ce33c50ab9 Fix image alignment again 2017-06-20 10:34:34 +02:00
Frode Petterson f99003cf4c Fix image alignment in popup 2017-06-20 10:20:01 +02:00
Timothy Lim fb65581a8c Rename bs-BA.json to bs.json 2017-06-16 10:10:03 +02:00
Timothy Lim d5d3b6f488 Merge pull request #25 from sabahuddin/patch-1
bs.json
2017-06-16 10:05:30 +02:00
sabahuddin 5583307cb6 (Bosnian) bs-BA.json
Bosnian translation
2017-06-14 05:58:27 +02:00
Frode Petterson c5ac5f8760 Improved description popup design 2017-05-08 15:14:18 +02:00
Frode Petterson 9347b17279 Add options for custom card back and theme color 2017-05-04 14:20:20 +02:00
Paal Joergensen 8b2eb9e544 Merge branch 'release' 2017-03-02 15:48:23 +01:00
Paal Joergensen 8ff21e2215 Merge branch 'stable' into release 2017-03-02 15:41:29 +01:00
Paal Joergensen 9a794fc55a Bumped patch version 2017-03-02 15:25:08 +01:00
Paal Joergensen 5b26b3095c Merge branch 'release' 2017-03-02 15:13:16 +01:00
Paal Joergensen cae7bd5301 Merge branch 'stable' into release 2017-03-02 15:03:48 +01:00
Paal Joergensen 4997beeb4b Fixing authors 2017-03-02 14:52:19 +01:00
Paal Joergensen 9d3b20445c Added icon.svg 2017-03-02 13:57:14 +01:00
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