Commit Graph

56029 Commits

Author SHA1 Message Date
Sam Hemelryk 5ba2e3150f Merge branch 'wip-MDL-31763-master' of git://github.com/abgreeve/moodle 2012-05-10 14:11:24 +12:00
Adrian Greeve 541685ec20 MDL-31763 - data - users can only override their own presets unless they have manage presets permission. 2012-05-10 10:04:30 +08:00
Sam Hemelryk 3c611a360e Merge branch 'MDL-32780-CLEAN' of git://github.com/netspotau/moodle-mod_assign 2012-05-10 14:04:14 +12:00
Sam Hemelryk 137467f5b4 Merge branch 'master_MDL-32507' of git://github.com/danmarsden/moodle 2012-05-10 13:58:12 +12:00
Sam Hemelryk 6bfa88103d Merge branch 'master-MDL-31028_2' of git://github.com/chtombleson/moodle 2012-05-10 13:52:31 +12:00
Andrew Davis 78ab98bc5e MDL-27322 grade: added the ability to not have suspended students included in a grade export 2012-05-10 08:34:51 +07:00
AMOS bot c670c3a3f6 Automatically generated installer lang files 2012-05-10 00:31:40 +00:00
Sam Hemelryk 78ed2ec79f Merge branch 'MDL-32857' of git://github.com/danpoltawski/moodle 2012-05-10 12:15:50 +12:00
Sam Hemelryk 60301632b9 Merge branch 'wip-mdl-27562' of git://github.com/rajeshtaneja/moodle 2012-05-10 12:00:54 +12:00
Sam Hemelryk efd412dda9 MDL-30649 Fixed up whitespace 2012-05-10 11:57:59 +12:00
Sam Hemelryk 320b4deb6a Merge branch 'wip-MDL-30649-master' of git://github.com/phalacee/moodle 2012-05-10 11:56:58 +12:00
Charles Fulton 66969d5004 MDL-32889 lib: escape filename in Content-Disposition header 2012-05-09 16:03:33 -04:00
Eloy Lafuente (stronk7) 5c7b68f25a Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-05-09 19:31:03 +02:00
sam marshall 8b7d95b625 MDL-29624 Media embedding system, part 3: resource module (and URL, lesson)
This change makes the resource module use the new API when it embeds media
files (audio/video/Flash), and removes the resourcelib library functions
which were previously used for this.

The old API is still used for embedding non-media files such as PDFs and
HTML.

The URL and Lesson module both used copy/paste duplicates of a section of
resource module code which called the removed functions. I have changed
these too. As a bonus this significantly reduces the duplication involved.
2012-05-09 18:29:31 +01:00
sam marshall f4e7ba5ea8 MDL-29624 Media embedding system, part 2: preview in file picker
The JavaScript file picker API shows a preview of the media file you have chosen.
This preview facility now uses an iframe, in order not to duplicate the embed code
in JavaScript. The iframe uses the standard embed API.
2012-05-09 18:29:30 +01:00
sam marshall daefd6eb97 MDL-29624 Media embedding system, part 1: new API and filter changes
Includes new API in medialib.php and core_media_renderer in outputrenderers.php.
Enable/disable settings moved from filter to systemwide appearance page.
Filter changed to use new API.

AMOS BEGIN
 MOV [flashanimation,filter_mediaplugin],[flashanimation,core_media]
 MOV [flashanimation_help,filter_mediaplugin],[flashanimation_desc,core_media]
 MOV [flashvideo,filter_mediaplugin],[flashvideo,core_media]
 MOV [flashvideo_help,filter_mediaplugin],[flashvideo_desc,core_media]
 MOV [html5audio,filter_mediaplugin],[html5audio,core_media]
 MOV [html5audio_help,filter_mediaplugin],[html5audio_desc,core_media]
 MOV [html5video,filter_mediaplugin],[html5video,core_media]
 MOV [html5video_help,filter_mediaplugin],[html5video_desc,core_media]
 MOV [mp3audio,filter_mediaplugin],[mp3audio,core_media]
 MOV [mp3audio_help,filter_mediaplugin],[mp3audio_desc,core_media]
 MOV [legacyquicktime,filter_mediaplugin],[legacyquicktime,core_media]
 MOV [legacyquicktime_help,filter_mediaplugin],[legacyquicktime_desc,core_media]
 MOV [legacyreal,filter_mediaplugin],[legacyreal,core_media]
 MOV [legacyreal_help,filter_mediaplugin],[legacyreal_desc,core_media]
 MOV [legacywmp,filter_mediaplugin],[legacywmp,core_media]
 MOV [legacywmp_help,filter_mediaplugin],[legacywmp_desc,core_media]
 MOV [legacyheading,filter_mediaplugin],[legacyheading,core_media]
 MOV [legacyheading_help,filter_mediaplugin],[legacyheading_desc,core_media]
 MOV [sitevimeo,filter_mediaplugin],[sitevimeo,core_media]
 MOV [sitevimeo_help,filter_mediaplugin],[sitevimeo_desc,core_media]
 MOV [siteyoutube,filter_mediaplugin],[siteyoutube,core_media]
 MOV [siteyoutube_help,filter_mediaplugin],[siteyoutube_desc,core_media]
