Commit graph

12183 commits

Author SHA1 Message Date
Damyon Wiese
bf78ebd650 MDL-32932: Add quickgrading support to mod_assign 2012-05-15 13:33:59 +08:00
Damyon Wiese
a769a00157 MDL-32933: Add outcomes to mod_assign and upgrade tool 2012-05-15 12:27:27 +08:00
Aparup Banerjee
c459e91789 Merge branch 'MDL-25695-master' of https://github.com/mackensen/moodle 2012-05-15 11:03:07 +08:00
Dan Marsden
0ae299769c MDL-32794 SCORM prevent items in tree that have no navigation from triggering a navigation change. 2012-05-15 09:36:35 +12:00
Dan Poltawski
bf9b08dd5e Merge branch 'wip-mdl-31941' of git://github.com/rajeshtaneja/moodle 2012-05-14 14:26:29 +08:00
Dan Poltawski
ec3f19bddb Merge branch 'MDL-31951' of git://github.com/rwijaya/moodle 2012-05-14 14:23:41 +08:00
Dan Poltawski
a225149c9a Merge branch 'MDL-24401' of git://github.com/rwijaya/moodle 2012-05-14 14:12:30 +08:00
Dan Poltawski
b728070f5d Merge branch 'MDL-32902' of git://github.com/netspotau/moodle-mod_assign 2012-05-14 14:08:27 +08:00
Dan Poltawski
77acdb26f2 Merge branch 'w20_MDL-32915_m23_chatdiv' of git://github.com/skodak/moodle 2012-05-14 14:06:37 +08:00
Dan Poltawski
3359a6fe07 Merge branch 'w20_MDL-32926_m23_phpunitevil' of git://github.com/skodak/moodle 2012-05-14 13:36:11 +08:00
Damyon Wiese
3b6bbd767b MDL-32902: Remove 70% width stylesheet rule for tables on the mod_assign submission screen. 2012-05-14 11:39:42 +08:00
Damyon Wiese
12945803b8 MDL-32904: Fix incorrect call to update_record (not causing an error) 2012-05-14 11:34:08 +08:00
Damyon Wiese
b11808c7d6 MDL-32909: assign_user_get_grades does not need to lookup context and was doing it wrong
cmidnumber is not the same as coursemodule->id
2012-05-14 11:29:43 +08:00
Damyon Wiese
c45261df97 MDL-32933: Add outcomes to mod_assign and upgrade tool 2012-05-14 11:23:40 +08:00
Sam Hemelryk
86558590a4 Merge branch 'MDL-31944' of git://github.com/ankitagarwal/moodle 2012-05-14 14:52:10 +12:00
Dan Poltawski
e87a7c65f1 Merge branch 'MDL-32714-rubric' of git://github.com/mudrd8mz/moodle 2012-05-14 10:41:46 +08:00
Dan Poltawski
41ea0d3cc2 Merge branch 'MDL-31902-master' of git://github.com/ankitagarwal/moodle 2012-05-14 10:28:05 +08:00
Adrian Greeve
0ba303e85f MDL-32126 - data - Fix of an error when sorting by other criteria. 2012-05-14 07:27:01 +08:00
Petr Skoda
7edfd54fcf MDL-32915 fix bogus open div in basic chat ui 2012-05-13 10:24:43 +02:00
Petr Skoda
d59ef9c5ab MDL-32926 exorcise setUser(2) evil from phpunit 2012-05-12 21:42:07 +02:00
David Mudrak
d20bffa2fd MDL-32714 workshop: fixed SQL to load assessment form fields
Obvious problems emerged once there were some records in the
workshopform_rubric table with no workshopform_rubric_levels. As l.id
(empty in that case) was used as the key of the returned array, they all
were collapsed into a single one.
2012-05-12 10:27:34 +02:00
Tim Hunt
62a3bfb37e MDL-32633 quiz editing: recreate grade item when max changed from 0 2012-05-11 20:23:37 +01:00
Dan Poltawski
93f11331e4 MDL-31458 forum: email subjects containing ampersand are sent as & 2012-05-11 15:25:26 +08:00
Frederic Massart
50a8374ef8 MDL-30649 Glossary : Fixed floating element breaking HTML 2012-05-11 10:53:22 +08:00
Ankit Agarwal
3afe75a79c MDL-31902 general: Removing deprecated functions 2012-05-11 10:30:40 +08:00
Rajesh Taneja
5d8215ccf4 MDL-31941 chat: removed chat_get_participants, deprecated function 2012-05-11 09:21:04 +08:00
Chris Scribner
bc2a92aeda MDL-32921: Fixing an issue with adding LTI tool providers from the admin UI 2012-05-10 12:07:13 -04:00
Chris Scribner
66c1441213 MDL-31657: Remove some unused LTI localization strings 2012-05-10 09:43:23 -04:00
Andrew Robert Nicols
96c8f933fd MDL-32641 Ensure that the form change protector does not kick in when adding/editing feedback questions 2012-05-10 12:15:24 +01:00
Ankit Agarwal
99c4dcd3e2 MDL-31944 feedback: remove deprecated function feedback_get_participants() 2012-05-10 15:16:47 +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
Sam Hemelryk
c56d266a58 MDL-31763 mod_data: Fixed array iteration reference issue 2012-05-10 17:31:42 +12:00
Aparup Banerjee
e1e3fa217f Merge branch 'MDL-29624-master' of git://github.com/sammarshallou/moodle 2012-05-10 10:52:32 +08:00
Rossiani Wijaya
6176184bcc MDL-31951 Lesson module: Removed deprecated lesson_get_participants() function 2012-05-10 10:51:05 +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
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
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
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
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
Rossiani Wijaya
272bc0a6ed MDL-24401: fixed string for adding content page 2012-05-09 14:19:49 +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