EDUCATIC
/
h5p-question-set
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
519 Commits
11 Branches
46 Tags
1 MiB
Commit Graph

185 Commits (88cdb021e305598c23d7e9548e810509d3617eb6)

Author SHA1 Message Date
Frode Petterson 2a5f6c35aa xAPI Context Extensions, use object not array 
HFJ-2029
 2016-06-16 10:15:06 +02:00
Paal Joergensen cf84bcc3f5 Reverted shortening of texts [HFJ-2010] 2016-06-10 13:19:00 +02:00
Paal Joergensen 5431b4b06a Making dot-status to answered only when getAnswerGiven() returns true 2016-05-30 15:04:24 +02:00
Frode Petterson 8f30b1e3a7 Remove buttons when not displaying results 
Also removed empty feedback section to remove space.
HFJ-1935
 2016-05-25 09:51:23 +02:00
Frode Petterson 1a36c88e66 Fix confirm dialog when intro is present 
HFJ-1929
 2016-05-23 10:16:46 +02:00
Paal Joergensen 9380a9ea98 Made disabled show results show a minimalistic end page [HFJ-1935] 2016-05-20 09:33:45 +02:00
Paal Joergensen 510123993a Making end-video using 100% width [HFJ-1875] 2016-05-09 15:30:22 +02:00
Paal Joergensen 11f7a2ba33 Not invoking getAnswerGiven() initially [HFJ-1876] 2016-05-09 09:32:56 +02:00
Paal Joergensen 8dd83f77d8 Merge branch 'confirmation-dialog' into release 2016-05-03 11:15:30 +02:00
Thomas Marstrander e90ef1f831 Added functionality for resizing Question Set if it is too small for confirmation dialog. 
HFJ-1572
 2016-04-25 13:28:02 +02:00
Paal Joergensen 35e8dbd925 Updated english strings in code to match semantics [HFJ-1858] 2016-04-22 10:33:07 +02:00
Thomas Marstrander d441f67b70 Override confirmation dialog parent element for interactions. 
HFJ-1572
 2016-04-21 15:51:43 +02:00
Frode Petterson fa7b05f6fe A case of a forgotten bracket 2016-04-18 13:14:20 +02:00
Frode Petterson e323c4ee3b Merge branch 'master' into unused-semantics 
Conflicts:
	js/questionset.js
	language/ar.json
	language/de.json
	language/fr.json
	language/it.json
	language/nb.json
	language/nn.json
	semantics.json
	upgrades.js
 2016-04-18 12:48:13 +02:00
Thomas Marstrander 0e50523853 Moved copyright question labels inside the common interface texts. 
HFJ-1746
 2016-04-15 12:49:09 +02:00
Frode Petterson 333d3f4161 Show intro when retrying 
HFJ-1816
 2016-04-15 09:49:50 +02:00
Frode Petterson c045d440d9 Set min. height to background image on intro 
Also, made sure that the image always covers the background.
HFJ-1815
 2016-04-15 09:30:27 +02:00
Frode Petterson 63f6162ef2 Updated the default text 2016-04-08 16:07:24 +02:00
Frode Petterson c36e31ebf4 Hooked up the texts for next/prev buttons 
HFJ-1749
 2016-04-08 16:06:36 +02:00
Frode Petterson 93a5efd6e8 Fixed aria-label for progress dots 
HFJ-1750
 2016-04-08 15:58:38 +02:00
Frode Petterson 04003cf303 Made summary buttons into valid buttons 
HFJ-1749
 2016-04-08 15:36:06 +02:00
Frode Petterson ab76075acc Converted progress dots to links + ARIA label 
HFJ-1750
 2016-04-08 14:42:49 +02:00
Frode Petterson 2a26db16f6 Links for navigation + ARIA label 
HFJ-1749
 2016-04-08 12:40:28 +02:00
Thomas Marstrander d8be2e07ad Added unused semantics to Score/summary screen. 
HFJ-1710
 2016-04-07 16:23:15 +02:00
Frode Petterson 40fa6542e6 Show feedback for each question 
Ref. https://h5p.org/node/8730
HFJ-1747
 2016-04-06 15:53:50 +02:00
Frode Petterson bb943bbb3b Easier to use override 2016-04-04 15:50:41 +02:00
Thomas Marstrander 3036f888af Fix unused semantics. 
HFJ-1710
 2016-03-17 14:09:13 +01:00
Paal Joergensen 1e4ec27ae3 currentQuestion had to be set earlier [HFJ-1400] 2015-12-01 14:42:04 +01:00
Svein-Tore Griff With db69bc60a3 Add question number to interactions - HFJ-1400 2015-11-28 21:00:16 +01:00
Svein-Tore Griff With 370c5c8803 Trigger attempted event the first time a user sees a question - HFJ-1397 2015-11-27 20:40:48 +01:00
Frode Petterson fcbcfc951e Only pause is needed in Question Set 
(questions only have pause)
HFJ-1218
 2015-11-18 10:00:44 +01:00
