Commit Graph

601 Commits (344fbef440d064197f189b08d245218e23b027a4)

Author SHA1 Message Date
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
Paal Joergensen 969526fece Minor refactoring [HFP-57] 2016-10-21 14:21:38 +02:00
Timothy Lim db88833147 Rename variables 2016-10-21 12:56:11 +02:00
Timothy Lim 4f38f4d25b Change ordering of pool size check 2016-10-21 08:38:13 +02:00
Timothy Lim 3ac92b078b Replace 'arrow functions' with 'for loops' [HFP-57] 2016-10-20 15:46:15 +02:00
Timothy Lim 035b958254 Update language files for question pool
[HFP-57]
2016-10-20 13:55:20 +02:00
Timothy Lim 3285a8fa4a Add functionality to create question pools
[HFP-57]
2016-10-20 13:42:30 +02:00
thomasmars 024d46da38 Made truncated buttons look normal.
HFP-109
2016-10-20 11:13:18 +02:00
Timothy Lim 06060af419 Add safety check 2016-10-20 08:18:43 +02:00
Timothy Lim 453addfa47 Validate language json files 2016-10-19 15:31:17 +02:00
thomasmars 1b8abad544 Make sure the shuffled question order is properly mapped to the original order.
HFP-56
2016-10-19 15:28:31 +02:00
Timothy Lim c12d21d71d Merge branch 'randomize-questions' of https://github.com/h5p/h5p-question-set into randomize-questions 2016-10-19 08:52:11 +02:00
Timothy Lim 2ebe9ad987 Rename variables in randomize function
[HFP-56]
2016-10-19 08:50:35 +02:00
Timothy Lim 6fdeb26e0d Fix to allow disabling of backwards navigation 2016-10-19 08:22:21 +02:00
Timothy Lim d9e38ec994 Update semantics.json 2016-10-18 15:35:00 +02:00
Timothy Lim 207914b411 Update retrieval of previous content 2016-10-18 15:32:16 +02:00
Timothy Lim 96218e2a9b Update language files
[HFP-56]
2016-10-18 15:18:37 +02:00
Timothy Lim a9d5c9b9a3 Stop multiple classes being added to each question
[HFP-56]
2016-10-18 15:07:12 +02:00
Timothy Lim c16422f13d Add language fields
Replace TODOs
2016-10-18 09:27:45 +02:00
Timothy Lim b3dc56c796 Refactor button creation [HFP-56]
Add comments
2016-10-17 10:54:35 +02:00
Timothy Lim 46753e2b5e Refactor randomizing on initialization 2016-10-16 11:14:52 +02:00
thomasmars 491ed24c0b Tweaks to make randomization work.
HFP-56
2016-10-14 16:48:03 +02:00
thomasmars 6d4a915de1 Merge branch 'master' into randomize-questions
# Conflicts:
#	js/questionset.js
2016-10-14 16:14:37 +02:00
Timothy Lim d19a8d52fc Randomize questions and update buttons [HFP-56]
Show and hide navigational buttons

Add functionality to save content state

Clean up code [HFP-59]

Randomize on initialization

Tidy up [HFP-56]
2016-10-10 11:36:07 +02:00
Tom Arild Jakobsen b2f6dec79d Merge branch 'master' of github.com:h5p/h5p-question-set 2016-10-10 11:21:22 +02:00