moodle.git
9 years agoMDL-32988 Lib: Course delete does availability/completion in wrong order
sam marshall [Tue, 15 May 2012 10:38:03 +0000 (11:38 +0100)]
MDL-32988 Lib: Course delete does availability/completion in wrong order

When deleting modules that failed to delete using normal method, it deleted
the course-modules table first and then the availability/completion,
which depend on the entries in course-modules table. This commit switches
the order.

9 years agoweekly release 2.3dev
Eloy Lafuente (stronk7) [Fri, 11 May 2012 10:18:06 +0000 (12:18 +0200)]
weekly release 2.3dev

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Fri, 11 May 2012 10:10:16 +0000 (12:10 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMDL-32707 Moved fix to make youtube videos use transparent wmode setting into mediali...
Aparup Banerjee [Fri, 11 May 2012 04:57:55 +0000 (12:57 +0800)]
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)

9 years agoMerge branch 'MDL-32707-master-1' of git://git.luns.net.uk/moodle
Aparup Banerjee [Fri, 11 May 2012 04:40:38 +0000 (12:40 +0800)]
Merge branch 'MDL-32707-master-1' of git://git.luns.net.uk/moodle

fix moved into medialib.php

Conflicts:
filter/mediaplugin/filter.php

9 years agoMDL-30649 Glossary : Fixed floating element breaking HTML
Frederic Massart [Thu, 10 May 2012 07:09:05 +0000 (15:09 +0800)]
MDL-30649 Glossary : Fixed floating element breaking HTML

9 years agoMerge branch 'MDL-32924' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Fri, 11 May 2012 01:13:00 +0000 (03:13 +0200)]
Merge branch 'MDL-32924' of git://github.com/timhunt/moodle

9 years agoMDL-32924 improve unit test performance.
Tim Hunt [Thu, 10 May 2012 15:22:09 +0000 (16:22 +0100)]
MDL-32924 improve unit test performance.

9 years agoMerge branch 'MDL-31133-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Thu, 10 May 2012 08:54:35 +0000 (16:54 +0800)]
Merge branch 'MDL-31133-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle
Dan Poltawski [Thu, 10 May 2012 08:51:12 +0000 (16:51 +0800)]
Merge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle

9 years agoMDL-28134 General : fixed CFG->branch notice during web/cli installation
Aparup Banerjee [Thu, 10 May 2012 07:43:52 +0000 (15:43 +0800)]
MDL-28134 General : fixed CFG->branch notice during web/cli installation

9 years agoMerge branch 'MDL-32901' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Thu, 10 May 2012 06:24:20 +0000 (14:24 +0800)]
Merge branch 'MDL-32901' of git://github.com/netspotau/moodle-mod_assign

9 years agoMDL-32901: Default feedback plugin for gradebook was using incorrect component name
Damyon Wiese [Thu, 10 May 2012 06:16:18 +0000 (14:16 +0800)]
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.

9 years agoMDL-32899: Assignment upgrade tool fails to upgrade some online text submissions
Damyon Wiese [Thu, 10 May 2012 04:07:49 +0000 (12:07 +0800)]
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)

9 years agoMerge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle
Dan Poltawski [Thu, 10 May 2012 05:44:03 +0000 (13:44 +0800)]
Merge branch 'MDL-28134_branch' of git://github.com/nebgor/moodle

9 years agoMDL-31763 mod_data: Fixed array iteration reference issue
Sam Hemelryk [Thu, 10 May 2012 05:31:24 +0000 (17:31 +1200)]
MDL-31763 mod_data: Fixed array iteration reference issue

9 years agoMDL-29624 Media embedding system : phpdoc tweaks.
Aparup Banerjee [Thu, 10 May 2012 02:51:15 +0000 (10:51 +0800)]
MDL-29624 Media embedding system : phpdoc tweaks.

9 years agoMerge branch 'MDL-29624-master' of git://github.com/sammarshallou/moodle
Aparup Banerjee [Thu, 10 May 2012 02:52:32 +0000 (10:52 +0800)]
Merge branch 'MDL-29624-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'wip-MDL-31763-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Thu, 10 May 2012 02:11:24 +0000 (14:11 +1200)]
Merge branch 'wip-MDL-31763-master' of git://github.com/abgreeve/moodle

