Commit Graph

144 Commits (112e1e1108a98e1d21f000cb642f0fb415c18cb9)

Author SHA1 Message Date
Pål Jørgensen 112e1e1108 Merge branch 'master' of b.amendor.com:h5p 2013-07-08 17:12:48 +02:00
Pål Jørgensen 118024d479 Only clearing cache if at least one library was created or updated 2013-07-08 17:12:40 +02:00
Frank Ronny Larsen a7aeefc367 OPPG-414: Removed just in case-code. 2013-07-08 17:02:05 +02:00
Frank Ronny Larsen b76f1395f3 Merge branch 'OPPG-413' 2013-07-08 16:24:24 +02:00
Frank Ronny Larsen d2e3558927 OPPG-413: Enable caching, fill default tag list for HTML validation 2013-07-08 16:15:54 +02:00
Frank Ronny Larsen 35e2623e1b OPPG-413: Validation of specific limitations from semantics. 2013-07-08 15:28:45 +02:00
Frank Ronny Larsen 1ca9eff064 OPPG-413: Validation fixes 2013-07-08 14:59:15 +02:00
Pål Jørgensen aba62d5b48 Merge branch 'master' of b.amendor.com:h5p
Conflicts:
	example_content/coursepresentation/H5P.CoursePresentation/library.json
	example_content/coursepresentation/H5P.CoursePresentation/styles/cp.css
2013-07-08 09:39:39 +02:00
Pål Jørgensen 38d8269a76 Added new element type in coursepresentation: ExportableTextArea 2013-07-08 08:59:14 +02:00
Frank Ronny Larsen fca2d6924a Merge branch 'master' into OPPG-413
Conflicts:
	h5p.module
