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

95 Commits (3111ef3fa62553079f8fb8d287deb307befd467b)

Author SHA1 Message Date
Paal Joergensen 3111ef3fa6 Bump 2015-11-09 13:12:46 +01:00
Frode Petterson 7e398ff1da Upped patch version. 2015-10-12 09:24:33 +02:00
Thomas Marstrander 2e307e8e55 Increased minor version and dependency to JoubelUI. [HFJ-1088] 2015-09-24 15:39:12 +02:00
Thomas Marstrander 848a680de4 Increase patch version 2015-09-15 09:49:28 +02:00
Thomas Marstrander 4f7c4e7771 Increased dependencies to match other content types [HFJ-1007] 2015-09-09 16:22:46 +02:00
Frode Petterson ef302b1173 Updated title and description. 2015-08-28 10:41:49 +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 d38867bfd0 bump 2015-07-09 15:19:18 +02:00
Paal Joergensen 997db862e7 Bump 2015-06-22 14:22:25 +02:00
Thomas Marstrander ea6af64c31 New DragQ version dependency, version bump 2015-05-15 10:42:20 +02:00
Svein-Tore Griff With 3cc6337c81 Question set minor version has been bumped twice, correct this 2015-04-14 13:56:32 +02:00
Svein-Tore Griff With 4aef67c14f Update dependencies 2015-04-07 19:00:11 +02:00
Svein-Tore Griff With ab00c5cc94 Experiment with bubble system 2015-03-21 16:48:32 +01:00
Svein-Tore Griff With 8c6fb5c2e5 Resolve conflict 2015-02-12 14:08:44 +01:00
Svein-Tore Griff With aeee49e85e dependency version updates 2015-02-12 14:07:07 +01:00
Svein-Tore Griff With 186ef396e2 Merge branch 'text-editor' 2015-02-05 12:11:47 +01:00
Svein-Tore Griff With 9777d3964e Correct author 2015-02-04 20:57:49 +01:00
Svein-Tore Griff With 7c519e770d Update core version and minor version 2015-02-04 18:13:03 +01:00
Svein-Tore Griff With 5c158d235f Run in iframe since drag and drop needs iframe 2015-01-29 13:13:07 +01:00
Frode Petterson 894220c525 Merge branch 'master' into text-editor 2015-01-16 15:55:25 +01:00
Frode Petterson 1e2f94c15a Changed version to make upgraded question types work. 2015-01-08 14:39:55 +01:00
Frode Petterson 0165ebb695 Added textual editor. 2014-12-03 13:02:31 +01:00
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