EDUCATIC
/
h5p-php-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
834 Commits
28 Branches
133 Tags
3.5 MiB
Commit Graph

834 Commits (e324e298b9d41b8baa7e387004e8447a9ca9b64f)

Author SHA1 Message Date
Frode Petterson e324e298b9 Added function for reading file contents 
h5p/h5p-moodle-plugin#47
HFJ-1844
 2016-04-22 11:35:23 +02:00
Frode Petterson 64de9d53f8 Merge branch 'master' of github.com:h5p/h5p-php-library 
Conflicts:
	README.txt
 2016-04-13 11:33:39 +02:00
Frode Petterson b559935c09 Merge branch 'davericher-master' 2016-04-13 11:30:39 +02:00
Svein-Tore Griff With f510d0f0e9 Merge pull request #18 from marclaporte/patch-2 
Fix some typos and improve clarity
 2016-04-13 08:54:23 +02:00
Dave Richer 29a8601595 Major clean up of both syntactical errors and spelling 2016-04-13 00:01:15 -04:00
Marc Laporte b0f7c5cd35 Fix some typos and improve clarity 2016-04-12 18:30:26 -04:00
Frode Petterson e26a662341 Merge branch 'release' 2016-04-12 15:06:30 +02:00
Frode Petterson b93b7082dc Reset page offset when filtering by facets 2016-04-12 15:01:10 +02:00
Frode Petterson cdfb810501 Merge branch 'release' 2016-04-12 14:39:59 +02:00
Frode Petterson 7474916f3a scripts and styles arrays must always be defined 2016-04-12 11:37:55 +02:00
Frode Petterson 471a1ea6a8 Merge branch 'master' of github.com:h5p/h5p-php-library 2016-04-11 11:49:34 +02:00
Frode Petterson 38fc011c7f Fixed focus and active style for H5P bar 
HFJ-1549
 2016-04-11 11:49:01 +02:00
Thomas Marstrander 7f41e2b3c6 Merge remote-tracking branch 'origin/master' 2016-04-08 13:49:20 +02:00
Thomas Marstrander 711b9326bc CP editor interaction popup has z-index 100, so confirmation dialog must have z-index 101 
HFJ-1572
 2016-04-08 13:49:06 +02:00
Frode Petterson 84d93af447 Merge branch 'master' of github.com:h5p/h5p-php-library 2016-04-08 13:19:31 +02:00
Frode Petterson 9741dd882d Improved action bar buttons 
Now supports space bar.
HFJ-1549
 2016-04-08 13:18:35 +02:00
Thomas Marstrander 233b5e7653 Programmatically set focus to confirmation dialog. 
HFJ-1572
 2016-04-08 10:23:55 +02:00
Thomas Marstrander e8adccaa02 Updated confirmation dialog styles. 
HFJ-1572
 2016-04-07 16:31:41 +02:00
Thomas Marstrander ea620e12f0 Reverted left adjustment of confirmation dialog. 
HFJ-1572
 2016-04-07 15:22:19 +02:00
Thomas Marstrander bf7f5c863c Confirmation dialog adjustments. 
Translated copyright dialog default texts.
Removed focus on click.
Adjusted left positioning when showing dialog.
Adjusted max width of dialog.
HFJ-1572
 2016-04-07 14:51:56 +02:00
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
Frode Petterson d4112a639a Merge pull request #17 from marclaporte/patch-1 
Fix some typos and improve spelling
 2016-04-06 09:39:06 +02:00
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