Commit Graph

111 Commits (02cd4e1b7ed168d33db33bb333978615d62a8593)

Author SHA1 Message Date
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
Frode Petterson 856f0e8412 HFJ-179: Fixed usage of api-1.1 2014-03-19 09:26:33 +01:00
Frode Petterson eb7ccdd523 HFJ-179: Prepared for new API version. Using new resize events, removed some deprecated stuff. Fixed a bug in CP editor. 2014-02-24 16:26:07 +01:00
Svein-Tore Griff With bf3f3d0518 Fix a bug so that result heading in questionset translateable 2014-01-15 20:35:48 +01:00
Frank Ronny Larsen 84c9e73b30 HFJ-1: Style tweaks
Decreased start-button size in QS intro.
Removed H2 on QS end if not set.
Adjusted QuestionSet end emoticon.
Removed background on multichoice feedback field.
2013-11-08 11:55:57 +01:00
Frank Ronny Larsen 9cc9250451 HFJ-1: Changed default score string. Also make score string editable and translatable 2013-11-08 10:25:49 +01:00
Frank Ronny Larsen 0f5bdbade5 BFB-3: Merged more lost code in QuestionSet and MultiChoice 2013-11-07 14:32:38 +01:00
Frank Ronny Larsen f4d1fde0e8 HFJ-1: Re-added postUserStatistics stuff lost in QuestionSet 2013-11-07 11:43:52 +01:00
Magnus Vik Magnussen 2c26b7692d HFJ-1
Design update to questions set completed. No changes made to dragNdrop so far.
2013-10-31 13:39:51 +01:00
Frode Petterson 84e83b6a8f HJ-14: Added H5P.setFinished to all libraries.
Fixed bug in dragquestion causing boardgame to not show results.
2013-09-19 14:52:03 +02:00
Frode Petterson 53fae497b1 Fixed language file errors.
Fixed resize bug in questionset.
Fixed missing function on blanks.
2013-09-18 10:00:02 +02:00
Frode Petterson 1f63d523a1 OPPG-566: Fixed questionset compability bug. 2013-09-10 11:25:45 +02:00
Frank Ronny Larsen a9bd70ff35 Quote URLs in css backgrounds from getPath. Nudged affected library patchVersions 2013-07-24 17:33:41 +02:00
Frank Ronny Larsen 936c3c9a62 OPPG-452: QS now call resize on the question object if the function exists. 2013-07-19 13:44:34 +02:00
Frank Ronny Larsen 3d10a111cd OPPG-446: Autoplay video does not work on mobile devices, changed to play() 2013-07-19 10:24:13 +02:00
Svein-Tore Griff With 840bcf19c6 OPPG-446: Remove library name from question display 2013-07-16 22:10:07 +02:00
Frode Petterson 89b74e7839 E-MAIL: Added core fix to all libraries who need it. Updated patch levels. 2013-07-04 13:27:28 +02:00
Frode Petterson 67acf39696 OPPG-376: The forgotten code! 2013-06-27 14:29:56 +02:00
Frode Petterson ddb6893d35 OPPG-376:
Added hook for modifying params.
Replace getContentPath with getPath to reduce code and display absolute urls.
2013-06-27 14:13:00 +02:00
Frode Petterson 5ff8612801 Fixed white background and background image in QS. Improved IE8 support in multichoice. 2013-05-13 14:08:01 +02:00
Frode Petterson afe6404e0a Added Blanks to questionsset and fixed bugs. 2013-05-06 16:58:24 +02:00
Frode Petterson 355d847bb1 Adjusted questionset to make dots more visible. Removed optional title. 2013-05-06 14:54:24 +02:00
Svein-Tore Griff With da62f4f41a Fix problems with transition messing up height and width calculations 2013-05-06 01:47:53 +02:00
Svein-Tore Griff With 7c0e4e4b85 Fix various bugs 2013-05-06 01:36:46 +02:00
Frode Petterson b32a3ceb54 Fixed missing translations.
Fixed video-support.
Removed random order and initial question index.
2013-05-03 15:24:17 +02:00
Frode Petterson 9beae17e5d Fixed questionset styling in boardgame. 2013-05-03 12:42:20 +02:00
Frode Petterson bde6f57f5a Made questionset standalone possible. 2013-05-03 10:05:49 +02:00
Frode Petterson 9b3130b463 Numerus bug fixes and improved editor for boardgame.
Fixed CKEditor readonly when created in invisible field.
2013-05-02 14:41:39 +02:00
Frode Petterson c4c526b1e4 Improved boardgame flexibility. 2013-04-26 17:27:35 +02:00
Frode Petterson 785f787913 Removed submodules 2013-04-04 15:44:06 +02:00
Svein-Tore Griff With e884959081 Remove questionset 2013-01-22 22:07:24 +01:00
Svein-Tore Griff With 6c8e2c57af Fix target bug in questionset 2013-01-20 22:25:34 +01:00
Svein-Tore Griff With 0dd48ee842 Stop using dropbox for images 2013-01-17 22:57:10 +01:00
Svein-Tore Griff With b98ef0fc7a Fix bug in questionsets.js 2013-01-16 22:01:39 +01:00
Frank Ronny Larsen f9e8360a7f Changes to example content.
Example content is now a working board game sans Images.
It can be uploaded using the H5P module too. It will work. (At least with the next commit)
2013-01-16 19:33:59 +01:00
Frank Ronny Larsen 85a18446fb Added H5P libraries 2013-01-16 14:37:45 +01:00