Commit graph

56447 commits

Author SHA1 Message Date
Luke Tucker
42e0a59d5b MDL-34052 assignment - Disable submission and feedback plugins based on assign type when upgrading 2012-11-27 13:39:53 +08:00
Dan Poltawski
148c786f7c Merge branch 'MDL-36752-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE 2012-11-27 13:32:47 +08:00
Dan Poltawski
6ac0d92d5b Merge branch 'MDL-36806_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-11-27 13:26:46 +08:00
Mark Nelson
487ec8a912 MDL-36841 portfolio: ensure variables in parent function match those of childs to prevent strict standard error 2012-11-27 12:41:58 +08:00
Aparup Banerjee
f441ec2564 Merge branch 'wip-mdl-36767-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE 2012-11-27 12:20:25 +08:00
Rajesh Taneja
e006de414e MDL-36767 Administration: user_filter_yesno use different name for sql filter
user_filter_yesno extends user_filter_simpleselect, so if user bulk action filter has both
user_filter_simpleselect and user_filter_yesno, they use the same filter name but counter is
different as they are different classes. Hence using different filter name will avoid confilts
2012-11-27 11:55:57 +08:00
Aparup Banerjee
4505720f3e Merge branch 'MDL-36305-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-11-27 11:53:09 +08:00
Peter Bulmer
166d3b60d3 MDL-36838 moodle->mahara mnet SSO failure in FF17
In MDL-36838 Firefox 17 users are unable to sso from moodle to mahara.

Firefox 17 uses a different user agent (UA) string for Moodle sites than it
does for Mahara or other sites.
This patch relaxes the check which previously required that the UA string
being presented to the SP on landing matched the UA string presented to the IP
when jumping.
Likewise, checks associated with logout calls have been relaxed
2012-11-27 16:19:38 +13:00
Sam Hemelryk
13669ef4d8 Merge branch 'wip-MDL-36795-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE 2012-11-27 11:21:55 +13:00
Sam Hemelryk
77f3688b2f Merge branch 'MDL-35760_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE 2012-11-27 11:10:25 +13:00
Sam Hemelryk
4c14127cdb Merge branch 'MDL-36760_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-11-27 10:40:57 +13:00
Paul Nicholls
134ede3476 MDL-27619: Prevent teachers from turning course Outcomes into site-wide ones
Similar to the issue which allowed teachers to create site-wide scales by editing a course-specific scale (MDL-24682), teachers could also promote a course-specific scale to a site-wide (standard) by editing it.  As with MDL-24682, removing the course ID check (leaving just the capability check) prevents this unauthorised creation of site-wide (standard) outcomes.
2012-11-27 09:48:16 +13:00
Adrian Greeve
d22b5faae8 MDL-36795 - lib / administration: maxsections now limits the default setting for numsections.
In the default course settings, setting the maximum number topics / weeks  to 0 would not
change the default number of sections on the same page as any other number would.
A more appropriate check has been put in place.

This also incorporates a fix for MDL-28584. The course edit screen now also checks to see
if maxsections is set or numeric. If it is not set or numeric then it defaults to 52.
2012-11-26 15:54:49 +08:00
Adam Olley
63945c8de2 MDL-36828: mod_scorm: Allow deletion of scorm modules if no scorm_scoes data exists 2012-11-26 15:33:16 +10:30
Adam Olley
69b0d17436 MDL-33125: core_backup: Prevent import/activity duplication from duplicating manual grade items 2012-11-26 12:28:00 +10:30
Sam Hemelryk
55f8a9c766 Merge branch 'MDL-36609_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE 2012-11-26 14:57:57 +13:00
Sam Hemelryk
f9fa262aa9 Merge branch 'wip-MDL-36551-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE 2012-11-26 14:44:27 +13:00
Sam Hemelryk
8f718da437 Merge branch 'MDL-36763-MOODLE_23_STABLE' of git://git.luns.net.uk/moodle into MOODLE_23_STABLE 2012-11-26 11:42:13 +13:00
Sam Hemelryk
703b86eefb Merge branch 'MDL-35963-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2012-11-26 10:31:57 +13:00
AMOS bot
2afa81e6de Automatically generated installer lang files 2012-11-24 00:42:52 +00:00
Tim Hunt
36ab57f922 MDL-36806 question files: fix unnecessary require_login call.
quiz_question_pluginfile later does the correct check. Doing this
other check first means you get an error about changing $PAGE->context.
2012-11-23 15:56:46 +00:00
Tim Hunt
500c73ba1e MDL-36760 formslib: fix frozen elements with [] in name.
This was a regression caused by MDL-30845 or, to be precise, the related
issue MDL-32785.

Form elements with names like multipier[0] require special handling,
such as is present in HTML_QuickForm_element::_prepareValue. I have
added equivalent handling to MoodleQuickForm::exportValues. I am afraid
that I could not think of a way to do this reliably without duplicating
code.
2012-11-23 11:31:20 +00:00
Tim Hunt
d4eec64dc6 MDL-36650 don't change question timecreated or timemodified on restore. 2012-11-23 10:50:26 +00:00
Mark Nelson
6e726489e7 MDL-36741 mod_forum: fixed SQL that was generated when either timed posts or groups were enabled 2012-11-23 17:03:10 +08:00
Dan Poltawski
5f1d8f2a8f weekly release 2.3.3+ 2012-11-23 15:20:23 +08:00
Dan Poltawski
0d80d00494 Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE 2012-11-23 15:12:29 +08:00
Dan Poltawski
cc00f721d1 Merge branch 'MDL-36204-files-with-spaces_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE 2012-11-23 11:20:04 +08:00
David Mudrák
045053f641 MDL-36204 Improve moodle1 conversion of embedded files
URL of files referenced in HTML fields via $@FILEPHP$@ are usually
encoded if they were linked using the HTML editor. So if they contain
spaces or plus signs in the name, their URL is encoded to use %20 and
%2B respectively.

