Commit Graph

1061 Commits (0e2edff5a85c67ba61c83f3b6d609e25c2f16c9b)

Author SHA1 Message Date
Marc Laporte 02e5f2045e Fix some typos 2016-04-05 12:40:06 -04:00
Thomas Marstrander 35a7213a67 Added confirmation dialog.
HFJ-1572
2016-04-05 18:35:02 +02:00
Frode Petterson 127dc4f0e1 Use correct ID when copying package 2016-04-05 16:06:09 +02:00
Frode Petterson 0c5971d6d4 Use numbers when comparing versions 2016-04-04 12:39:57 +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 6b31d467a0 Merge branch 'master' of github.com:h5p/h5p-php-library 2016-03-21 12:51:04 +01: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 2ac631458f Merge branch 'master' into content-tags 2016-03-18 13:52:53 +01:00
Frode Petterson 14605dc790 A more natural tabindex
HFJ-1549
2016-03-17 14:22:23 +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
Thomas Marstrander 4775e3444f Added two new icons.
HFJ-1716
2016-03-14 16:01:45 +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 43e9c7adcb Avoid navigating inside iframe
HFJ-1479
2016-03-01 15:36:22 +01:00
Frode Petterson 35a0d09b9b Only use one filter for each column
HFJ-1620
2016-03-01 11:34:34 +01:00
Frode Petterson a41ecccb9a Added em-dash when facet cell is empty.
Other minor visual adjustments.
HFJ-1620
2016-03-01 10:43:13 +01:00
Frode Petterson a398589c80 Added support for Tags in data views
HFJ-1620
2016-02-29 16:35:22 +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 06e9508eda Merge branch 'master' of github.com:h5p/h5p-php-library 2016-02-23 13:10:43 +01:00
Frode Petterson 6bfffbcf30 Added woff2 as a safe file type 2016-02-23 13:10:08 +01:00
Frode Petterson 4e06733ffb Use correct message 2016-02-22 12:01:18 +01:00
Frode Petterson 0aebdb345b Lets use a simpler solution 2016-02-22 11:58:25 +01:00
Frode Petterson 256bf1b6d2 Revert "Improved results and contentuserdata saving by queueing requests"
This reverts commit 3849f3a054.
2016-02-22 11:56:52 +01:00
Thomas Marstrander bfcf4228db Use variable with complete path HFJ-1695 2016-02-22 10:38:33 +01:00
Frode Petterson 12ba0d2da5 Abstract event base, usability enhancements 2016-02-19 13:38:38 +01:00
Frode Petterson 3849f3a054 Improved results and contentuserdata saving by queueing requests 2016-02-19 12:57:53 +01:00
Frode Petterson b42b28ab03 Use correct jQuery
HFJ-1610
2016-02-11 15:00:08 +01:00
Frode Petterson 7a87735f02 Removed sub_type from stats
HFJ-1610
2016-02-11 09:53:16 +01:00