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

688 Commits (0ef07f13f3cbce05c0145e30c28b0f467baeef7f)

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
Pål Jørgensen f3df9e9923 Merge branch 'api-1.1' into api-1.2 2014-04-14 13:33:38 +02:00
Pål Jørgensen cc1b424793 Merge branch 'api-1.2' of github.com:h5p/h5p-question-set into api-1.2 2014-04-14 13:33:30 +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
Pål Jørgensen 1209931228 Merge github.com:h5p/h5p-question-set into api-1.2 2014-04-13 19:03:39 +02:00
Frode Petterson dc2da8b757 Merge branch 'api-1.1' into api-1.2 2014-04-11 15:51:29 +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
Frode Petterson 0dcc4503f9 Added ignore file. 2014-04-10 12:57:55 +02:00
Pål Jørgensen f661237a12 Merge branch 'api-1.1' into api-1.2 2014-04-03 15:08:51 +02:00
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