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

519 commits

This branch
This branch
All branches
Author SHA1 Message Date
Pål Jørgensen
94f1a9017e Merge branch 'master' into api-1.1 2014-04-03 15:08:08 +02:00
Pål Jørgensen
ae8af678a2 Made rounded corners for background (title/description on intro page) 2014-04-03 15:07:50 +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
6f13435445 Merge branch 'api-1.1' into api-1.2 2014-04-02 15:35:13 +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
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
b8a07e4996 Removed left overs from merge. 2014-03-28 17:06:59 +01:00
Frode Petterson
e2fd4e2ba4 Merged new repo into old sub module. 
Conflicts:
	css/questionset.css
	js/questionset.js
	library.json
	semantics.json
 2014-03-28 17:05:08 +01:00
Frode Petterson
bd67306b96 Merge branch 'master' into api-1.2 2014-03-26 15:59:15 +01:00
Frode Petterson
8088b40bab Merge branch 'api-1.0' 2014-03-26 15:58:48 +01:00
Frode Petterson
1c749e63ec Added README files. 2014-03-26 15:57:56 +01:00
Frode Petterson
5e31bb138f Merge branch 'master' into api-1.2 2014-03-23 01:34:26 +01: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
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
Magnus Vik Magnussen
c678f5bbde HFJ-45 
Done minor changes to various css files when working on the editor.
-Changed background on intro text and question in Question Set.
-Changed some minor css in interactive video editor
-Improved vertical tabs (replaced image arrow with css arrow and change bitmap icons to Font Awesome icons)

Please note that verticalTabs needs review as it has a minor visual bug.
 2013-11-28 13:23:09 +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
0f5bdbade5 BFB-3: Merged more lost code in QuestionSet and MultiChoice 2013-11-07 14:32:38 +01:00
Frank Ronny Larsen
a33f7f1363 BFB-1: Fixed IcoMoon family names 2013-11-07 13:39:27 +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
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
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