9 years agoMDL-31763 - data - users can only override their own presets unless they have manage...
Adrian Greeve [Wed, 2 May 2012 01:03:22 +0000 (09:03 +0800)]
MDL-31763 - data - users can only override their own presets unless they have manage presets permission.

9 years agoMerge branch 'MDL-32780-CLEAN' of git://github.com/netspotau/moodle-mod_assign
Sam Hemelryk [Thu, 10 May 2012 02:04:14 +0000 (14:04 +1200)]
Merge branch 'MDL-32780-CLEAN' of git://github.com/netspotau/moodle-mod_assign

9 years agoMerge branch 'master_MDL-32507' of git://github.com/danmarsden/moodle
Sam Hemelryk [Thu, 10 May 2012 01:58:12 +0000 (13:58 +1200)]
Merge branch 'master_MDL-32507' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'master-MDL-31028_2' of git://github.com/chtombleson/moodle
Sam Hemelryk [Thu, 10 May 2012 01:52:31 +0000 (13:52 +1200)]
Merge branch 'master-MDL-31028_2' of git://github.com/chtombleson/moodle

9 years agoAutomatically generated installer lang files
AMOS bot [Thu, 10 May 2012 00:31:40 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMerge branch 'MDL-32857' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Thu, 10 May 2012 00:15:50 +0000 (12:15 +1200)]
Merge branch 'MDL-32857' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'wip-mdl-27562' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Thu, 10 May 2012 00:00:54 +0000 (12:00 +1200)]
Merge branch 'wip-mdl-27562' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-30649 Fixed up whitespace
Sam Hemelryk [Wed, 9 May 2012 23:57:59 +0000 (11:57 +1200)]
MDL-30649 Fixed up whitespace

