Commit Graph

625 Commits (b25a5c750fe67416ac887bcd53a1d549c54841f1)

Author SHA1 Message Date
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
Paal Joergensen b496e79b2a Merge branch 'stable' 2017-01-20 13:51:04 +01:00
Paal Joergensen b0bfde9417 Merge branch 'release' into stable 2017-01-19 15:19:19 +01:00
Paal Joergensen 256ce42941 Merge branch 'release' 2017-01-17 14:09:41 +01:00
Paal Joergensen 4a230144da Bumped minor version 2017-01-17 13:49:30 +01:00
Paal Joergensen af382d16f5 Merge branch 'release' 2017-01-12 15:44:21 +01:00
Paal Joergensen e32ce0d1ee Fixed translation problems for de, nb and nn 2017-01-12 15:44:11 +01:00
Paal Joergensen fbc3ffbc21 Merge branch 'release' 2017-01-12 15:17:16 +01:00
Paal Joergensen 8b8fa35ed5 Added nb translations for widget labels 2017-01-12 15:16:57 +01:00
Paal Joergensen c43c659bff Merge branch 'release' 2017-01-11 15:41:14 +01:00
Paal Joergensen a55c7e7635 Bumped patch - preparing release 2017-01-11 15:20:14 +01:00
Paal Joergensen 7e154c15bf Merge branch 'master' into release 2017-01-11 14:58:02 +01:00
otacke c8dcb29ef5 improve German translation and add missing fields 2017-01-02 08:14:30 +01:00
Frode Petterson fe0ca6bcae Clean up semantics syntax 2016-12-16 11:36:39 +01:00
Timothy Lim 410f53c3d2 Merge pull request #9 from Jamesap/fr-translation
Updating french language
2016-12-14 03:15:42 -05:00
jelenamilinovic 5d29e756dc add importance to semantics HFP-346 2016-12-12 15:54:29 +01:00
thomasmars 87f28e9a2a Merge branch 'release' 2016-12-07 11:41:38 +01:00
thomasmars f13f31f47d Merge branch 'release' into stable 2016-12-02 12:59:11 +01:00
Jamesap 7b5f1aa392 Updating french language 2016-12-01 14:46:58 +01:00
thomasmars 2662ad701b Merge remote-tracking branch 'origin/stable' into release 2016-11-25 09:37:31 +01:00
thomasmars 541bf90762 Increased patch version, prepared for release 2016-11-25 09:29:08 +01:00
thomasmars 5b0736f0e8 Added score to getXAPIData call
HFP-255
2016-11-24 17:29:47 +01:00
Timothy Lim 29d122be50 Update questionset.js 2016-11-23 14:39:57 +01:00
Timothy Lim 7a3e8d8292 Add function getXAPIData() to allow the creation of a report
HFP-255
2016-11-23 10:29:46 +01:00
Timothy Lim f2bb7e9172 Code formatting 2016-11-23 09:31:54 +01:00
Timothy Lim cf0611734f Edit README 2016-11-21 12:30:53 +01:00
Paal Joergensen 23a7988ddc -mAdded link option to tip and feedback for multiple choice [HfP-196] 2016-11-17 13:38:43 +01:00
Paal Joergensen 719444450c Merge branch 'stable' 2016-11-16 15:33:49 +01:00
Paal Joergensen 04642e6d5f Merge branch 'release' into stable 2016-11-16 15:10:46 +01:00
Paal Joergensen 34c951841a Prepared release 2016-11-15 12:44:17 +01:00
Timothy Lim 163e314059 Make sure styles are not being added twice to questions [HFP-56] 2016-11-14 15:53:27 +01:00
Timothy Lim 568e0992e5 Add comments and ensure questions are created without previous state. [HFP-56] 2016-11-14 15:22:43 +01:00
Timothy Lim a95d0be8e0 Refactor createion of question pools. Refers to [H5P-56] 2016-11-14 11:31:15 +01:00
Tom Arild Jakobsen 4742476074 Merge branch 'hotfixrandom' of github.com:h5p/h5p-question-set into hotfixrandom 2016-11-14 10:08:27 +01:00
Tom Arild Jakobsen 1abac682cb Hotfix. Relates to #HFP-200 2016-11-14 10:06:25 +01:00
Tom Arild Jakobsen 763d2dd410 Hotfix 2016-11-14 10:05:22 +01:00
Paal Joergensen 7fa05df98b Merge branch 'stable' 2016-10-31 10:04:58 +01:00
Paal Joergensen 5254473da2 Merge branch 'release' into stable 2016-10-28 15:40:03 +02:00
Paal Joergensen cf87b1fbed Merge branch 'master' into release 2016-10-25 19:50:29 +02:00
Paal Joergensen 4a85342407 Bumped minor 2016-10-25 19:11:59 +02:00
Paal Joergensen ebcb050083 Made poolSize being minimum 1 2016-10-25 13:36:11 +02:00
Paal Joergensen 9e891a0840 Merge branch 'master' of github.com:h5p/h5p-question-set 2016-10-21 14:22:34 +02:00