Frode Petterson
|
41c98cc13c
|
Merge branch 'master' of github.com:h5p/h5p-php-library
|
2016-04-06 11:47:16 +02:00 |
Frode Petterson
|
e0d3c2e1e0
|
Merge branch 'release'
|
2016-04-06 11:47:06 +02:00 |
Thomas Marstrander
|
35a7213a67
|
Added confirmation dialog.
HFJ-1572
|
2016-04-05 18:35:02 +02:00 |
Frode Petterson
|
cdfab4d4b6
|
Merge branch 'master' of github.com:h5p/h5p-php-library
|
2016-04-04 11:12:16 +02:00 |
Frode Petterson
|
a11e8d4365
|
Bumped coreApi version to reflect editor changes
|
2016-04-04 11:11:18 +02:00 |
Thomas Marstrander
|
17ad3d4825
|
Merge branch 'master' of https://github.com/h5p/h5p-php-library
|
2016-03-31 16:09:23 +02:00 |
Thomas Marstrander
|
4d277b2304
|
Added version number and links to licenses.
HFJ-1734
|
2016-03-31 16:07:45 +02:00 |
Paal Joergensen
|
d912232433
|
Merge remote-tracking branch 'origin/more-font-styling' into release
|
2016-03-29 12:24:42 +02:00 |
Paal Joergensen
|
f05d3b3bf5
|
Merge branch 'image-editing' into release
|
2016-03-29 11:43:30 +02:00 |
Frode Petterson
|
41464cb98c
|
Corrected lib array
|
2016-03-21 12:35:44 +01:00 |
Frode Petterson
|
62e2f41884
|
Merged stuff
|
2016-03-21 11:56:56 +01:00 |
Frode Petterson
|
007137c257
|
Merge branch 'master' of github.com:h5p/h5p-php-library
Conflicts:
h5p.classes.php
|
2016-03-21 11:51:45 +01:00 |
Frode Petterson
|
b8a3965c6e
|
Merge branch 'master' into file-storage-interface
Conflicts:
h5p.classes.php
|
2016-03-16 10:01:13 +01:00 |
Paal Joergensen
|
5229e82764
|
Merge branch 'improved-ajax'
|
2016-03-15 16:09:01 +01:00 |
Frode Petterson
|
de175737ea
|
Use correct variable
|
2016-03-10 16:33:53 +01:00 |
Frode Petterson
|
89227e4639
|
Merge branch 'master' into image-editing
|
2016-03-10 14:22:04 +01:00 |
Frode Petterson
|
61ae8899cb
|
Merge branch 'master' into event-logging
Conflicts:
h5p.classes.php
|
2016-03-10 14:21:04 +01:00 |
Frode Petterson
|
f05a370b42
|
Merge branch 'event-logging' of github.com:h5p/h5p-php-library into event-logging
Conflicts:
h5p.classes.php
|
2016-03-10 14:19:30 +01:00 |
Frode Petterson
|
5b965636e0
|
Revert "HFJ-1610 - Gather statistics on dev or prod server."
This reverts commit 9b76fccfce .
|
2016-03-10 14:14:39 +01:00 |
Frode Petterson
|
36c8bf3362
|
Revert "HFJ-1610 - Track number of contents per library type."
This reverts commit 2e0498cd3a .
|
2016-03-10 14:14:33 +01:00 |
Frode Petterson
|
13a2988414
|
Revert "HFJ-1610 - Track libraries installed."
This reverts commit 5287d455b2 .
|
2016-03-10 14:14:00 +01:00 |
Frode Petterson
|
0218493eab
|
Added support for two more font styling options
HFJ-1646
|
2016-03-09 11:18:21 +01:00 |
Frode Petterson
|
437598aa8e
|
Use key to avoid bugs
|
2016-03-07 10:58:39 +01:00 |
Thomas Marstrander
|
4ed368f5e7
|
Ratio added as field instead of parameter, removed from whitelist.
HFJ-1645
|
2016-03-06 13:40:50 +01:00 |
Thomas Marstrander
|
ee245f9344
|
Whitelisted originalImage and ratio when validating Image.
HFJ-1645
|
2016-03-06 13:27:10 +01:00 |
Thomas Marstrander
|
fa7b42120d
|
Merge branch 'master' of https://github.com/h5p/h5p-php-library into image-editing
|
2016-03-06 11:42:37 +01:00 |
Thomas Marstrander
|
54ca645e2c
|
Whitelisted originalImage attribute when filtering params.
HFJ-1645
|
2016-03-06 11:42:24 +01:00 |
Frode Petterson
|
93fd710509
|
Fixed typo
HFJ-1610
|
2016-03-04 13:56:05 +01:00 |
Frode Petterson
|
b42193729e
|
Merge branch 'improved-ajax' into improved-ajax-moodle
Conflicts:
h5p.classes.php
|
2016-02-25 14:55:27 +01:00 |
Frode Petterson
|
0430e6ba28
|
Put AJAX response functions in core
|
2016-02-25 13:46:05 +01:00 |
Thomas Marstrander
|
92e4ab0f9e
|
Merge branches 'file-storage-interface' and 'master' of https://github.com/h5p/h5p-php-library into file-storage-interface
|
2016-02-24 09:49:11 +01:00 |
Frode Petterson
|
6bfffbcf30
|
Added woff2 as a safe file type
|
2016-02-23 13:10:08 +01:00 |
Frode Petterson
|
7a87735f02
|
Removed sub_type from stats
HFJ-1610
|
2016-02-11 09:53:16 +01:00 |
Frode Petterson
|
4cf7a32b4a
|
Get data from counters instead of log
HFJ-1610
|
2016-02-10 11:54:20 +01:00 |
Frode Petterson
|
2a20dc23ae
|
Use correct format
HFJ-1610
|
2016-02-09 13:52:35 +01:00 |
Frode Petterson
|
b16b0c1e0b
|
We're going to need authors
|
2016-02-09 10:55:44 +01:00 |
Frode Petterson
|
cf3373d4ee
|
Changes in format to be more POST friendly
HFJ-1610
|
2016-02-09 10:54:04 +01:00 |
Frode Petterson
|
c4011e3bbb
|
Use POST to get H5P updates
HFJ-1610
|
2016-02-08 11:39:21 +01:00 |
Frode Petterson
|
70baeb55a1
|
Add local ID from path
HFJ-1610
|
2016-02-08 10:38:53 +01:00 |
Frode Petterson
|
fa90b0a1c3
|
Use correct variable
|
2016-02-05 11:09:57 +01:00 |
Frode Petterson
|
292e04de5d
|
Combine library statistics
HFJ-1610
|
2016-02-04 16:34:32 +01:00 |
Frode Petterson
|
971e035626
|
Skip local check if network
HFJ-1610
|
2016-02-04 15:15:35 +01:00 |
Thomas Marstrander
|
5287d455b2
|
HFJ-1610 - Track libraries installed.
|
2016-02-03 15:58:49 +01:00 |
Thomas Marstrander
|
2e0498cd3a
|
HFJ-1610 - Track number of contents per library type.
|
2016-02-03 15:36:35 +01:00 |
Thomas Marstrander
|
9b76fccfce
|
HFJ-1610 - Gather statistics on dev or prod server.
|
2016-02-02 16:29:48 +01:00 |
Frode Petterson
|
fb9a84e665
|
Dependencies may be indexed differently
|
2016-01-25 14:44:40 +01:00 |
Frode Petterson
|
5eb0e0e14c
|
Avoid caching dependencies without assets
|
2016-01-25 14:44:10 +01:00 |
Frode Petterson
|
a65625d123
|
Merge branch 'master' into file-storage-interface
|
2016-01-21 09:57:23 +01:00 |
Frode Petterson
|
f8c2a47580
|
Get the lastest version of a given library.
h5p/h5p-wordpress-plugin#28
|
2016-01-20 13:21:51 +01:00 |
Frode Petterson
|
dc69181025
|
Removed debug
|
2016-01-14 15:39:01 +01:00 |