Sometimes, for example when the HTML was edited manually in 1.9 without
the editor, non-encoded file names may be put into the HTML text. Such a
link used to work in 1.9 so we add an explicit support for it, too.

However, we do not support partially encoded URLs (e.g. only spaces are
encoded while plus signs are not). Such links are unmodified and will
rely on Legacy files support.
2012-11-23 03:51:55 +01:00
Paul Nicholls
d09fffbefb MDL-32880: Add moodle1 backup converter for rss_client block.
Creates a shell rss_client.xml file, which contains no feeds.  This makes it behave the same as restoring a Moodle 1.9 backup into a different 1.9 site - the block is created, its title is as per the original course, but it has no feeds selected (and none are added to the site's feed list).
2012-11-23 09:01:59 +13:00
Paul Nicholls
6eb4a954a6 MDL-32880: Add moodle1 backup converter for html block.
This converter processes the HTML block's content, migrating any referenced files.
2012-11-23 09:01:47 +13:00
Paul Nicholls
afaabdaf27 MDL-32880: moodle1 backup converter: add generic block handler
This handler will automatically be used for any block which does not provide its own handler, and should be subclassed by any block which needs to do anything extra (or different).

This commit incorporates contributions from Mike Churchward and API design suggestions from David Mudrak.
2012-11-23 09:01:35 +13:00
Andrew Robert Nicols
0e88b7d94f MDL-35819 Improve performance of help tooltip
Rather than using an event handler for each help link, we add the
'helpicon' class to them and delegate the display function.

In order for this to work, we modify the way that Y.io fetches the help to
use the intended target of the anchor rather than a value provided in the
add call. We also no longer modify this URL and instead add the ajaxurl
parameter to it using the Y.io data parameter.

This change is backwards compatible with people calling it without using
the help icon renderer.
2012-11-22 11:45:34 +00:00
Andrew Robert Nicols
355b4f9dfa MDL-36763 Remove onclick event when creating activity left indent link
The left indent onclick is now handled by a Y.delegate so there is no need
for a seperate event handler.
2012-11-22 10:56:20 +00:00
AMOS bot
f4a048d771 Automatically generated installer lang files 2012-11-22 09:05:24 +00:00
Rajesh Taneja
aae9605228 MDL-36736 course: Availability information should not be visible for hidden modules
If user is viewing hidden module, availability information should only be visible to
user when editing and module is visible. If editing and module is hidden, then hide
availablilty information as it's invalid.
When user is not editing and activity is hidden then don't add availability information.
2012-11-22 15:13:26 +08:00
Rajesh Taneja
c1ac572d9c MDL-36736 course: Availability information will use hide class for hidding 2012-11-22 15:13:26 +08:00
Dan Poltawski
64ae757ee5 Merge branch 'wip-MDL-36668-MOODLE_23_STABLE' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE 2012-11-22 10:33:15 +08:00
Petr Škoda
2b78a895fe MDL-36753 fix invalid sectionid in backup tests 2012-11-21 12:40:17 +01:00
Damyon Wiese
dba42c3390 MDL-36712: Assignment grading with custom scale is affected by the current language 2012-11-21 15:35:44 +08:00
Dan Poltawski
bbeafdbed1 Merge branch 'w47_MDL-36547_m23_sectiongen' of git://github.com/skodak/moodle into MOODLE_23_STABLE 2012-11-21 15:34:22 +08:00
Dan Poltawski
105562e682 Merge branch 'MDL-30884_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2012-11-21 15:19:24 +08:00
Damyon Wiese
85b5e20cde MDL-35963: Assignment - do not accept empty submissions
Conflicts:

	mod/assign/locallib.php
2012-11-21 13:53:34 +08:00
Mark Nelson
03e403414e MDL-35760 filemanager: ensuring the dnd arrow displays in the center of the filemanager for all supported browsers 2012-11-21 12:03:54 +08:00
Damyon Wiese
80238a3cc2 MDL-36012: Assignment, Accessibility - Add user information to alt text for grade icon in grading table.
Conflicts:

	mod/assign/lang/en/assign.php
2012-11-21 12:03:45 +08:00
Dan Poltawski
c41d292bce Merge branch 'MDL-35675-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE 2012-11-21 12:02:58 +08:00
Dan Poltawski
19d964e07a Merge branch 'MDL-36289-m23' of git://github.com/netspotau/moodle-mod_assign into MOODLE_23_STABLE 2012-11-21 12:01:03 +08:00
Dan Poltawski
8fb4c6e7c3 Merge branch 'MDL-30377_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE 2012-11-21 11:53:21 +08:00
Dan Poltawski
97c7facfe0 Merge branch 'MDL-36170_m23' of https://github.com/jfilip/moodle into MOODLE_23_STABLE 2012-11-21 11:47:39 +08:00
Rossiani Wijaya
879766ade2 MDL-36549 Lesson module: fixed strict standards errors 2012-11-21 11:32:42 +08:00
Damyon Wiese
fbd336f810 MDL-36184: Assignment quickgrading should only update lastmodified dates for modified submissions 2012-11-21 11:14:29 +08:00