Commit Graph

836 Commits (926ff4af3a736a9b5949aaa40f7cc001e3d61686)

Author SHA1 Message Date
Svein-Tore Griff With 18d3798ec1 Revert "Merged in changes."
This reverts commit 801234f263adc38b91f845019ef114fa65af370a.
2013-03-08 18:30:53 +01:00
Svein-Tore Griff With ec3b36037c Revert "Tried to make H5P work again.."
This reverts commit afcf767628591dbcc4f2a48868d994edfb39209d.
2013-03-08 18:30:38 +01:00
Frode Petterson 98c06da4e6 Tried to make H5P work again.. 2013-03-08 11:51:55 +01:00
Frode Petterson 8177e0a251 Merged in changes. 2013-03-07 17:14:41 +01:00
Frode Petterson 9c934a752a Merge branch 'master' of b.amendor.com:h5p
Conflicts:
	example_content/boardgame/H5P.Boardgame
	example_content/boardgame/H5P.MultiChoice
	example_content/boardgame/H5P.QuestionSet
	example_content/boardgame/h5p.json
	example_content/summary/h5p.json
	h5p.classes.inc
	h5p.install
	h5p.module
2013-03-07 12:39:30 +01:00
Frode Petterson f71bf70561 Added class to libraries. 2013-03-07 12:34:29 +01:00
Svein-Tore Griff With 678f62d10a Fix problem with h5peditor changes not beeing saved when a node is beeing revisioned 2013-03-07 05:31:30 +01:00
Svein-Tore Griff With c5f3b92245 Merge conflicts 2013-03-07 04:19:22 +01:00
Svein-Tore Griff With c996a7b5ea Adding versioning support 2013-03-07 04:12:59 +01:00
Svein-Tore Griff With 45386f7825 Adding full versioning support 2013-03-06 15:59:02 +01:00
Frank Ronny Larsen bf15f46d82 DEVEL: Changed CSS drop procedure 2013-02-28 20:06:18 +01:00
Svein-Tore Griff With 517f7e6e9d Resolve conflicts 2013-02-27 22:49:56 +01:00
Frode Petterson ad828c1984 Fixed php notice. 2013-02-25 15:45:34 +01:00
Frode Petterson ac0209815a Merge branch 'master' of b.amendor.com:h5p
Conflicts:
	example_content/boardgame/H5P.Boardgame
	example_content/boardgame/H5P.QuestionSet
2013-02-25 14:17:10 +01:00
Frode Petterson 6daf5ce803 Fixed video 2013-02-25 14:15:52 +01:00
Svein-Tore Griff With 71763222e2 Save dependencies by library id instead of by machine_name and version 2013-02-24 00:12:57 +01:00
Frank Ronny Larsen 027a32baf1 Fixes for defaultStyles, adds boolean requirement parsing too 2013-02-23 23:29:41 +01:00
Frank Ronny Larsen 4a41265a23 DEVEL: Added defaultStyles setting to library dependencies 2013-02-23 22:51:47 +01:00
Frank Ronny Larsen f40302b8b6 Merge branch 'master' of b.amendor.com:h5p 2013-02-20 13:41:06 +01:00
Frank Ronny Larsen 8d3ead2866 BUGFIX: Show video in IE9 too. 2013-02-20 13:40:54 +01:00
Svein-Tore Griff With b1bc724578 Remove already fixed todo item 2013-02-17 15:40:07 +01:00
Svein-Tore Griff With c656710889 Rename H5PFramework to H5PFrameworkInterface (Adopting drupals naming convention for interfaces) 2013-02-17 15:39:26 +01:00
Svein-Tore Griff With a5cb1db6d4 Rename classes and interfaces 2013-02-17 15:04:30 +01:00
Svein-Tore Griff With a2f1798173 Rename store -> save 2013-02-17 14:05:02 +01:00
Svein-Tore Griff With 1d24e3bcf1 Merge branch 'master' of intern.amendor.com:h5p 2013-02-15 11:39:01 +01:00
Svein-Tore Griff With ab90fa41ce Add doc 2013-02-15 11:38:49 +01:00
Frank Ronny Larsen c7f04d0f4c Merge branches 'working' and 'master' 2013-02-13 19:21:01 +01:00
Frank Ronny Larsen c5aca76456 Added flowplayer fallback for IE8 (and others without html5 video) 2013-02-13 19:13:53 +01:00
Svein-Tore Griff With ef00e707ad Working proof of concept for editorLibraries 2013-02-08 04:38:27 +01:00
Frank Ronny Larsen 58aaf044d3 DEVELOPMENT: Added H5P.playVideo() 2013-02-07 17:50:17 +01:00
Frank Ronny Larsen 7e704cb600 Merge branch 'master' of b.amendor.com:h5p 2013-02-06 18:54:07 +01:00
Frank Ronny Larsen 90bc40fcc4 jQuery now in library/js. Patched to load as H5P.jQuery 2013-02-06 18:53:39 +01:00
Svein-Tore Griff With 4e7a445198 Add validation for editor dependencies 2013-02-06 17:39:45 +01:00
Svein-Tore Griff With 7db3def124 Fix undefined function bug 2013-02-05 15:36:39 +01:00
Svein-Tore Griff With a5acd003d0 Rename init to main_library and remove init from libraries, add schema to db 2013-01-27 23:08:48 +01:00
Svein-Tore Griff With 905afe7dde Add the schema to the database 2013-01-25 15:14:29 +01:00
Frank Ronny Larsen 784d5caeb3 Updated libs. Updates to content. More images 2013-01-25 14:38:12 +01:00
Svein-Tore Griff With 57674be19d Bugfixes to make content path work 2013-01-20 16:45:35 +01:00
Svein-Tore Griff With c4b3c420fd Minor bug fixes 2013-01-20 16:13:11 +01:00
Svein-Tore Griff With bf286eb664 Merge branch 'master' of intern.amendor.com:h5p 2013-01-20 14:51:01 +01:00
Svein-Tore Griff With 62b6c498c3 Begin adding support for external resources 2013-01-17 23:39:24 +01:00
Svein-Tore Griff With a5e031d81f Store whether or not a library is runnable 2013-01-17 23:21:10 +01:00
Svein-Tore Griff With 72d6075190 Stop using dropbox for images 2013-01-17 22:57:10 +01:00
Svein-Tore Griff With ecb795f655 Make it possible to have multiple content on one page, and also make it possible to get path to content folder 2013-01-17 22:20:41 +01:00
Frode Petterson ec7214bc60 Merge branch 'master' of b.amendor.com:h5p 2013-01-17 10:14:03 +01:00
Frode Petterson d7340fad8a Constructive comment. 2013-01-17 10:13:58 +01:00
Svein-Tore Griff With 412a90964d Moved h5p.js to library folder 2013-01-17 09:01:43 +01:00
Svein-Tore Griff With decfb609ab Ignore files starting with . or _ 2013-01-16 22:00:12 +01:00
Frank Ronny Larsen 2d3abae249 Fixes to H5P module
Regex for library names changed to be a lot less restrictive.
Fixes to validation code that assumed stuff. Less strict now too.
Allow multiple JS/CSS files per library.

Attach H5P JS object to targets
2013-01-16 19:39:49 +01:00
Svein-Tore Griff With c283cd83b8 Add comments to the code 2013-01-14 23:47:50 +01:00