Commit Graph

743 Commits (344d1913710c26ad5a6d6af80acdbfa37481d4dd)

Author SHA1 Message Date
Paal Joergensen 504e4103af Merge branch 'master' into HFP-30-add-enable-check 2017-11-01 11:11:12 +01:00
Paal Joergensen 3d49ea5734 Merge branch 'stable' 2017-10-26 10:38:49 +02:00
Paal Joergensen a4b85fc6ca Merge branch 'release' into stable 2017-10-26 10:15:10 +02:00
Paal Joergensen 889e1744c0 Merge branch 'release' 2017-10-24 14:55:04 +02:00
Andreas Nergaard 3ebce107c4 HFP-30 Updated translations.
Added new field checkButton with the state new.
Ran the h5p update-translations command.
Added nb and nn translations for the new field.
2017-10-13 10:15:19 +02:00
Andreas Nergaard b10c1354e2 HFP-30 Added showWhen widget and made retry/show solution to toggle by new field checkButton 2017-10-12 15:09:12 +02:00
Andreas Nergaard c8531f60f0 HFP-30 Made checkButton into a boolean instead of select.
Updated checkButton logic.
2017-10-12 13:51:54 +02:00
Andreas Nergaard e903f96ead HFP-30 Added checkButton override to semantic and logic for buttons. 2017-10-04 15:00:58 +02:00
Paal Joergensen 05c7e42ee7 Bumping before release on staging 2017-09-29 16:57:04 +02:00
Paal Joergensen d30bf783e0 Merge branch 'master' into release 2017-09-29 16:52:41 +02:00
Timothy Lim 61583c4cf6 Merge pull request #18 from mediamaisteri/finnish_translations
Adds Finnish translations
2017-09-29 12:51:07 +02:00
Janne Särkelä 330bd41b6d Checked translations 2017-09-27 16:17:44 +03:00
Paal Joergensen ff1fb3a34b Merge branch 'stable' 2017-09-04 14:47:17 +02:00
Paal Joergensen 9756f73e3c Merge branch 'release' into stable 2017-09-04 14:07:40 +02:00
Paal Joergensen 424542cbb8 Bump patch before release 2017-09-04 13:08:23 +02:00
Paal Joergensen 6380830760 Merge branch 'release' 2017-08-31 10:20:34 +02:00
Paal Joergensen 36269a8253 HFP-1451 Show solution button on end screen shown by default 2017-08-30 09:04:01 +02:00
timothyylim 8da729c667 Update languages 2017-08-28 14:49:43 +02:00
Paal Joergensen 2c89a09053 Merge branch 'release' 2017-08-25 10:14:03 +02:00
timothyylim 8f9d1bf420 Merge translations 2017-08-21 14:10:19 +02:00
Paal Joergensen e583329962 Merge branch 'release' 2017-08-07 14:36:56 +02:00
Paal Joergensen 6d63bdc43c HFP-1339 Making overall feedback expanded and changing description 2017-08-07 11:43:46 +02:00
Paal Joergensen facea236ce Making timing better for new score bar [HFP-1229] 2017-08-04 12:03:30 +02:00
Paal Joergensen b7909c5c5e Merge branch 'release' 2017-08-04 08:46:27 +02:00
Paal Joergensen cda9ceaeec Preparing release - updating version 2017-08-04 08:40:47 +02:00
Paal Joergensen 3bfe2aa59b Merge branch 'release' 2017-08-03 11:20:41 +02:00
Paal Joergensen dd8b426f40 Merge branch 'master' into release 2017-08-03 10:55:04 +02:00
Frode Petterson 8917123a60 Merge pull request #16 from otacke/fix_typo_German
fix typo
2017-07-31 10:02:54 +02:00
otacke cdba8edd08 fix typo 2017-07-29 11:14:45 +02:00
thomasmars 5699cfc690 Fixes duplicate dependency declaration from broken merge. 2017-07-24 13:57:06 +02:00
Frode Petterson 367b2b3131 Merge branch 'stable' 2017-07-18 12:43:24 +02:00
Frode Petterson aaedd545f7 Fix missing default 2017-07-18 10:08:10 +02:00
Timothy Lim ae79cd56e8 Update da.json 2017-07-17 10:20:39 +02:00
Timothy Lim 49fdaa0bb1 Update da.json 2017-07-17 10:09:56 +02:00
Timothy Lim f0c2489bdb Merge pull request #15 from otacke/Danish_translation_stub
add stub for Danish translation
2017-07-14 15:29:21 +02:00
otacke 109fe14a45 add stub for Danish translation 2017-07-14 14:40:30 +02:00
Frode Petterson f89204789c Merge branch 'HFP-1174-overall-feedback' 2017-07-13 16:12:42 +02:00
Frode Petterson 697720a06a I messed up... 2017-07-13 16:12:26 +02:00
Frode Petterson c76d0a89c1 Update description
HFP-1174
2017-07-13 16:07:56 +02:00
Frode Petterson 6a762b8223 Move old feedback into a separate deprecated group
HFP-1174
2017-07-13 15:51:24 +02:00
Frode Petterson 9b89efad81 Merge branch 'master' into HFP-1174-overall-feedback 2017-07-13 15:20:46 +02:00
Frode Petterson 7aad242891 Remove default feedback
HFP-1174
2017-07-13 15:19:37 +02:00
Frode Petterson e734db1769 Version bump 2017-07-13 14:46:03 +02:00
Paal Joergensen 63e95b7152 Setting up default feedback for overall feedback [HFP-1174] 2017-07-04 13:12:11 +02:00
Paal Joergensen acb9da13ee Updated english source file [HFP-1174] 2017-07-04 08:30:52 +02:00
Paal Joergensen 9401e5abe3 Added overall feedback to question set + bonus fixes [HFP-1174] 2017-07-03 15:09:49 +02:00
Timothy Lim 8ca94b1079 Merge pull request #14 from otacke/fix_German_typo
fix typo
2017-06-29 08:35:55 +02:00
otacke 562063ddb0 fix typo 2017-06-28 16:07:46 +02:00
Timothy Lim 7bcf03db17 HFP-1210 Update .en.json 2017-06-26 14:31:29 +02:00
Timothy Lim 89a7ac9cbe HFP-1210 Update english source 2017-06-22 15:36:00 +02:00