9 years agoMerge branch 'wip-MDL-30649-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Wed, 9 May 2012 23:56:58 +0000 (11:56 +1200)]
Merge branch 'wip-MDL-30649-master' of git://github.com/phalacee/moodle

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Wed, 9 May 2012 17:31:03 +0000 (19:31 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMDL-29624 Media embedding system, part 3: resource module (and URL, lesson)
sam marshall [Tue, 13 Dec 2011 17:21:06 +0000 (17:21 +0000)]
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.

9 years agoMDL-29624 Media embedding system, part 2: preview in file picker
sam marshall [Tue, 13 Dec 2011 17:19:03 +0000 (17:19 +0000)]
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.

9 years agoMDL-29624 Media embedding system, part 1: new API and filter changes
sam marshall [Tue, 13 Dec 2011 17:08:34 +0000 (17:08 +0000)]
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

9 years agoMDL-29624 Media embedding system, part 0: Add get_path() to moodle_url
sam marshall [Thu, 19 Apr 2012 15:59:56 +0000 (16:59 +0100)]
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.

9 years agoMDL-31133 calendar: Deleting the deprecated function calendar_get_events()
Ankit Agarwal [Wed, 9 May 2012 06:23:13 +0000 (14:23 +0800)]
MDL-31133 calendar: Deleting the deprecated function calendar_get_events()

9 years agoMDL-27562 formslib: Added unit test for dateselector and datetimeselector
Rajesh Taneja [Mon, 7 May 2012 02:11:12 +0000 (10:11 +0800)]
MDL-27562 formslib: Added unit test for dateselector and datetimeselector

9 years agoMDL-31133 calendar: Replace the deprecated function usage with core_calendar_renderer...
Ankit Agarwal [Wed, 9 May 2012 03:37:22 +0000 (11:37 +0800)]
MDL-31133 calendar: Replace the deprecated function usage with core_calendar_renderer class

9 years agoMDL-32857 course: single topic summary rewriting pluginfile urls
Dan Poltawski [Wed, 9 May 2012 02:06:40 +0000 (10:06 +0800)]
MDL-32857 course: single topic summary rewriting pluginfile urls

9 years agoMDL-31028: Added pathname hashes to eventdata
Christopher Tombleson [Wed, 9 May 2012 01:46:20 +0000 (13:46 +1200)]
MDL-31028: Added pathname hashes to eventdata

Also fix strict standard warning

9 years agoAutomatically generated installer lang files
AMOS bot [Tue, 8 May 2012 00:31:40 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMDL-32507 SCORM fix some strict standard errors
Dan Marsden [Mon, 7 May 2012 20:59:54 +0000 (08:59 +1200)]
MDL-32507 SCORM fix some strict standard errors

9 years agoMDL-27562 formslib: applydst should be always true, hence option removed from datesel...
Rajesh Taneja [Fri, 4 May 2012 05:46:08 +0000 (13:46 +0800)]
MDL-27562 formslib: applydst should be always true, hence option removed from dateselector and datetimeselector form elements

9 years agoMDL-27562 formslib: Timezone option is passed to usergetdate for dateselector and...
Rajesh Taneja [Fri, 4 May 2012 05:42:35 +0000 (13:42 +0800)]
MDL-27562 formslib: Timezone option is passed to usergetdate for dateselector and datetimeselector form element

9 years agoMDL-32780: Use Moodle functions for building SQL in assignment upgrade tool
Damyon Wiese [Fri, 4 May 2012 07:35:51 +0000 (15:35 +0800)]
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()

9 years agoweekly release 2.3dev
Eloy Lafuente (stronk7) [Fri, 4 May 2012 11:10:40 +0000 (13:10 +0200)]
weekly release 2.3dev

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Fri, 4 May 2012 11:06:42 +0000 (13:06 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMDL-31731 gradeing form: Fix module name
Dan Marsden [Fri, 4 May 2012 08:05:29 +0000 (20:05 +1200)]
MDL-31731 gradeing form: Fix module name

9 years agoMDL-31731 Advanced Grading: Marking Guide - prevent negative scores when marking...
Dan Marsden [Fri, 4 May 2012 07:26:16 +0000 (19:26 +1200)]
MDL-31731 Advanced Grading: Marking Guide - prevent negative scores when marking users

9 years agoMerge branch 'MDL-32754' of git://github.com/netspotau/moodle-mod_assign
Eloy Lafuente (stronk7) [Fri, 4 May 2012 08:01:07 +0000 (10:01 +0200)]
Merge branch 'MDL-32754' of git://github.com/netspotau/moodle-mod_assign

9 years agoMDL-31731 gradeing form: Fix hardcoded module name
Dan Poltawski [Fri, 4 May 2012 06:02:39 +0000 (14:02 +0800)]
MDL-31731 gradeing form: Fix hardcoded module name

9 years agoMDL-32508 Add error when trying to access an unknown course section
Andrew Robert Nicols [Thu, 3 May 2012 14:02:10 +0000 (15:02 +0100)]
MDL-32508 Add error when trying to access an unknown course section

9 years agoMDL-32508 Trivial whitespace cleanup
Sam Hemelryk [Fri, 4 May 2012 05:13:36 +0000 (17:13 +1200)]
MDL-32508 Trivial whitespace cleanup

9 years agoMDL-32754: Add missing string for assign:addinstance capability
Damyon Wiese [Fri, 4 May 2012 04:05:58 +0000 (12:05 +0800)]
MDL-32754: Add missing string for assign:addinstance capability

AMOS BEGIN
    CPY [assignment:addinstance,mod_assignment],[assign:addinstance,mod_assign]
AMOS END

9 years agoMDL-32508 backup: coursedisplay now included in backup
Dan Poltawski [Fri, 4 May 2012 03:00:53 +0000 (11:00 +0800)]
MDL-32508 backup: coursedisplay now included in backup

9 years agoMDL-32508 Close the topic/week ul before showing the add section link
Andrew Robert Nicols [Thu, 3 May 2012 11:38:31 +0000 (12:38 +0100)]
MDL-32508 Close the topic/week ul before showing the add section link

9 years agoMDL-32508 course formats: make renderer methods protected
Dan Poltawski [Thu, 3 May 2012 11:09:02 +0000 (19:09 +0800)]
MDL-32508 course formats: make renderer methods protected

The renderer isn't a public API yet, its just reducing code duplication
and tidying things up. So not making the methods public for other plugins
to abuse. We hope to solve this properly in 2.4

9 years agoMDL-32508 course_formats: change format_renderer_base to format_section_renderer_base
Dan Poltawski [Thu, 3 May 2012 11:04:46 +0000 (19:04 +0800)]
MDL-32508 course_formats: change format_renderer_base to format_section_renderer_base

Make it clear that this isn't a golden supported API

9 years agoMDL-32505 course_formats: introduce upgrade.txt
Dan Poltawski [Thu, 3 May 2012 11:00:40 +0000 (19:00 +0800)]
MDL-32505 course_formats: introduce upgrade.txt

9 years agoMDL-32508 course_format: fix up some minor style issues
Dan Poltawski [Thu, 3 May 2012 10:43:26 +0000 (18:43 +0800)]
MDL-32508 course_format: fix up some minor style issues

Noticed whilst reviewing again

9 years agoMDL-32508 Remove debuggign warning about callback_format_get_section_url
Dan Poltawski [Thu, 3 May 2012 10:30:18 +0000 (18:30 +0800)]
MDL-32508 Remove debuggign warning about callback_format_get_section_url

It is not the time to deprecate this callback as we may be doing
major changes in 2.4 so removing the warning about it.

9 years agoMDL-32505 lib/tests: fix unit test using removed table
Dan Poltawski [Thu, 3 May 2012 10:13:46 +0000 (18:13 +0800)]
MDL-32505 lib/tests: fix unit test using removed table

9 years agoMDL-32505/MDL-32508 course: fix section_links block
Dan Poltawski [Mon, 30 Apr 2012 07:05:02 +0000 (15:05 +0800)]
MDL-32505/MDL-32508 course: fix section_links block

Now course_display has gone

9 years agoMDL-32508 navigation: show empty sections
Dan Poltawski [Mon, 30 Apr 2012 03:46:15 +0000 (11:46 +0800)]
MDL-32508 navigation: show empty sections

9 years agoMDL-32508 course/format: Display general section above title
Dan Poltawski [Mon, 30 Apr 2012 04:16:55 +0000 (12:16 +0800)]
MDL-32508 course/format: Display general section above title

9 years agoMDL-32508 course/format: Hide 'format outline' titles
Dan Poltawski [Mon, 30 Apr 2012 04:15:11 +0000 (12:15 +0800)]
MDL-32508 course/format: Hide 'format outline' titles

It is now hidden for for accessibility only

9 years agoMDL-32508 course/format: Only display topic number in topic format
Dan Poltawski [Mon, 30 Apr 2012 04:14:15 +0000 (12:14 +0800)]
MDL-32508 course/format: Only display topic number in topic format

9 years agoMDL-32508 course: turn editting on/off stays on current page
Dan Poltawski [Mon, 30 Apr 2012 03:23:37 +0000 (11:23 +0800)]
MDL-32508 course: turn editting on/off stays on current page

Rather than always going to the index page, we can edit on section page

9 years agoMDL-32508 course: Add basic 'add a section' button at the bottom of the course page
Dan Poltawski [Mon, 21 Nov 2011 15:11:35 +0000 (15:11 +0000)]
MDL-32508 course: Add basic 'add a section' button at the bottom of the course page

With thanks to LUNS who provided this code from when I did it working
there.

9 years agoMDL-32508 course/formats: Respect single page course display mode
Dan Poltawski [Fri, 27 Apr 2012 05:11:35 +0000 (13:11 +0800)]
MDL-32508 course/formats: Respect single page course display mode

Topics and weeks have been converted to use a shared renderer to output
their content.

Note, I started with good intentions but this renderer has mixed
paradgims due to fast and cheap winning out on the trinity.

AMOS BEGIN
   MOV [currenttopic,access],[currentsection,format_topics]
   MOV [currentweek,access],[currentsection,format_weeks]
AMOS END

9 years agoMDL-32508 course: make_editting_buttons now takes optionally returns to section
Dan Poltawski [Sat, 28 Apr 2012 05:56:35 +0000 (13:56 +0800)]
MDL-32508 course: make_editting_buttons now takes optionally returns to section

9 years agoMDL-32508 course/mod.php: Use $sectionreturn param
Dan Poltawski [Sat, 28 Apr 2012 06:04:39 +0000 (14:04 +0800)]
MDL-32508 course/mod.php: Use  $sectionreturn param

This param is now used so that users are returned to the
page they started at

9 years agoMDL-32508 course/editsection: add a sectionreturn param
Dan Poltawski [Sat, 28 Apr 2012 05:52:49 +0000 (13:52 +0800)]
MDL-32508 course/editsection: add a sectionreturn param

This is used so that when editing on a section page you
are returned to the section in question.

9 years agoMDL-32508 course: deprecate get_section_url format callback
Dan Poltawski [Fri, 27 Apr 2012 01:36:37 +0000 (09:36 +0800)]
MDL-32508 course: deprecate get_section_url format callback

9 years agoMDL-32508 course formats: Remove key callback
Dan Poltawski [Thu, 26 Apr 2012 13:53:25 +0000 (21:53 +0800)]
MDL-32508 course formats: Remove key callback

This was used by course formats but now there is a standardised
'section' param

9 years agoMDL-32508 course: Introduce course_get_url()
Dan Poltawski [Thu, 26 Apr 2012 13:36:02 +0000 (21:36 +0800)]
MDL-32508 course: Introduce course_get_url()

9 years agoMDL-32508 course: Switch to 'section' URL param
Dan Poltawski [Thu, 26 Apr 2012 12:49:36 +0000 (20:49 +0800)]
MDL-32508 course: Switch to 'section' URL param

This is a course format independent url param and replaces weekly/topic specific params.
By using a standardised param we are able to use this url consistenly across the codebase
and reduce the risk of param collision

9 years agoMDL-32508 course/view.php: action cleanup
Dan Poltawski [Sat, 28 Apr 2012 05:47:02 +0000 (13:47 +0800)]
MDL-32508 course/view.php: action cleanup

After doing actions redirect back to the 'real url' in order to
prevent problems with caching/bookmarking bad urls

9 years agoMDL-32508 course/view.php: moderise with MUST_EXIST
Dan Poltawski [Sun, 22 Apr 2012 02:57:41 +0000 (10:57 +0800)]
MDL-32508 course/view.php: moderise with MUST_EXIST

9 years agoMDL-32505 course formats: zooming feature be gone!
Dan Poltawski [Mon, 23 Apr 2012 13:17:41 +0000 (21:17 +0800)]
MDL-32505 course formats: zooming feature be gone!

9 years agoMDL-32505 course: drop course_display table and settings
Dan Poltawski [Mon, 23 Apr 2012 13:48:17 +0000 (21:48 +0800)]
MDL-32505 course: drop course_display table and settings

9 years agoMDL-32504 course: Add coursedisplay setting to course table
Dan Poltawski [Mon, 23 Apr 2012 12:25:12 +0000 (20:25 +0800)]
MDL-32504 course: Add coursedisplay setting to course table

This will replace the course_display database table

9 years agoMDL-30649 - Glossary - Adding functions so recent glossary activity shows up in the...
Jason Fowler [Wed, 28 Mar 2012 01:27:13 +0000 (09:27 +0800)]
MDL-30649 - Glossary - Adding functions so recent glossary activity shows up in the activity reports

9 years agoMDL-32628 lib/filelib.php: Set user profile image expires to 1 year
Dan Poltawski [Fri, 4 May 2012 01:36:11 +0000 (09:36 +0800)]
MDL-32628 lib/filelib.php: Set user profile image expires to 1 year

This is to reduce the performance impact of user profile images
requests. Pictures are now referenced by a revision counter so
any changes in picture will not be badly cached any longer.

9 years agoMerge branch 'w18_MDL-32628_m23_avatarperf2' of git://github.com/skodak/moodle
Dan Poltawski [Fri, 4 May 2012 01:28:41 +0000 (09:28 +0800)]
Merge branch 'w18_MDL-32628_m23_avatarperf2' of git://github.com/skodak/moodle

Conflicts:
    lib/db/upgrade.php
version.php

9 years agoMerge branch 'MDL-32757' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 3 May 2012 23:30:45 +0000 (07:30 +0800)]
Merge branch 'MDL-32757' of git://github.com/timhunt/moodle

9 years agoMerge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle
Dan Poltawski [Thu, 3 May 2012 23:28:29 +0000 (07:28 +0800)]
Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle

9 years agoMDL-31731 Advanced Grading: Marking Guide display scale warning for higher max grade...
Dan Marsden [Thu, 3 May 2012 21:33:30 +0000 (09:33 +1200)]
MDL-31731 Advanced Grading: Marking Guide display scale warning for higher max grade as well as lower.

9 years agoMDL-31731 Advanced Grading: Marking Guide: fix bug with check to display warning...
Dan Marsden [Thu, 3 May 2012 21:12:29 +0000 (09:12 +1200)]
MDL-31731 Advanced Grading: Marking Guide: fix bug with check to display warning about discrepency between module maxgrade and number of marks in Marking Guide.

9 years agoMDL-32757 / MDL-3030 quiz: SQL typo breaks quiz editing.
Tim Hunt [Thu, 3 May 2012 18:45:18 +0000 (19:45 +0100)]
MDL-32757 / MDL-3030 quiz: SQL typo breaks quiz editing.

9 years agoMerge branch 'MDL-32738' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 3 May 2012 17:09:53 +0000 (01:09 +0800)]
Merge branch 'MDL-32738' of git://github.com/timhunt/moodle

9 years agoMDL-32738 quiz overdue handling cron: appease MySQL.
Tim Hunt [Thu, 3 May 2012 14:56:56 +0000 (15:56 +0100)]
MDL-32738 quiz overdue handling cron: appease MySQL.

Thanks to sam marshall for giving my the idea of using a subquery to
make the SQL work on all DBs.

9 years agoMerge branch 'MDL-32740' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 3 May 2012 16:58:00 +0000 (00:58 +0800)]
Merge branch 'MDL-32740' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-32693' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Thu, 3 May 2012 16:22:05 +0000 (18:22 +0200)]
Merge branch 'MDL-32693' of git://github.com/danpoltawski/moodle