Frode Petterson a36014c1e0 Stop video when finished 
HFJ-1218
 2015-11-18 10:00:19 +01:00
Frode Petterson 2d9a7cccda Added missing semi colon 
HFJ-1218
 2015-11-18 09:59:45 +01:00
Thomas Marstrander 3a038ea027 Fixed stopping media when changing question.[HFJ-1218] 2015-11-18 09:38:44 +01:00
Paal Joergensen 3423fabc15 Revert "Added wysiwyg support to title field." 
This reverts commit b00490bbe6.
 2015-11-06 14:24:11 +01:00
Andrew Downes 4a0d548c64 Report quiz set success 
Depends on https://github.com/h5p/h5p-php-library/pull/4
 2015-10-20 11:32:51 +01:00
Frode Petterson 2bc6b0598c Merge branch 'stable' 2015-10-12 09:26:04 +02:00
Frode Petterson 80c6b0678d Resize QS container when Q changes size. 2015-10-12 09:22:37 +02:00
falcon 0b7d2e2b36 Merge branch 'release' 2015-10-01 09:41:34 +02:00
Thomas Marstrander 198ae5fd3e Add 'finish' button as hidden, do not show it before all questions has been answered. [HFJ-1029] 2015-09-26 17:38:07 +02:00
Frode Petterson b00490bbe6 Added wysiwyg support to title field. 2015-09-25 11:13:05 +02:00
Frode Petterson 439f850729 Prevent crashing JS. 2015-09-25 10:57:23 +02:00
Thomas Marstrander e0f8afb3f9 Make sure content is resized after images in content types are laoded. [HFJ-1091] 2015-09-24 13:16:54 +02:00
Thomas Marstrander 9b0844c480 Display error stack as well as useful error message. 
HFJ-946
 2015-08-20 16:16:02 +02:00
Thomas Marstrander 7c6aa504fd Replaced console logs with useful error messages. 
HFJ-946
 2015-08-20 16:14:29 +02:00
Thomas Marstrander fdc91abcf8 Removed debugging lines 
HFJ-946
 2015-08-18 14:02:13 +02:00
Thomas Marstrander 0fb9b8882f Added Question design to QS 
HFJ-946
 2015-08-18 13:58:33 +02:00
Thomas Marstrander ad0acb2898 Changed retry icon for whole task for consistency. 
Accepts answered and attempted xapi verbs as well to mark a question as answered.
HFJ-946
 2015-08-13 10:35:55 +02:00
Thomas Marstrander c4a78bfdcd Use new button design. 
Add navigation buttons to Question, instead of to QS.
Added specific stylings for new button design.
HFJ-946
 2015-08-12 14:46:49 +02:00
Svein-Tore Griff With b399f9530d xAPI update - add duration to xAPI 2015-07-20 13:22:22 +02:00
Svein-Tore Griff With 436b9d572c Sub content is not allowed to generate completed statements 2015-07-10 13:41:16 +02:00
Svein-Tore Griff With cce3af6078 Replace attempted with interacted 2015-07-10 13:15:37 +02:00
Thomas Marstrander 02d3585425 Resize on video loaded and when results are already rendered. 
(cherry picked from commit b02fe7c)
 2015-07-08 15:08:43 +02:00
