Commit Graph

766 Commits (64d28f204df6b05a7898fbf9c994da337bd5fc52)

Author SHA1 Message Date
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
Timothy Lim 5aaa622fa5 HFP-1210 Set up Crowdin 2017-06-22 15:29:46 +02:00
Timothy Lim f2064a0dc4 Merge pull request #12 from sabahuddin/patch-1
bs.json
2017-06-19 09:36:18 +02:00
Sabahuddin 60dedf8ef7 bs.json
Bosnian translation
2017-06-16 00:55:59 +02:00
Frode Petterson 0f383f775f Merge branch 'HFP-574-remove-override-settings' 2017-06-12 13:50:15 +02:00
Frode Petterson e7e83f43ce Revert "Merge pull request #11 from SergeyYukhnevich/add-override-of-check-button"
This reverts commit 6c86c8ac9d, reversing
changes made to 976e9567c6.
2017-06-12 11:07:31 +02:00
Frode Petterson 6c86c8ac9d Merge pull request #11 from SergeyYukhnevich/add-override-of-check-button
Add ability to override check button
2017-06-12 10:11:31 +02:00
Tom Arild Jakobsen 976e9567c6 Fix bug where Question Set children without media fails. HFP-1181 2017-06-07 14:44:42 +02:00
Tom Arild Jakobsen df11efd681 Merge branch 'master' of github.com:h5p/h5p-question-set into HFP-574-remove-override-settings 2017-06-07 12:46:11 +02:00
Sergey Yuhnevich 00f6e30297 Add ability to override check button 2017-06-02 15:02:27 +03:00
Paal Joergensen b3887c0f56 Merge branch 'HFP-815-QS-multiple-autoplay-issue' 2017-05-10 12:38:42 +02:00
Timothy Lim 9cf00d897d HFP-29 Merge with master 2017-05-10 10:23:49 +02:00
Andreas Nergaard 6374504868 HFP-815 Added function to limit number of auto plays at a time. 2017-05-09 10:27:50 +02:00
Tom Arild Jakobsen 45b00ffc14 Remove deprecated and unneeded reference to 'overrideSettings'. HFP-574 2017-05-08 13:59:38 +02:00
Paal Joergensen 44125fa5ca Bumping minor 2017-05-05 11:35:55 +02:00
Paal Joergensen fd73d9fce7 Removed unused icomoon font files/definition 2017-04-26 16:07:22 +02:00
Paal Joergensen 56936a2be1 Merge branch 'release' 2017-03-02 15:48:23 +01:00
Paal Joergensen a3e2329024 Merge branch 'stable' into release 2017-03-02 15:41:29 +01:00
Paal Joergensen d0c8337f66 Bumped patch version 2017-03-02 15:25:08 +01:00
Paal Joergensen 1a954687c6 Merge branch 'release' 2017-03-02 15:13:16 +01:00
Paal Joergensen 595185f1e3 Merge branch 'stable' into release 2017-03-02 15:02:02 +01:00
Paal Joergensen 88cdb021e3 Fixing authors 2017-03-02 14:52:19 +01:00
Paal Joergensen e469c4e1c3 Added icon.svg 2017-03-02 13:57:14 +01:00
Paal Joergensen f84c0255fe Merge branch 'stable' 2017-02-10 09:09:52 +01:00
Paal Joergensen 29162b9b69 Merge branch 'release' into stable 2017-02-10 08:59:15 +01:00
Paal Joergensen 47028210c4 Merge branch 'release' 2017-02-07 11:46:12 +01:00
Paal Joergensen 0027c62690 Bumping versions 2017-02-07 11:39:34 +01:00
Paal Joergensen 765684c835 Merge branch 'master' into release 2017-02-07 10:55:02 +01:00