EDUCATIC/h5p-php-library
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1095 commits 28 branches 133 tags 3.5 MiB
Commit graph

1095 commits

This branch
This branch
All branches
Author SHA1 Message Date
Frode Petterson
174d8c0941 Revert "Added function for reading file contents" 
This reverts commit e324e298b9.
 2016-04-25 14:32:16 +02:00
Frode Petterson
325ea27562 Added func. for saving uploaded files 
h5p/h5p-moodle-plugin#48
HFJ-1845
 2016-04-25 14:31:25 +02:00
Frode Petterson
7b38c3571e Made dir handling private to prevent abuse 
h5p/h5p-moodle-plugin#48
HFJ-1845
 2016-04-25 14:30:12 +02:00
Thomas Marstrander
05dfc9c374 Merge remote-tracking branch 'origin/master' 2016-04-25 13:17:56 +02:00
Thomas Marstrander
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
Frode Petterson
1623f6701e Merge pull request #21 from davericher/patch-1 
Prevent H5P Core from breaking console commands
 2016-04-25 09:48:37 +02:00
Dave Richer
76e813a32e Update h5p.classes.php 
Prevents H5P From breaking console PHP commands
 2016-04-23 23:40:46 -04:00
Frode Petterson
db6f18c984 Merge branch 'master' of github.com:h5p/h5p-php-library 2016-04-22 11:36:14 +02:00
Frode Petterson
e324e298b9 Added function for reading file contents 
h5p/h5p-moodle-plugin#47
HFJ-1844
 2016-04-22 11:35:23 +02:00
Thomas Marstrander
926ff4af3a Avoid confirmation dialog skewering content. 
HFJ-1572
 2016-04-21 14:58:21 +02:00
Paal Joergensen
6869ecbb09 Handling several digits in major and minor version 2016-04-21 13:22:01 +02:00
Thomas Marstrander
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
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