Frode Petterson 20e133b441 Get generic copyrights from content types that doesnt implement getCopyrights. 2015-06-19 15:40:35 +02:00
Svein-Tore Griff With 3cab3010fa Update call to newRunnable to use update api 2015-04-07 19:16:44 +02:00
Svein-Tore Griff With ab00c5cc94 Experiment with bubble system 2015-03-21 16:48:32 +01:00
Svein-Tore Griff With f064ad59d5 resize when displaying solution 2015-02-18 18:08:57 +01:00
Svein-Tore Griff With 061c15a2d6 Update to video 1.2 api 2015-02-17 11:14:49 +01:00
Svein-Tore Griff With d6ecc1705a xAPI update 2015-02-13 10:37:59 +01:00
Svein-Tore Griff With 00e5e81c0b Resolve conflicts and refine 2015-02-04 16:40:29 +01:00
Thomas Marstrander 41063026b4 Fixed so not all behaviour of subcontent will be overwritten. 2014-12-05 11:55:36 +01:00
Thomas Marstrander 33f9ea3ba1 Added the override settings into the correct subcontent semantics group. 2014-12-04 10:26:52 +01:00
Thomas Marstrander 4897db48fd Semantics description for overrideRetry changed. 2014-11-28 15:39:19 +01:00
Thomas Marstrander 587c593474 changed semantics enableRetryButton to enableRetry. 2014-11-28 13:51:26 +01:00
Thomas Marstrander 5510959615 Added override-buttons branch. 2014-11-27 11:01:47 +01:00
Pål Jørgensen f07bd8dfc3 Changing background-color from black to white when using background image 2014-11-14 15:06:07 +01:00
falcon e2efc849c9 Shorter function names 2014-10-26 22:14:26 +01:00
Svein-Tore Griff With f491786c47 Added xAPI support 2014-10-13 21:51:36 +02:00
Frode Petterson 8a71d3689e Merge branch 'api-1.1' into api-1.2 2014-06-27 11:12:53 +02:00
Frode Petterson 1a6cc9b09d Merge branch 'master' into api-1.1 2014-06-27 11:12:42 +02:00
Frode Petterson 76fb66317c Added back text to finish button. 2014-06-27 11:12:31 +02:00
Frode Petterson cdbcc3ad92 Merge branch 'api-1.1' into api-1.2 2014-06-26 16:23:46 +02:00
Frode Petterson 4c5c3ffe86 Merge branch 'master' into api-1.1 2014-06-26 16:23:35 +02:00
Frode Petterson 24f877cc8e Removed text from nav buttons. 2014-06-26 16:23:12 +02:00
Frode Petterson 5ec069dad4 Merge branch 'api-1.1' into api-1.2 2014-04-30 12:20:51 +02:00
Frode Petterson dd52d82dcf Merge branch 'master' into api-1.1 2014-04-30 12:20:33 +02:00
Frode Petterson ada5e81c87 Added support for custom background on intro page. 2014-04-30 12:19:55 +02:00
Pål Jørgensen df90fb8e70 Merge branch 'api-1.1' into api-1.2 2014-04-15 14:48:53 +02:00
Pål Jørgensen 8f7c1b0817 Merge branch 'master' into api-1.1 2014-04-15 14:48:40 +02:00
Pål Jørgensen b6ba0e4c34 Made title text div not beeing rendered if no title set 2014-04-15 14:48:28 +02:00
Pål Jørgensen 0bc40d1ef2 Merge branch 'api-1.1' into api-1.2 2014-04-15 11:33:31 +02:00
Pål Jørgensen 272f8febb1 Merge branch 'master' into api-1.1 2014-04-15 11:33:21 +02:00
Pål Jørgensen 61e62185a6 Made introduction text div not beeing rendered if no intro text set 2014-04-15 11:33:01 +02:00
Frode Petterson 10f9a0b447 Merge branch 'master' into api-1.1 2014-04-11 15:50:48 +02:00
Frode Petterson bc9b787e78 Fixed resize bug when embedded. 2014-04-11 15:50:22 +02:00
Pål Jørgensen 282e9e77e4 Merge branch 'api-1.1' into api-1.2 2014-04-03 10:21:02 +02:00
Pål Jørgensen ce5d97b485 Merge branch 'master' into api-1.1 2014-04-03 10:20:35 +02:00
Pål Jørgensen 9179f6209a Added transparent background-color to title and description fields on intro-page 2014-04-03 10:19:47 +02:00
Pål Jørgensen b289d25949 Merge branch 'api-1.1' into api-1.2 2014-04-02 15:17:45 +02:00
Pål Jørgensen 8f62a51fe5 Merge branch 'master' into api-1.1 2014-04-02 15:17:25 +02:00
Pål Jørgensen 31ddbd8379 Made getCopyrights work with empty optional fields 2014-04-02 00:10:30 +02:00
Frode Petterson 4c777b3397 Merge branch 'api-1.0' 2014-03-23 01:34:13 +01:00
Frode Petterson 7eca1c8c0b HFJ-256: Added missing copyrights to boardgame. 2014-03-23 01:32:38 +01:00
Frode Petterson aa5387feef HFJ-256: Added missing copyrights to boardgame. 2014-03-23 01:27:49 +01:00
Pål Jørgensen 0f8892d697 Merge branch 'api-1.2' of b.amendor.com:h5p into api-1.2 
Conflicts:
	example_content/boardgame/H5P.Boardgame/js/boardgame.js
 2014-03-21 13:50:44 +01:00
Pål Jørgensen 8b50061e01 Fixed resizing in embed-iframe 2014-03-21 13:49:38 +01:00
Frode Petterson 2d95ac1d7a Merge branch 'master' into api-1.2 
Conflicts:
	example_content/coursepresentation/H5P.CoursePresentation/library.json
	example_content/coursepresentation/H5P.Image/library.json
	example_content/interactive-video/H5P.InteractiveVideo/library.json
	example_content/interactive-video/H5P.InteractiveVideo/scripts/interactive-video.js
 2014-03-21 12:26:58 +01:00
Frode Petterson 4171fd0327 Merge branch 'api-1.0' 2014-03-21 12:23:23 +01:00
Frode Petterson 6c9634eae7 HFJ-187: Fixed copyrights for boardgame and libraries used there. 2014-03-21 09:37:39 +01:00
Frode Petterson 36237099d6 HFJ-188: Fixed libraries resize support. 2014-03-19 10:13:37 +01:00