Commit Graph

1272 Commits (3566ac4141b1dac9deca91328bfce939cf9d5a0c)

Author SHA1 Message Date
thomasmars d4c90e716d Merge branch 'CheckFileExistsBeforeZip' of https://github.com/mannes/h5p-php-library into mannes-CheckFileExistsBeforeZip 2017-04-18 10:44:37 +02:00
Paal Joergensen da568e4b8a Merge branch 'release' into stable 2017-04-18 09:26:01 +02:00
Frode Petterson dcbb5a2a18 Merge branch 'master' into release 2017-04-12 13:17:04 +02:00
thomasmars d50d98297b Set action frame button sizes in pixels to be IE11 compat
Frame is always set in pixels anyway, so should not be a problem
HFP-939
2017-04-11 19:34:58 +02:00
Paal Joergensen 727e88908a Made statistics being sent on updateContentTypeCache [HFP-931] 2017-04-11 14:51:27 +02:00
thomasmars 2ff14ecd37 Remove key message when registering with Hub until it is back.
JI-115
2017-04-11 13:02:44 +02:00
Frode Petterson d81fa06499 Check correct variable
JI-114
2017-04-11 09:35:17 +02:00
Frode Petterson c475db843d Separate statistics reporting from 'Use H5P Hub' option
JI-114
2017-04-10 14:09:02 +02:00
thomasmars c4f2b26116 Make sure contentId are handled when passed as strings 2017-04-09 17:43:56 +02:00
Tom Arild Jakobsen 86ee19905e Fix confirmation dialog confirm icon
* Position icon up a bit
 * Fix icon not showing in IE at all

Relates to: HFP-889
2017-04-07 10:28:17 +02:00
thomasmars a0069235f1 Make it possible to move content directory to existing content
HFP-899
2017-04-06 16:30:26 +02:00
Frode Petterson 29fd758bf5 Update phpdoc
HFP-884
2017-04-04 12:44:22 +02:00
Frode Petterson c5974e6212 Update fetch api 2017-04-03 14:51:54 +02:00
Frode Petterson 280946979f Remove update functionality
JI-111
2017-04-03 13:33:47 +02:00
Svein-Tore Griff With 98f1ac4abb Merge pull request #38 from otacke/HFP-878
Avoid accidently selecting things in the toolbar
2017-04-03 10:22:12 +02:00
otacke 8cb9e8b0d1 remove non standard touch CSS 2017-03-31 13:57:11 +02:00
otacke bd83ddc5e7 make actionbar buttons unselectable 2017-03-31 13:36:40 +02:00
Frode Petterson bfda796ab7 Allow processing after export is generated 2017-03-30 13:55:44 +02:00
Timothy Lim 33406c69cc JI-89 Fix spelling error 2017-03-28 13:32:30 +02:00
thomasmars d3d5dbe1a7 Removed api_version from site data, since it is part of url now. 2017-03-21 14:48:52 +01:00
thomasmars 3611da5921 Only send the necessary data when registering a site
Merge in the rest of the metadata when fetching ct cache
HFP-489
2017-03-18 15:39:27 +01:00
thomasmars 4098f7a0d9 Merge branches 'HFP-822-ajax-refactor' and 'master' of https://github.com/h5p/h5p-php-library into HFP-822-ajax-refactor
# Conflicts:
#	h5p.classes.php
2017-03-16 20:01:08 +01:00
thomasmars fd93b30a38 Fixed return statement of fetch libraries metadata
HFP-489
2017-03-16 10:09:52 +01:00
thomasmars 675c87df68 Added more detailed messages when site is or fails to register
HFP-489
2017-03-16 10:01:41 +01:00
thomasmars 93e9d6e0ec Register site with new endpoint if no site is already registered
HFP-489
2017-03-16 09:51:46 +01:00
thomasmars 75b8f9efd6 Fixed move content folder bug
HFP-822
2017-03-14 15:00:14 +01:00
thomasmars 754346992b Minor documentation details 2017-03-14 14:21:36 +01:00
thomasmars 1b19f2701d Make data optional in fetchExternalData function
HFP-822
2017-03-13 14:56:01 +01:00
thomasmars cf3022af43 Moved editor specific functionality to editor interface
Refactored hub endpoints into an abstract class for consistency and easier lookup
Fixed bug in moveContentDirectory function
HFP-822
2017-03-12 17:56:36 +01:00
thomasmars 0970f74b43 Made it easier to use ajax functions in core with existing endpoints
Moved common ajax functionality to core.
Created interface functions for ajax functionality that must be handled by each plugin
Re-encapsulated storage functions to keep a clean interface
Added function for moving temp files to the editor
HFP-822
2017-03-11 18:43:08 +01:00
Paal Joergensen b3e0539261 Resetting [HFP-805] 2017-03-10 14:29:49 +01:00
Frode Petterson 907396e49b Merge branch 'master' of github.com:h5p/h5p-php-library 2017-03-10 13:06:31 +01:00
Frode Petterson 2b327323e1 Add missing default 2017-03-10 13:06:19 +01:00
Svein-Tore Griff With 58d5eef422 Document ios landscape / portrait hack 2017-03-10 08:59:46 +01:00
Svein-Tore Griff With 918084647f Merge pull request #36 from lukemuller/master
Fixed iOS bug for Image Hotspots and iFrames
2017-03-10 08:56:09 +01:00
Luke Muller 4999862689 Fixed iOS bug for Image Hotspots and iFrames
There is a bug in iOS with IFrame's that when changing orientation width: 100% stays at landscape rather than going back to portrait. https://bugs.webkit.org/show_bug.cgi?id=155198. Tested on iOS 10 iPhone 7 on image hotspot.
2017-03-10 12:31:20 +10:00
thomasmars 16982c0207 Merge branch 'master' of https://github.com/h5p/h5p-php-library 2017-03-09 17:36:27 +01:00
thomasmars a720d46548 Make it easier to send files to the editor
HFP-822
2017-03-09 17:36:20 +01:00
Andreas Nergaard 358424f2be HFP-826 Added 2 new icons to the core font. 2017-03-08 12:25:56 +01:00
Paal Joergensen f247bbdfe8 Improved json returned from content type cache endpoint 2017-03-07 11:24:08 +01:00
Paal Joergensen 914ee55ac5 Fixed broken core - using wrong function name [HFP-805] 2017-03-07 10:36:49 +01:00
Paal Joergensen 37f4399ab4 Added interface function that returns library file URL [HFP-805] 2017-03-07 10:25:52 +01:00
Paal Joergensen c8b123c5c3 Using local icon if present (HFP-807) 2017-03-07 09:46:16 +01:00
thomasmars ae56eef91d Use ID instead of library_id for lbiraries
HFP-793
2017-03-03 15:45:19 +01:00
thomasmars a95323948e Improved upload size error msg
HFP-509
2017-03-03 14:47:15 +01:00
thomasmars 217c2006a4 Separate between setup error messages and disabling hub
HFP-509
2017-03-03 11:29:09 +01:00
thomasmars 318b9f4819 Restrict LRS dependent content if set
HFP-797
2017-03-03 10:43:39 +01:00
thomasmars 410c2a9ae1 Added permission check for restricted local libraries
Renamed cached library map function to something more appropriate
HFP-797
2017-03-03 10:33:21 +01:00
thomasmars 0af411bac8 Send json as camelCase
HFP-794
2017-03-02 14:39:36 +01:00
thomasmars c0e82edfb4 Fixed endpoint address
HFP-794
2017-03-02 14:25:30 +01:00