2013-07-08 08:56:08 +02:00
Frank Ronny Larsen 5f0ba2f2a0 OPPG-413: Validator mostly ready. Huge problems with lists. 2013-07-05 17:35:59 +02:00
Frode Petterson 4d5741c47a Merge branch 'ndla2' 2013-07-04 13:45:17 +02:00
Svein-Tore Griff With 8c46294dcd OPPG-376: Added comment about the getContentPath function beeing deprecated 2013-07-04 10:38:52 +02:00
Svein-Tore Griff With 9a2e77a069 OPPG-376: Added api function that was removed in previous commit by Frode Petterson 2013-07-04 10:38:17 +02:00
Svein-Tore Griff With 59025c8e68 OPPG-376: Added comment about the getContentPath function beeing deprecated 2013-07-03 14:24:09 +02:00
Svein-Tore Griff With 9d9b3bbc51 OPPG-376: Added api function that was removed in previous commit by Frode Petterson 2013-07-03 14:22:00 +02:00
Frank Ronny Larsen d1036e9a5a OPPG-172: Added File extentension white list for content
Scan content files to ensure all files comply with the configured
set of valid extensions.
Disallows adding htaccess or php to allowed extension too.
2013-06-30 22:14:16 +02:00
Frank Ronny Larsen 312bd0f8b5 OPPG-414: Specific permission for updating libraries
Added a permission.
Added a new function to H5PFrameworkInterface for testing if allowed to update library
Added apropriate tests.
2013-06-30 16:39:17 +02:00
Frank Ronny Larsen a34d0ea3e7 BUGFIX: Use DIRECTORY_SEPARATOR instead of '/' 2013-06-30 15:32:38 +02:00
Frode Petterson b21d129d2c OPPG-376: The forgotten code! 2013-06-27 14:29:56 +02:00
Frode Petterson ea9dd199aa Fixed file upload system. 2013-06-20 14:49:56 +02:00
Frode Petterson 152a5f956a Fixed keyboard in full screen when using webkit. 2013-06-07 19:09:10 +02:00
Frode Petterson 4f9827f035 Fixed rewrite of css urls when concatenating.
Fixed double insert of css and js.
2013-05-24 13:24:01 +02:00
Frode Petterson f3ba9224f1 Fixed so change callbacks also runs when files are removed.
Refactored cloneObject.
Added electure player to editor.
Removed hard coded video urls.
2013-05-23 13:00:58 +02:00
Frode Petterson 2ff1c26b23 Added support for resize and fullscreen.
Removed fullscreen from Android. (does not work)
Removed mute from Android and iPad. (does not work)
2013-05-21 16:53:38 +02:00
Svein-Tore Griff With 45627c8c65 Add specific resize function for when the window goes out of resize mode 2013-05-21 00:07:51 +02:00
Svein-Tore Griff With 0eb3051ca2 Add storage for the extra h5p.json data 2013-05-07 20:55:44 +02:00
Svein-Tore Griff With 8a94973852 Removing external resources 2013-05-07 19:38:52 +02:00
Svein-Tore Griff With da99000fe8 Translation of semantics now working 2013-05-03 11:21:08 +02:00
Frode Petterson 2edb9a6b3f Merge branch 'master' of b.amendor.com:h5p 2013-05-02 17:12:48 +02:00
Frode Petterson 6a0a176935 Styled multichoice and made standalone a choice. 2013-05-02 17:11:56 +02:00
Svein-Tore Griff With 1a9a9b8b0b Add code for supporting language files. The code doesn't work but doesn't seem to break anything either. 2013-05-02 17:09:48 +02:00
Svein-Tore Griff With 7d25f28a6d Fix bugs after refactoring library validation. Also added camelcase on a variable. 2013-05-01 23:24:58 +02:00
Svein-Tore Griff With 252cb01573 refactoring, not stable 2013-05-01 17:22:09 +02:00
Frode Petterson 5156cbd479 Fine tuning on the editor and the boardgame. 2013-04-30 17:07:14 +02:00
Frode Petterson 9c0fb69e27 Improved boardgame flexibility. 2013-04-26 17:27:35 +02:00
Frode Petterson 133f0a94f9 Made summary scale! 2013-04-24 16:28:38 +02:00
Frode Petterson 6c565f7bb5 Changed font sizes.
Removed defaults.
Added keywords tip text.
Changed solutions text to suggested answers.
Changed default H-tags to H2 and H3 in ckeditor.
Fixed wysiwyg not disappearing when closing dialogs.
Removed library selector from dialog window.
Increased drag'n bar buttons threshold to 11.
Slideination prev and next buttons removed.
Slideination scrolling improved.
Removed the word widget from keywords warnings.
Removed keywords buttons when removing keywords.
2013-04-24 11:20:07 +02:00
Frode Petterson b7ab4c7c0a Updated visuals. 2013-04-18 15:52:06 +02:00
Frode Petterson 9dcb4c5951 Fixed keywords interactions when cloning a slide.
Fixed object cloning function to support arrays.
2013-04-18 09:51:58 +02:00
Frode Petterson b47f1bbcd8 Added cancel button.
Fixed bug in object cloning.
2013-04-17 20:40:13 +02:00
Svein-Tore Griff With 849b299a77 Style changes 2013-04-15 14:12:57 +02:00
Svein-Tore Griff With 0ab794f67b Allow dots in filenames 2013-04-14 15:31:29 +02:00
Svein-Tore Griff With 1cb36af66e Use '-' instead of '_' in folder names 2013-04-13 15:03:04 +02:00
Svein-Tore Griff With 995e56cf60 Save h5p libraries in folders with understandable names 2013-04-13 14:55:33 +02:00
Svein-Tore Griff With 18b2475918 Do not attempt to save library dependencies for libraries that have already been saved, and also remove previous dependencies for libraries that are beeing patched 2013-04-13 14:11:25 +02:00
Svein-Tore Griff With d51e6e8d01 Fix dependency checking 2013-04-13 13:28:48 +02:00
Svein-Tore Griff With b383ae0124 Resolve conflicts 2013-04-11 15:13:48 +02:00
Svein-Tore Griff With aaf925b281 Merge in origin master 2013-04-11 15:09:17 +02:00
Frode Petterson 57cc64f28c Added checking for fullscreen. 2013-04-11 14:59:33 +02:00