9 years agoMDL-32680 import latest TinyMCE 3.5
Petr Skoda [Thu, 3 May 2012 13:49:23 +0000 (15:49 +0200)]
MDL-32680 import latest TinyMCE 3.5

9 years agoMerge branch 'MDL-32739' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 3 May 2012 13:23:19 +0000 (21:23 +0800)]
Merge branch 'MDL-32739' of git://github.com/timhunt/moodle

9 years agoMerge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle
Dan Poltawski [Thu, 3 May 2012 12:43:28 +0000 (20:43 +0800)]
Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle

9 years agoMDL-32740 / MDL-3030 quiz summary: no Return to attempt for overdue.
Tim Hunt [Thu, 3 May 2012 11:16:43 +0000 (12:16 +0100)]
MDL-32740 / MDL-3030 quiz summary: no Return to attempt for overdue.

9 years agoMDL-32739 quiz reports: process_actions broken. Regression from MDL-3030
Tim Hunt [Thu, 3 May 2012 11:02:29 +0000 (12:02 +0100)]
MDL-32739 quiz reports: process_actions broken. Regression from MDL-3030

9 years agoMerge branch 'w18_MDL-32697_m23_oci' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Thu, 3 May 2012 10:22:22 +0000 (12:22 +0200)]
Merge branch 'w18_MDL-32697_m23_oci' of git://github.com/skodak/moodle

9 years agoMDL-31731 Grading form Marking Guide - fix for test 6.2, checkboxes not saving state...
Dan Marsden [Thu, 3 May 2012 10:12:34 +0000 (22:12 +1200)]
MDL-31731 Grading form Marking Guide - fix for test 6.2, checkboxes not saving state when clearing both.

9 years agoMDL-31270 pluginlib: Add assign subplugins as standard modules
Dan Poltawski [Thu, 3 May 2012 09:21:49 +0000 (17:21 +0800)]
MDL-31270 pluginlib: Add assign subplugins as standard modules