AMOS END
2012-05-09 18:29:29 +01:00
sam marshall ffe4de973b MDL-29624 Media embedding system, part 0: Add get_path() to moodle_url
(It may not seem directly related, but this function is needed for the
media embedding system.
2012-05-09 18:22:12 +01:00
Andrew Robert Nicols 5720019d91 MDL-32873 Separate out course ajax enabled detection into new function 2012-05-09 16:19:01 +01:00
Ruslan Kabalin a7d0e1fdb5 MDL-32742: Remove right div swapping
Swapping div.right is not required, as toolboxes determine section id on each toggle event.
2012-05-09 13:50:03 +01:00
Ruslan Kabalin e7b6e6b9f7 MDL-32875: Fix highlighted section drag-drop issue 2012-05-09 11:25:08 +01:00
Rajesh Taneja 1826cf12de MDL-32866 filemanager: Fixed Page url typo 2012-05-09 17:45:10 +08:00
Kordan bfc241a452 MDL-32869 theme_formal_white: reduced the height or rows in admin filter table 2012-05-09 11:26:15 +02:00
Ankit Agarwal 064f0c8ac3 MDL-31133 calendar: Deleting the deprecated function calendar_get_events() 2012-05-09 14:24:11 +08:00
Rajesh Taneja 04de8f35d1 MDL-27562 formslib: Added unit test for dateselector and datetimeselector 2012-05-09 14:23:46 +08:00
Ankit Agarwal f468956988 MDL-31133 calendar: Replace the deprecated function usage with core_calendar_renderer class 2012-05-09 14:23:27 +08:00
Rossiani Wijaya 272bc0a6ed MDL-24401: fixed string for adding content page 2012-05-09 14:19:49 +08:00
Dan Poltawski 7cb8bfdb5c MDL-32857 course: single topic summary rewriting pluginfile urls 2012-05-09 10:06:40 +08:00
David Mudrak 386b67d100 MDL-31675 File browsing support for the Database module
AMOS BEGIN
 CPY [fields,mod_data],[areacontent,mod_data]
AMOS END
2012-05-09 04:03:34 +02:00
Christopher Tombleson 4447223b38 MDL-31028: Added pathname hashes to eventdata
Also fix strict standard warning
2012-05-09 13:46:20 +12:00
David Mudrak 7978d5dc31 MDL-31675 File browsing support for the Glossary module
AMOS BEGIN
 CPY [attachments,mod_forum],[areaattachment,mod_glossary]
 CPY [definitions,mod_glossary],[areaentry,mod_glossary]
AMOS END
2012-05-09 03:01:46 +02:00
David Mudrak 9a1c075119 MDL-31675 File browsing support for the Forum module
AMOS BEGIN
 CPY [attachments,mod_forum],[areaattachment,mod_forum]
AMOS END
2012-05-09 03:00:16 +02:00
David Mudrak b75ec1040e MDL-32853 Forum: fixed serving files from posts in a visible group
The previous code was copied from the part where emails are being sent.
In that case, we do not want to send copies of posts from other groups.
But in terms of access control, the user has full read access to posts
in any visible group.
2012-05-08 17:04:27 +02:00
Kordan 27912e600b MDL-32321 theme_formal_white: added autolink and adminwarning.maturityinfo.maturity* classes 2012-05-08 10:47:29 +02:00
AMOS bot 4d09f9f2d3 Automatically generated installer lang files 2012-05-08 00:31:40 +00:00
Dan Marsden 37ca1722cd MDL-32507 SCORM fix some strict standard errors 2012-05-08 09:00:46 +12:00
Rajesh Taneja c106a9bff0 MDL-27562 formslib: applydst should be always true, hence option removed from dateselector and datetimeselector form elements 2012-05-07 15:23:45 +08:00
Rajesh Taneja fa70f63522 MDL-27562 formslib: Timezone option is passed to usergetdate for dateselector and datetimeselector form element 2012-05-07 15:23:44 +08:00
Charles Fulton 280b223d84 MDL-26277 grade import: validate file pointer before reading 2012-05-06 20:14:55 -07:00
Damyon Wiese 5d81b754be MDL-32780: Use Moodle functions for building SQL in assignment upgrade tool
Fixed functions:
tool_assignmentupgrade_load_all_upgradable_assignmentids() and
tool_assignmentupgrade_any_upgradable_assignments()
2012-05-07 10:54:24 +08:00
Tim Hunt ad3b37cf87 MDL-31814 question bank: fix possible error with sort columns. 2012-05-04 17:29:04 +01:00
Davo Smith abed5d655f MDL-22504 Fixed issues raised by Sam Hemelryk 2012-05-04 12:12:52 +01:00
Eloy Lafuente (stronk7) e16e2300c5 weekly release 2.3dev 2012-05-04 13:10:40 +02:00
Eloy Lafuente (stronk7) f8e293008d Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-05-04 13:06:42 +02:00
Dan Marsden abf0c875bb MDL-31731 gradeing form: Fix module name 2012-05-04 16:20:58 +08:00
Dan Marsden cfc73aa790 MDL-31731 Advanced Grading: Marking Guide - prevent negative scores when marking users 2012-05-04 16:20:50 +08:00
Eloy Lafuente (stronk7) bea7f96c87 Merge branch 'MDL-32754' of git://github.com/netspotau/moodle-mod_assign 2012-05-04 10:01:07 +02:00
Dan Poltawski 9fdbd69e22 MDL-31731 gradeing form: Fix hardcoded module name 2012-05-04 14:02:39 +08:00
Andrew Robert Nicols 0c053c5368 MDL-32508 Add error when trying to access an unknown course section 2012-05-04 13:41:59 +08:00
Sam Hemelryk 3df72f8ce7 MDL-32508 Trivial whitespace cleanup 2012-05-04 17:13:36 +12:00
Damyon Wiese b843e2b747 MDL-32754: Add missing string for assign:addinstance capability
AMOS BEGIN
    CPY [assignment:addinstance,mod_assignment],[assign:addinstance,mod_assign]
AMOS END
2012-05-04 12:05:58 +08:00