Permalink
Browse files

Merge branch 'MOODLE_24_STABLE' into install_24_STABLE

  • Loading branch information...
2 parents b0ec2d8 + eee6167 commit fbc50fb6996c31c813003428e6bd0909ca3aa075 AMOS bot committed Mar 7, 2014
Showing with 1,355 additions and 91 deletions.
  1. +1 −0 enrol/imsenterprise/importnow.php
  2. +3 −1 enrol/imsenterprise/settings.php
  3. +55 −0 lib/flowplayer/README.txt
  4. +1 −0 lib/flowplayer/README_audio.txt
  5. +1,015 −0 lib/flowplayer/flowplayer-3.2.13.js
  6. +22 −0 lib/flowplayer/flowplayer-3.2.13.min.js
  7. BIN lib/flowplayer/flowplayer-3.2.18.swf
  8. BIN lib/flowplayer/flowplayer.audio-3.2.10.swf
  9. BIN lib/flowplayer/flowplayer.audio-3.2.11.swf
  10. BIN lib/flowplayer/flowplayer.controls-3.2.16.swf
  11. +6 −6 lib/javascript-static.js
  12. +1 −1 lib/thirdpartylibs.xml
  13. +5 −0 mod/chat/chat_ajax.php
  14. +2 −2 mod/feedback/complete.php
  15. +2 −2 mod/feedback/complete_guest.php
  16. +10 −1 mod/forum/renderer.php
  17. +1 −1 mod/quiz/editlib.php
  18. +6 −1 mod/quiz/override_form.php
  19. +12 −0 mod/quiz/tests/editlib_test.php
  20. +3 −0 mod/wiki/admin.php
  21. +4 −0 mod/wiki/comments.php
  22. +1 −0 mod/wiki/create_form.php
  23. +4 −0 mod/wiki/diff.php
  24. +4 −1 mod/wiki/edit.php
  25. +4 −0 mod/wiki/editcomments.php
  26. +7 −7 mod/wiki/files.php
  27. +4 −0 mod/wiki/filesedit.php
  28. +5 −2 mod/wiki/history.php
  29. +11 −34 mod/wiki/lib.php
  30. +19 −5 mod/wiki/locallib.php
  31. +3 −2 mod/wiki/lock.php
  32. +4 −2 mod/wiki/map.php
  33. +5 −4 mod/wiki/overridelocks.php
  34. +3 −2 mod/wiki/prettyview.php
  35. +4 −0 mod/wiki/restoreversion.php
  36. +5 −1 mod/wiki/search.php
  37. +4 −2 mod/wiki/view.php
  38. +4 −0 mod/wiki/viewversion.php
  39. +57 −0 repository/alfresco/db/upgrade.php
  40. +53 −0 repository/alfresco/db/upgradelib.php
  41. +3 −0 repository/alfresco/lang/en/repository_alfresco.php
  42. +1 −13 repository/alfresco/lib.php
  43. +1 −1 repository/alfresco/version.php
@@ -2,6 +2,7 @@
require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
require_login(0, false);
require_capability('moodle/site:config', context_system::instance());
+require_sesskey();
$site = get_site();
@@ -83,6 +83,8 @@
$settings->add(new admin_setting_configcheckbox('enrol_imsenterprise/imscapitafix', get_string('usecapitafix', 'enrol_imsenterprise'), get_string('usecapitafix_desc', 'enrol_imsenterprise'), 0));
- $importnowstring = get_string('aftersaving...', 'enrol_imsenterprise').' <a href="../enrol/imsenterprise/importnow.php">'.get_string('doitnow', 'enrol_imsenterprise').'</a>';
+ $importurl = new moodle_url('/enrol/imsenterprise/importnow.php', array('sesskey' => sesskey()));
+ $importnowstring = get_string('aftersaving...', 'enrol_imsenterprise').' '.
+ html_writer::link($importurl, get_string('doitnow', 'enrol_imsenterprise'));
$settings->add(new admin_setting_heading('enrol_imsenterprise_doitnowmessage', '', $importnowstring));
}
View
@@ -1,8 +1,63 @@
Version history:
+3.2.17
+------
+- #75 set the child display list different when a gradient is set.
+- The clip property 'bufferLength' now accepts decimal values, for example bufferLength: 0.2
+- #121 XSS fix: Only load plugins and external config from the same domain as the player swf is loaded from
+- Made it possible to tab out of the player and into the HTML page using the keyboard alone.
+- Change links in the context menu and in the logos to point to http://flash.flowplayer.org
+- Pausing a live stream now leaves the video frame visible #81
+- Audio plugin is not loaded nor used when the the provider is set excplicitly in the clip to a non-audio value, for
+ example to 'http'
+- Allow playing another instream clip while already playing one. Issue #131
+- Fixed memory leaks related to repeatedly starting playback with the play() API method. #163
+
+3.2.16
+------
+- new clip event onMetadataChange, dispatched for example when switching bitrate
+
+Fixes:
+
+- Shows logo in accelerated mode #20
+- mid-rolls freeze if multiple providers are used #42
+- onFire fired twice on replay #52
+- rtmp + hw accel + instream clips lose video, or aspect ratio #44
+- URL name parts containing semi-colons (;) should pass validation through linkUrl usage #53
+- cuepoints fired multiple times with the bitrateselect plugin #50
+- fix for dispatching onBegin in certain situations
+- if onStart has been dispatched already prevent dispatching many onBegin events
+
+
+3.2.15
+------
+- #15 fixes for #627, handle the display init on startup.
+- #615 dispatch begin if in paused mode too early.
+- #629 if start has been dispatched already prevent dispatching many begin events.
+- #20 for the free player swap the logo with the stage video mask to display underneath not on top.
+- #42 pass in stream clips through and close the stream before returning to the parent clip.
+- #52 when replaying flag start has dispatched on the current clip.
+- #44 fixes for #627 check if the stagevideo dimensions and positioning has changed to update the stage video mask with.
+- unbinding and binding stage video events caused issues with instream playlists therefore has to be kept binded.
+- unbinded stage video events during seeking to prevent the mask repositioning.
+- #53 update url filter to accomodate for pretty urls with semi colons.
+- #50 if we have metadata already set it is being updated during seeks and switching, dispatch metadata change events instead.
+
+3.2.14
+------
+- #614 when the clip ends if the next clip in the provider has a different provider close the provider stream.
+- #627 only detach / attach the display on start events which causes issues in buffering events after a seek in stagevideo.
+- #627 re-enable stagevideo state change listeners if stagevideo is available or detach the fullscreen events on first call.
+- #9 when replaying from stopping, connection does not receive callbacks anymore.
+
+
+
+
3.2.13
------
- Updated to automatically load the latest controls and audio plugins
+- #612 add some logging for the stagevideo render state to determine what mode the hardware acceleration is in for various systems.
+- #628 opera browsers do not return filesize correctly for latest flash players so require to use load completion instead which may help with gzipped files also.
3.2.12
------
@@ -7,6 +7,7 @@ Version history:
- #582 fixes for metadata events dispatching in playlists and when replaying same audio item, cleanup duration updating once download has completed,
fixes for clearing the previous cover image display.
- #611 close the channel and sound on stream not found errors.
+- #614 fixes for auto buffering issues where a sound channel may not be active yet.
3.2.9
-----
Oops, something went wrong.

0 comments on commit fbc50fb

Please sign in to comment.