EDUCATIC
/
h5p-php-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,410 Commits
28 Branches
133 Tags
3.5 MiB
Commit Graph

1410 Commits (f6f6d0fb569ebd8adb75eae4cb5de7d464ba8d12)

Author SHA1 Message Date
Paal Joergensen 738dced286 Added utility function for figuriong out if event is from child [HFP-436] 2017-01-04 16:16:28 +01:00
Paal Joergensen 2cc6c53da1 bg colors on h5p core buttons changed [HFP-413] 2017-01-02 15:30:42 +01:00
Tom Arild Jakobsen dcb02810f0 Change confirmation dialogs button color. Relates to: #HFP-413 2016-12-30 14:13:05 +01:00
Andreas Nergaard fc668c5ab3 Revert "Merge branch 'master' into HFP-186-tutorial-example-links" 
This reverts commit 893f610861, reversing
changes made to e00bdbd125.
 2016-12-22 15:10:15 +01:00
Andreas Nergaard 893f610861 Merge branch 'master' into HFP-186-tutorial-example-links 
Conflicts:
	fonts/h5p-core-16.eot
	fonts/h5p-core-16.svg
	fonts/h5p-core-16.ttf
	fonts/h5p-core-16.woff
	styles/h5p.css
 2016-12-22 12:50:56 +01:00
Paal Joergensen a41df0ad9e Merge branch 'master' into improved-file-handling 2016-12-21 15:17:56 +01:00
Paal Joergensen e00bdbd125 Making sure displayoptions.icon is a boolean [HFP-277] 2016-12-21 15:17:36 +01:00
Paal Joergensen 20042fba85 Merge branch 'master' into improved-file-handling 2016-12-21 13:34:06 +01:00
Paal Joergensen 671c079eee Merge branch 'improved-embed-and-download' 2016-12-21 13:21:39 +01:00
thomasmars 53f38d596b Merge branch 'master' of https://github.com/h5p/h5p-php-library 2016-12-21 11:35:43 +01:00
thomasmars e2634070d4 Ignore overrideSettings parameter fields. 
HFP-391
 2016-12-21 11:34:51 +01:00
Paal Joergensen 8f681a2140 Fixing missing semicolon [HFP-375] 2016-12-20 16:40:45 +01:00
Paal Joergensen 8dd766ecb8 More contrast between confirmation dialog and background [HFP-375] 2016-12-20 16:39:51 +01:00
Timothy Lim b91be29cec Add return statement to recursive function 
HFP-391
 2016-12-20 15:46:36 +01:00
Paal Joergensen 117e1457b7 Merge branch 'master' into improved-embed-and-download 2016-12-20 14:37:52 +01:00
Paal Joergensen 1341768c90 Fixed problem with empty actionbar [HFP-277] 2016-12-20 14:37:31 +01:00
Paal Joergensen f6449a6043 Improving confirmation dialog [HFP-375] 2016-12-20 13:08:49 +01:00
Paal Joergensen 87ec43d687 Using constants for the different display options, and avoid special cases [HFP-277] 2016-12-16 14:22:03 +01:00
Paal Joergensen 7b39a6900c Inheriting global disable setting for export & embed when saving [HFP-277] 2016-12-16 13:29:18 +01:00
Paal Joergensen ea0362c3da Making lines shorter [HFP-277] 2016-12-16 13:27:40 +01:00
Paal Joergensen a1e68d212b Updated comments [HFP-277] 2016-12-16 11:38:47 +01:00
Paal Joergensen 526d7ddd7e Made copyright button being shown [HFP-277] 2016-12-16 11:30:59 +01:00
Timothy Lim 28e34c1c09 Simplify fullscreenSupported 
HFP-339
 2016-12-14 16:21:42 +01:00
Andreas Nergaard 5a272ea2f1 Fixed broken font referrance and metadata after font update. 2016-12-14 09:32:57 +01:00
Timothy Lim bbe16fb8da Revert changes for canHasFullScreen 
HFP-339
 2016-12-13 19:46:21 +01:00
Timothy Lim f0d65d4f9d Refactor canHasFullscreen 
HFP-339
 2016-12-13 16:04:57 +01:00
Paal Joergensen cfd6cb1e63 Fixed download/embed button bug when permissions are used 2016-12-13 15:57:05 +01:00
jelenamilinovic 1058dab02d Delete h5p-core-15.woff 2016-12-13 13:46:02 +01:00
jelenamilinovic 26cedf7d70 Delete h5p-core-15.ttf 2016-12-13 13:45:58 +01:00
jelenamilinovic c442300cab Delete h5p-core-15.svg 2016-12-13 13:45:55 +01:00
jelenamilinovic afc2084c2e Delete h5p-core-15.eot 2016-12-13 13:45:48 +01:00
jelenamilinovic cddef83287 Add files via upload 2016-12-13 13:43:25 +01:00
thomasmars a326066c97 Only set tutorial url if it exists. 
HFP-348
 2016-12-13 11:36:28 +01:00
Paal Joergensen e69a81f403 Added description of new interface method [HFP-277] 2016-12-13 10:33:59 +01:00
Timothy Lim 52dc1b2a81 Refactor canHasFullScreen 
HFP-339
 2016-12-13 10:33:11 +01:00
Paal Joergensen 0a23dc043d Download and embed granularity (HFP-277) 2016-12-13 10:29:33 +01:00
thomasmars 7d741fa503 Reset list-style for list items in action bar. 
HFP-350
 2016-12-13 10:16:15 +01:00
Timothy Lim a4d6f3aaab Restore deprecated variable H5P.canHasFullScreen for backwards compatability 
HFP-339
 2016-12-12 11:28:59 +01:00
thomasmars d76ce3f3a5 Applied fix for Safari full screen in version > 9 
Big thanks to Lest@t at Drupal for providing the patch.
HFP-342
 2016-12-12 11:22:34 +01:00
Andreas Nergaard 180d179f66 HFP-186 Added new icons to h5p core font. 2016-12-09 09:23:02 +01:00
thomasmars bc28592e48 Merge branch 'master' into ignoreBuildFiles 2016-12-06 11:35:55 +01:00
thomasmars 47c35d5135 Merge branches 'master' and 'stable' of https://github.com/h5p/h5p-php-library 2016-12-06 11:35:24 +01:00
Pål Jørgensen c906cb7084 Merge pull request #33 from h5p/improved-message-for-library-in-smantics-no-valid 
Improved message presented to user
 2016-12-05 09:45:23 +01:00
thomasmars d100c5102a Merge branch 'release' into ignoreBuildFiles 2016-12-02 13:47:21 +01:00
Paal Joergensen 4d010ef38f Improved message presented to user 2016-12-01 11:34:28 +01:00
thomasmars 5ec651e696 Merge branch 'release' into ignoreBuildFiles 2016-11-30 13:24:33 +01:00
Paal Joergensen ed1fb00745 Merge branch 'release' into improved-file-handling 2016-11-30 11:19:08 +01:00
Pål Jørgensen ece72fcfbe Merge pull request #32 from h5p/semi-fullscreen-api-function 
Added semi fullscreen function
 2016-11-30 09:40:17 +01:00
Tom Arild Jakobsen 32d06356b1 Bump to version 1.11 
Relates to: #HFP-285
 2016-11-29 16:44:20 +01:00
Tom Arild Jakobsen 5494443533 validateGroup must handle isSubContent 
* Update validateGroup in h4p.classes.php to allow subContentId into the data
 * Fix h5p-content-upgrade-process.js to take into account isSubContent

Relates to: #HFP-285
 2016-11-29 15:44:32 +01:00