Commit Graph

1286 Commits (85d2e2eb75b48c75736bc6a67e5688971ff4a63f)

Author SHA1 Message Date
thomasmars c4affb23dd Added confirmation dialog functionality when disabling hub.
Refactored server setup check into check and var updates.
Moved bytes string parsing out of server setup check and fixed naming convention.
Fixed indentation to match library core instead of Moodle style.
2017-02-21 17:37:01 +01:00
thomasmars c70f8521bb Use core naming convention for requirements function
HFP-502
2017-02-21 14:31:01 +01:00
thomasmars ff496d9a38 Check for H5P requirements.
HFP-502
2017-02-21 14:01:49 +01:00
Frode Petterson c4b88c3992 Add reveling field support for settings
HFP-495
2017-02-20 15:06:42 +01:00
Andreas Nergaard 8f132cfffb Merge branch 'master' into HFP-186-tutorial-example-links 2017-02-09 17:23:18 +01:00
Andreas Nergaard c41d001754 HFP-750 Adding fixed icon. 2017-02-09 14:09:25 +01:00
Andreas Nergaard 3e9277c0f8 HFP-750 Updated h5p core font from 16 to 17. 2017-02-09 12:45:51 +01:00
Frode Petterson e66e6c5d76 Only clone content folder if it exists
HFP-731
2017-02-08 10:57:16 +01:00
Frode Petterson bb71ea20a3 Update JSDoc 2017-02-07 13:48:42 +01:00
Frode Petterson ea3b86dcfe Development mode must be set by default
HFP-724
2017-02-07 12:55:53 +01:00
Frode Petterson b555e4d7a4 Merge branch 'master' of github.com:h5p/h5p-php-library 2017-02-06 14:40:56 +01:00
Frode Petterson 26d0a3a341 Double check that contents settings exist
… before using them.
HFP-714
2017-02-06 14:39:59 +01:00
Frode Petterson 39d7ddc6b8 Merge branch 'master' of github.com:h5p/h5p-php-library 2017-01-31 13:36:32 +01:00
Frode Petterson e548b3575f Add custom xAPI events for action toolbar buttons 2017-01-31 13:35:23 +01:00
Timothy Lim 3b9dd95683 HFP-580 Update regex 2017-01-30 14:49:09 +01:00
Paal Joergensen ef4165a11d Fixed developer mode for Drupal 2017-01-30 11:38:34 +01:00
Paal Joergensen 6ab68eb6e2 Minor cleaning 2017-01-30 08:43:47 +01:00
Frode Petterson 9abe7ef321 Merge branch 'master' of github.com:h5p/h5p-php-library 2017-01-26 15:35:53 +01:00
Timothy Lim 5dc9e3ddd1 HFP-580 Handle language files with hyphens 2017-01-26 15:31:51 +01:00
Frode Petterson bdec1319ed Always return fileId for tracking tmp files 2017-01-26 14:56:36 +01:00
Frode Petterson 03271418f0 Use correct variable 2017-01-26 14:56:28 +01:00
Frode Petterson 95cfaf6b9e Merge branch 'master' into improved-file-handling 2017-01-26 14:12:43 +01:00
Frode Petterson e02df35bb1 Fix compability with PHP <5.4
Big thanks to andyrandom at drupal.org for providing the fix.
2017-01-26 10:37:26 +01:00
Paal Joergensen aedd0112c2 Merge branch 'release' into improved-file-handling 2017-01-13 15:20:11 +01:00
Frode Petterson 79fb0e310c Change confirm dialog overlay color tint
HFP-457
2017-01-13 13:06:22 +01:00
Paal Joergensen 6e135d0319 Merge branch 'release' into improved-file-handling 2017-01-11 16:21:15 +01:00
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