Commit Graph

72 Commits (55109596150a82555a534c0cf9a5861e43a959ea)

Author SHA1 Message Date
Pål Jørgensen 42395bcb18 Bumped patchVersion 2014-11-17 09:30:45 +01:00
Svein-Tore Griff With cf2ae6d207 Bump patch version 2014-11-02 19:55:59 +01:00
Frode Petterson a0a94d7b19 Up 2014-10-08 14:55:24 +02:00
Pål Jørgensen 8f85d4a5a7 Removed some nn-text from the nb-translation 2014-10-07 11:37:03 +02:00
Frode Petterson b39df78eeb Merge branch 'api-1.1' into api-1.2 2014-05-23 11:12:51 +02:00
Frode Petterson 529f8405e7 Merge branch 'master' into api-1.1
Conflicts:
	css/questionset.css
	library.json
2014-05-23 11:12:16 +02:00
Frode Petterson 21535779a8 Added FontAwesome 4.1 as a dependency. 2014-05-23 11:09:49 +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 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 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
Pål Jørgensen 7207049c2c Merge branch 'master' into api-1.1 2014-04-14 13:33:13 +02:00
Pål Jørgensen 8d58c88657 Updated texts 2014-04-14 13:32:54 +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 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 e9835fd587 Merge branch 'master' into api-1.1 2014-04-02 15:34:55 +02:00
Pål Jørgensen ef5670c5c4 Bumped patch version 2014-04-02 15:33:43 +02:00
Frode Petterson 6c9634eae7 HFJ-187: Fixed copyrights for boardgame and libraries used there. 2014-03-21 09:37:39 +01:00
Frode Petterson 128db363c8 Merge branch 'api-1.0'
Conflicts:
	example_content/boardgame/H5P.Boardgame/library.json
	example_content/boardgame/H5P.MultiChoice/library.json
	example_content/boardgame/H5P.QuestionSet/library.json
	example_content/coursepresentation/H5P.CoursePresentation/library.json
	example_content/drag-question/H5P.DragQuestion/css/dragquestion.css
	example_content/interactive-video/H5PEditor.InteractiveVideo/library.json
2014-03-13 11:00:10 +01:00
Frode Petterson 06b0ecaa20 HFJ-170: Removed question padding.
Removed unused outdated content example.

Conflicts:
	example_content/boardgame/H5P.Boardgame/library.json
	example_content/boardgame/H5P.QuestionSet/library.json
2014-02-26 11:02:33 +01:00
Frode Petterson 9e5e3b4e89 HFJ-170: Removed question padding.
Removed unused outdated content example.
2014-02-26 11:00:14 +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
Svein-Tore Griff With 7044c644bf Remove white fader on the intro page of the questionsets. This was requested by ndla 2013-12-09 10:13:17 +01:00
Frode Petterson 8d3c5032de Upped patch version. 2013-12-02 13:19:40 +01:00
Frank Ronny Larsen d5e7207e5b HFJ-50: Use border-box to keep padding within size. 2013-11-20 11:03:39 +01:00
Frank Ronny Larsen 0f371320f7 HFJ-1: Fixed emoticon positioning on QS endGame 2013-11-08 13:56:58 +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 cc02101416 Patch levels increased for libs committed lately 2013-11-08 10:00:57 +01:00
Frank Ronny Larsen f4d1fde0e8 HFJ-1: Re-added postUserStatistics stuff lost in QuestionSet 2013-11-07 11:43:52 +01:00
Frank Ronny Larsen 334d36f692 Merge branch 'master' of b.amendor.com:h5p 2013-11-07 10:31:29 +01:00
Frank Ronny Larsen 711e55c42e HFJ-1,2,3,4: Fixed FontAwesome dependencies 2013-11-06 11:48:36 +01:00
Frode Petterson 2fe311acda Patch up. 2013-11-06 09:16:43 +01:00
Svein-Tore Griff With e766e50b7b Remove vertical tabs from questionset, ref http://bug.ndla.no/browse/TGP-5585 2013-10-15 15:39:17 +02: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 aff85ef896 UP 2013-09-18 11:22:42 +02:00
Frode Petterson fd24edf460 Removed fullscreen from question set since it can't handle it.... 2013-09-18 11:19:47 +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 123493c82a OPPG-588: Set dots as default progress. 2013-09-10 15:07:17 +02:00
Frode Petterson 1f63d523a1 OPPG-566: Fixed questionset compability bug. 2013-09-10 11:25:45 +02:00
Frank Ronny Larsen 2404a2fb87 Added fullscreen support to QuestionSet and DragQuestion 2013-08-13 10:39:49 +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 fa96cb75f0 Updated patch versions of modified libraries 2013-07-24 12:32:47 +02:00
Frode Petterson 6a5acf1c7c Merge branch 'master' of b.amendor.com:h5p 2013-07-08 14:30:12 +02:00