mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
53,144 Commits 36 Branches 519 Tags
Commit Graph

53144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
a769a00157 MDL-32933: Add outcomes to mod_assign and upgrade tool 2012-05-15 12:27:27 +08:00
Eloy Lafuente (stronk7)
71d7bc34a8 weekly release 2.3dev 2012-05-11 12:18:06 +02:00
Eloy Lafuente (stronk7)
28f7bbb0c8 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-05-11 12:10:16 +02:00
Aparup Banerjee
429f2bd096 MDL-32707 Moved fix to make youtube videos use transparent wmode setting into medialib.php 
(this should have gone in with the previous merge. oops)
 2012-05-11 12:57:55 +08:00
Aparup Banerjee
ddd492ad7f Merge branch 'MDL-32707-master-1' of git://git.luns.net.uk/moodle 
fix moved into medialib.php

Conflicts:
	filter/mediaplugin/filter.php
 2012-05-11 12:40:38 +08:00
Frederic Massart
50a8374ef8 MDL-30649 Glossary : Fixed floating element breaking HTML 2012-05-11 10:53:22 +08:00
Eloy Lafuente (stronk7)
6265a43af7 Merge branch 'MDL-32924' of git://github.com/timhunt/moodle 2012-05-11 03:13:00 +02:00
Tim Hunt
667c090728 MDL-32924 improve unit test performance. 2012-05-10 16:22:09 +01:00
Aparup Banerjee
1c7eb3df38 Merge branch 'MDL-31133-master' of git://github.com/ankitagarwal/moodle 2012-05-10 16:54:35 +08:00
Dan Poltawski
702cb399b2 Merge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle 2012-05-10 16:51:12 +08:00
Aparup Banerjee
ad394588db MDL-28134 General : fixed CFG->branch notice during web/cli installation 2012-05-10 15:43:52 +08:00
Dan Poltawski
b84eb3cf20 Merge branch 'MDL-32901' of git://github.com/netspotau/moodle-mod_assign 2012-05-10 14:24:20 +08:00
Damyon Wiese
755bfecae9 MDL-32901: Default feedback plugin for gradebook was using incorrect component name 
This fix allows this setting to be set to the default correctly and prevents it showing on the
front page settings screen for a new install.
 2012-05-10 14:16:18 +08:00
Damyon Wiese
d82bb44d74 MDL-32899: Assignment upgrade tool fails to upgrade some online text submissions 
This is a fix for onlinetext assignments with submissions that have feedback but no
actual submission (data1 and data2 are NULL)
 2012-05-10 14:00:23 +08:00
Dan Poltawski
3388649065 Merge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle 2012-05-10 13:44:03 +08:00
Sam Hemelryk
c56d266a58 MDL-31763 mod_data: Fixed array iteration reference issue 2012-05-10 17:31:42 +12:00
Aparup Banerjee
83c9d449e0 MDL-29624 Media embedding system : phpdoc tweaks. 2012-05-10 10:52:41 +08:00
Aparup Banerjee
e1e3fa217f Merge branch 'MDL-29624-master' of git://github.com/sammarshallou/moodle 2012-05-10 10:52:32 +08:00
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
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
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
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
Dan Poltawski
7cb8bfdb5c MDL-32857 course: single topic summary rewriting pluginfile urls 2012-05-09 10:06:40 +08:00
Christopher Tombleson
4447223b38 MDL-31028: Added pathname hashes to eventdata 
Also fix strict standard warning
 2012-05-09 13:46:20 +12: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
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
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