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

487 commits

Author SHA1 Message Date
Svein-Tore Griff With
e2b6f3527e Merge branch 'semantics-font' into release 2015-05-13 14:06:56 +02:00
Svein-Tore Griff With
85d66d52c0 Add DISABLE_ALL constant 2015-05-13 11:48:56 +02:00
Paal Joergensen
a8b465adb7 Merge branch 'smart-file-names' 2015-05-13 10:16:13 +02:00
Frode Petterson
cee887901b Make sure styles are filtered if they're not specified in the semantics. 2015-05-11 14:15:16 +02:00
Frode Petterson
e404c3ac68 Allow certain style tags on spans. 2015-05-08 16:06:04 +02:00
Frode Petterson
467f97c11f Use correct uuid variable 2015-04-28 12:42:36 +02:00
Frode Petterson
31872111eb Use content. 2015-04-27 15:20:40 +02:00
Frode Petterson
4683e61fa7 Delete correct export file. 2015-04-27 13:13:00 +02:00
Frode Petterson
ccccec84e7 Use correct path. 2015-04-22 15:19:01 +02:00
Frode Petterson
3eea931332 Merge branch 'release' into smart-file-names 2015-04-22 13:42:17 +02:00
Frode Petterson
9a37a99574 Re-added "Remove empty params." to master. 
This reverts commit 31ee0bd51a.
 2015-04-22 10:44:16 +02:00
Frode Petterson
31ee0bd51a Removed "Remove empty params." from release. 
This reverts commit 8c68f23823.
 2015-04-22 10:43:18 +02:00
Frode Petterson
8c68f23823 Remove empty params. 2015-04-20 15:10:31 +02:00
Svein-Tore Griff With
cf7ae066ad Add disable support for uploads as well 2015-04-15 13:54:46 +02:00
Svein-Tore Griff With
0b609e882d Add about to disable sources and make sure each source is set 2015-04-13 19:58:41 +02:00
Svein-Tore Griff With
868c06929d Whitespace changes 2015-04-13 18:41:53 +02:00
Svein-Tore Griff With
fba425220e Resolve conflicts 2015-04-13 18:32:33 +02:00
Svein-Tore Griff With
5c3620c637 Bubbling for event system 2015-04-07 19:33:21 +02:00
Svein-Tore Griff With
efbe56001d User data fixes 2015-04-07 19:32:44 +02:00
Svein-Tore Griff With
cfa747f20c Add path fixes 2015-04-07 19:30:46 +02:00
Frode Petterson
5adffcaeb8 Added content id. 2015-04-07 15:36:28 +02:00
Svein-Tore Griff With
61a8e7e9e9 Make view work again as well 2015-03-24 19:36:13 +01:00
Svein-Tore Griff With
065ee4e8a2 Make editor work again 2015-03-24 19:29:28 +01:00
Svein-Tore Griff With
ef7a31d2e1 Try to get back the no url branch 2015-03-24 18:55:13 +01:00
Svein-Tore Griff With
44e8cba365 Merge branch 'master' into aggregated-xapi 2015-03-22 13:14:40 +01:00
Svein-Tore Griff With
1c4a5e014b Comment out prefixing that isn't working 2015-03-22 13:12:44 +01:00
Svein-Tore Griff With
e76fc9eff3 Merge branch 'no-url-fopen' of https://github.com/h5p/h5p-php-library 2015-03-22 12:46:41 +01:00
Svein-Tore Griff With
b79a5b61b8 uuid consists of lowercase letters 2015-03-22 12:42:07 +01:00
Svein-Tore Griff With
313bb757ba Add bubble system and xAPI context 2015-03-21 16:45:38 +01:00
Frode Petterson
e6e3ee7559 Allow assets to be relative to another location. 
Allow assets to contain external URLs.
 2015-03-20 11:28:21 +01:00
Svein-Tore Griff With
8494e85c3e Remove todo items 2015-03-19 19:27:44 +01:00
Frode Petterson
51a1d333e2 Improved packaging. Made sure zip format is followed by always using forward slashes. This will make h5p export work on Windows. 2015-03-19 16:58:48 +01:00
Frode Petterson
1b28c7b128 Use different vars for URL and file path to avoid having allow_url_fopen = On. 2015-03-18 14:25:55 +01:00
Frode Petterson
6541faf8ba Renamed humanId => slug. 
Moved most of the slug generating code out of the framework and into core.
Remove old export files.
Use old export file until new slug is generated.
Added support for converting more special chars.
 2015-03-13 15:17:19 +01:00
Frode Petterson
c35d7f8334 Added support for generating human readable H5P file names. 2015-03-12 14:38:10 +01:00
Frode Petterson
2b1c894307 Merge branch 'master' into settings 
Conflicts:
	h5p.classes.php
 2015-02-19 15:50:04 +01:00
Svein-Tore Griff With
95a0b000db Remove scary error messages 2015-02-18 19:58:03 +01:00
Svein-Tore Griff With
3d4d72c5a7 Avoid exporting git files 2015-02-18 19:50:23 +01:00
Svein-Tore Griff With
c330282351 Refactor xAPI code 2015-02-16 16:47:04 +01:00
Frode Petterson
84f8fb1cff Merge branch 'master' of github.com:h5p/h5p-php-library 2015-02-12 16:00:41 +01:00
Frode Petterson
1d24d073ed Moved "libraries saving" out of savePackage to make it easier to read and handle. Added UI messages when adding and updating libraries. Minor code optimizations. 2015-02-12 15:56:31 +01:00
Svein-Tore Griff With
8d7ce8f4f1 Merge branch 'master' of https://github.com/h5p/h5p-php-library 2015-02-12 15:46:55 +01:00
Svein-Tore Griff With
c4aedca522 Resolve conflicts 2015-02-11 18:02:25 +01:00
Frode Petterson
42fbb6ab1f Reverse direction of dependency loading. The libraries used last in the parameters are now loaded first, e.g. summary is now loaded before iv! 2015-02-11 14:40:01 +01:00
Frode Petterson
fb77a4d20d bugfix. 2015-02-10 16:40:23 +01:00
Frode Petterson
c764d13b32 Moved display options helpers into core. 2015-02-10 16:29:16 +01:00
Svein-Tore Griff With
a090468657 Merge branch 'text-editor' 2015-02-05 12:01:16 +01:00
Svein-Tore Griff With
fc4f791e6e Bump core api version 2015-02-03 20:15:15 +01:00
Svein-Tore Griff With
efdd7f9f7a Moving x-api and Event handling code to separate files and refining it 2015-02-03 20:11:01 +01:00
Svein-Tore Griff With
f66e6a3ce9 Merge branch 'manually-move-files' 2015-02-03 14:02:54 +01:00