2bcf3b783f
Merge branch 'release'
2016-06-06 10:01:36 +02:00
f6ce5dff74
Added pointer cursor for core cancel button.
...
HFJ-1930
(cherry picked from commit c6b3b06
2016-06-06 09:47:29 +02:00
ed13203254
Use buttons instead of anchors in Confirmation Dialog.
...
HFJ-1930
(cherry picked from commit 27bc158
2016-06-06 09:47:15 +02:00
0d6fac4099
Merge branch 'release' of github.com:h5p/h5p-php-library into release
2016-06-03 12:53:12 +02:00
93a07d2e9b
Merge branch 'improved-file-handling' of https://github.com/h5p/h5p-php-library into improved-file-handling
2016-05-31 14:43:34 +02:00
b102a7de21
Only add editor context when in editor.
...
HFJ-1972
2016-05-31 14:43:12 +02:00
ce89b516ef
Merge branch 'release' into improved-file-handling
2016-05-31 12:43:06 +02:00
594d992f19
Merge branch 'master' into improved-file-handling
2016-05-31 12:42:29 +02:00
eba774c863
Prevent DOM pollution when having many confirmation dialogs.
...
Append confirmation dialog on show and detach it on hide.
HFJ-1969
(cherry picked from commit 0a63d12
2016-05-31 11:49:26 +02:00
c2f5feaae5
Improved error message for req core version
...
HFJ-1959
2016-05-31 10:51:59 +02:00
0a63d123cf
Prevent DOM pollution when having many confirmation dialogs.
...
Append confirmation dialog on show and detach it on hide.
HFJ-1969
2016-05-31 10:19:07 +02:00
73a23d4679
Send context id together with post data in order to determine our context.
...
HFJ-1964
2016-05-30 10:35:06 +02:00
bba5190876
Merge branch 'release' of github.com:h5p/h5p-php-library into improved-file-handling
2016-05-24 11:27:28 +02:00
c6b3b06a97
Added pointer cursor for core cancel button.
...
HFJ-1930
2016-05-24 11:18:42 +02:00
27bc158708
Use buttons instead of anchors in Confirmation Dialog.
...
HFJ-1930
2016-05-23 14:34:56 +02:00
2c4edb7b56
Merge branch 'master' into release
2016-05-13 14:56:40 +02:00
cc121b2f53
Bugfix: Must be able to run from CLI
2016-05-13 13:42:44 +02:00
417af36c81
Bugfix: Must be able to run from CLI
2016-05-12 15:52:37 +02:00
cbfa2913bc
Merge branch 'master' into improved-file-handling
2016-05-09 13:21:47 +02:00
51698d325b
Corrected file storage interface
2016-05-09 11:53:12 +02:00
a36b2f1212
Removed TODO which makes no sense
2016-05-06 10:40:28 +02:00
e056b6776a
More functions for handling content files
...
Added three more functions to File Storage Interface
h5p/h5p-moodle-plugin#49
HFJ-1846
2016-05-04 16:52:02 +02:00
e412c3a228
Make sure focus is set after timeout, to not skewer content.
...
HFJ-1867
2016-05-04 12:37:59 +02:00
7782b19e99
Do not set offset initially, sometimes ended up overflowing parent element.
...
Do calculation before setting popup offset.
HFJ-1867
2016-05-04 11:53:46 +02:00
acaccea977
Allow pagination widget to handle empty pages
2016-05-03 12:47:16 +02:00
6e7e144900
Confirmation dialog - Focus confirm button on show.
...
HFJ-1860
2016-05-03 11:15:21 +02:00
c9583cb8fa
Merge branch 'master' into improved-file-handling
2016-04-26 11:57:04 +02:00
4da518296e
Make sure confirmation dialog is displayed on top of CP interaction as button.
...
HFJ-1572
2016-04-26 10:38:41 +02:00
c9349b8e26
Merge branch 'master' into improved-file-handling
...
Conflicts:
h5p-default-storage.class.php
h5p-file-storage.interface.php
2016-04-25 14:34:05 +02:00
b6b2a6b1dd
Merge branch 'master' of github.com:h5p/h5p-php-library
2016-04-25 14:32:34 +02:00
174d8c0941
Revert "Added function for reading file contents"
...
This reverts commit e324e298b9
2016-04-25 14:32:16 +02:00
325ea27562
Added func. for saving uploaded files
...
h5p/h5p-moodle-plugin#48
HFJ-1845
2016-04-25 14:31:25 +02:00
7b38c3571e
Made dir handling private to prevent abuse
...
h5p/h5p-moodle-plugin#48
HFJ-1845
2016-04-25 14:30:12 +02:00
05dfc9c374
Merge remote-tracking branch 'origin/master'
2016-04-25 13:17:56 +02:00
8a6733ceb4
Specified confirmation dialog css rules so they wont get overwritten by standard anchor styling.
...
Enabled iframe resize functionality for confirmation dialog.
HFJ-1572
2016-04-25 13:17:24 +02:00
1623f6701e
Merge pull request #21 from davericher/patch-1
...
Prevent H5P Core from breaking console commands
2016-04-25 09:48:37 +02:00
76e813a32e
Update h5p.classes.php
...
Prevents H5P From breaking console PHP commands
2016-04-23 23:40:46 -04:00
db6f18c984
Merge branch 'master' of github.com:h5p/h5p-php-library
2016-04-22 11:36:14 +02:00
e324e298b9
Added function for reading file contents
...
h5p/h5p-moodle-plugin#47
HFJ-1844
2016-04-22 11:35:23 +02:00
926ff4af3a
Avoid confirmation dialog skewering content.
...
HFJ-1572
2016-04-21 14:58:21 +02:00
6869ecbb09
Handling several digits in major and minor version
2016-04-21 13:22:01 +02:00
414751aad2
Fixed uploading packages and export functionality with development mode.
...
Changed update package to save package, update package was moved from interface in january, replaced with savePackage.
Added optional parameter to exportLibrary where you can pass in development folder path for the library if it lives inside development folder.
HVP-147
2016-04-21 11:38:14 +02:00
64de9d53f8
Merge branch 'master' of github.com:h5p/h5p-php-library
...
Conflicts:
README.txt
2016-04-13 11:33:39 +02:00
b559935c09
Merge branch 'davericher-master'
2016-04-13 11:30:39 +02:00
f510d0f0e9
Merge pull request #18 from marclaporte/patch-2
...
Fix some typos and improve clarity
2016-04-13 08:54:23 +02:00
29a8601595
Major clean up of both syntactical errors and spelling
2016-04-13 00:01:15 -04:00
b0f7c5cd35
Fix some typos and improve clarity
2016-04-12 18:30:26 -04:00
e26a662341
Merge branch 'release'
2016-04-12 15:06:30 +02:00
b93b7082dc
Reset page offset when filtering by facets
2016-04-12 15:01:10 +02:00
cdfb810501
Merge branch 'release'
2016-04-12 14:39:59 +02:00
Frode Petterson
Thomas Marstrander
Paal Joergensen
Dave Richer
Svein-Tore Griff With
Dave Richer
Marc Laporte