Commit graph

476 commits

Author SHA1 Message Date
Frode Petterson
cca335b731 Merge branch 'master' of ssh://stash.amendor.com:7999/h5p/h5p-core-php 2013-12-20 13:34:18 +01:00
Frode Petterson
7a3888a367 Prevent copy of trees that does not exist. 2013-12-20 13:31:08 +01:00
Frank Ronny Larsen
925e6c73f9 Merge branch 'master' of ssh://stash.amendor.com:7999/h5p/h5p-core-php 2013-12-18 11:33:17 +01:00
Frank Ronny Larsen
ec10ce034e BUGFIX: Replace str_replace with preg_quote 2013-12-18 11:32:57 +01:00
Frank Ronny Larsen
e893086931 BUGFIX: Unknown regexp modifier 'k' removed 2013-12-18 11:32:18 +01:00
Frode Petterson
a41a8f82f9 HFJ-93: Removed check that prevents iframe from getting bigger than window. 2013-12-13 14:26:36 +01:00
Frank Ronny Larsen
691a1c8be5 Merge branch 'master' of ssh://stash.amendor.com:7999/h5p/h5p-core-php 2013-12-05 12:17:25 +01:00
Frank Ronny Larsen
b7f14a4c44 HFJ-59: Renamed coreVersion to coreApi.
Removes annoying double naming (coreVersion.majorVersion become coreApi.majorVersion)
Explicitly states that the versioning is one the API.
Explicitly states that this is the core version. (apiVersion could mean API of the library)
2013-12-05 12:15:17 +01:00
Frode Petterson
bb496b4d29 HPN-36: Fixed semi-fullscreen exit with key. 2013-12-04 15:21:34 +01:00
Frode Petterson
0884bf369a Added more attrs for videos. 2013-12-03 11:36:31 +01:00
Frode Petterson
57b1c88435 Fixed FontAwesome to avoid collisions and preserve backwards compatibility. 2013-12-02 14:19:15 +01:00
Frank Ronny Larsen
6bb9c9a9b6 HFJ-59: Added coreVersion check for libraries, and explicitly set H5PCore version to 1.0 2013-11-27 10:09:57 +01:00
Frank Ronny Larsen
c87b233482 Polished function comments to keep a constant style, added sanity check in shuffleArray 2013-11-26 14:56:31 +01:00
Frank Ronny Larsen
47dcb931e9 Fix regexp slashes and FontAwesome dependency 2013-11-26 14:40:38 +01:00
Svein-Tore Griff With
563a5f2674 Use / instead of pipe as regexp fence in order to make pipe work inside the regexp. Needs testing 2013-11-25 23:44:45 +01:00
Svein-Tore Griff With
69ad6c9370 Add button stylings (By magnuma) 2013-11-23 01:31:12 +01:00
Svein-Tore Griff With
e4c268612f Documentation updates 2013-11-18 18:03:01 +01:00
Svein-Tore Griff With
7aef062810 Clean up deletion and make sure export is deleted when node is deleted 2013-11-18 17:57:32 +01:00
Svein-Tore Griff With
bdb508c877 Make export work 2013-11-18 17:45:31 +01:00
Svein-Tore Griff With
f32ae3a4d4 We save the file instead of returning it for performance reasons 2013-11-17 18:26:39 +01:00
Svein-Tore Griff With
884664e637 Merge branch 'master' of ssh://stash.amendor.com:7999/h5p/h5p-core-php 2013-11-17 18:04:55 +01:00
Svein-Tore Griff With
7695850799 Make sure content.json and editor libraries are included in export 2013-11-17 18:04:39 +01:00
Frode Petterson
f60bc3939b Merge branch 'master' of ssh://stash.amendor.com:7999/h5p/h5p-core-php 2013-11-15 16:29:35 +01:00
Frode Petterson
78968d1da7 Added gitignore. 2013-11-15 16:29:20 +01:00
Svein-Tore Griff With
cab8e258be Export improvements 2013-11-15 01:13:00 +01:00
Svein-Tore Griff With
9dd710a8fb Renaming functions 2013-11-14 23:42:10 +01:00
Svein-Tore Griff With
f98cce49a6 Make sure we only use camel case in the H5P php library 2013-11-14 14:10:55 +01:00
Svein-Tore Griff With
99ee7a47ae Documentation improvements 2013-11-14 14:05:34 +01:00
Svein-Tore Griff With
5ca6a5f39a Issue #2120227 by gafolini, Ellinokon and falcon: Add export feature to H5P 2013-11-14 13:48:07 +01:00
Frank Ronny Larsen
1d46204ac0 Merge branch 'master' of ssh://stash.amendor.com:7999/h5p/h5p-core-php
Conflicts:
	h5p.classes.php
2013-11-13 15:38:32 +01:00
Frank Ronny Larsen
d9532a44ed Escape '|' characters in regexp 2013-11-13 15:36:00 +01:00
Svein-Tore Griff With
2454bcfa2a BUGFIX: The strikethrough was removed when an H5P was saved 2013-11-08 18:46:47 +01:00
Svein-Tore Griff With
1a6ef6f0fa Why are we using | instead of / around the regex? Change to / so that we may use | inside the regex 2013-11-08 18:24:42 +01:00
Svein-Tore Griff With
cd5fd2d3d9 Resolve conflicts 2013-11-08 18:22:48 +01:00
Svein-Tore Griff With
0d97f6952c Add iframe support and more license types 2013-11-08 18:16:41 +01:00
Frode Petterson
44b5d89970 Fixed iframe solution in IE8. 2013-10-28 14:08:59 +01:00
Frode Petterson
2720ec5f16 Added iframe support (by: Frank Ronny Larsen). 2013-10-25 15:10:50 +02:00
Svein-Tore Griff With
12523d810c Fix styling issues for sites that has uncleard floating blocks 2013-10-21 13:23:36 +02:00
Svein-Tore Griff With
f939e00f44 Fix styling issues for sites that has uncleard floating blocks 2013-10-21 13:22:13 +02:00
Frode Petterson
d633697065 Added users stats function: setFinished. 2013-09-18 15:52:06 +02:00
Frode Petterson
4d319b3424 Merged in changed from drupal git. 2013-09-18 10:30:48 +02:00
Svein-Tore Griff With
ece7b5bcde Add support for GPL license in libraries 2013-09-17 15:57:13 +02:00
Svein-Tore Griff With
1549075a57 From ICC, allow extra params 2013-09-17 15:53:37 +02:00
Svein-Tore Griff With
7d989c648d Merge branch 'master' of ssh://stash.amendor.com:7999/h_core/h5p-core-php 2013-09-10 22:43:37 +02:00
Svein-Tore Griff With
6f46c5a5fa Move H5P content to top of body 2013-09-10 22:43:31 +02:00
Frank Ronny Larsen
5014df84cd BUGFIX: Previous fix lost events in H5P. 2013-08-13 15:00:11 +02:00
Frank Ronny Larsen
89caf91f7d BUGFIX: Make h5p-semi-fullscreen appear above everything. 2013-08-13 14:17:23 +02:00
Frank Ronny Larsen
676edc5eec BUGFIX: The saveLibraryData method is assumed to have a argument, include in Interface 2013-08-13 14:16:56 +02:00
Svein-Tore Griff With
2187777720 Add development mode 2013-08-12 08:11:11 +02:00
Svein-Tore Griff With
c53ce16ef0 Adding doc folder 2013-08-02 10:21:26 +02:00