moodle.git
7 years agoMDL-50055 enrol: Stop requiring javascript for behat tests
Andrew Nicols [Thu, 30 Apr 2015 01:15:54 +0000 (09:15 +0800)]
MDL-50055 enrol: Stop requiring javascript for behat tests

7 years agoMDL-50055 tests: Add new step to deal with Single Selects
Andrew Nicols [Fri, 1 May 2015 01:18:37 +0000 (09:18 +0800)]
MDL-50055 tests: Add new step to deal with Single Selects

7 years agoon-demand release 2.9beta+
David Monllao [Fri, 1 May 2015 08:51:51 +0000 (16:51 +0800)]
on-demand release 2.9beta+

7 years agoMDL-49232 enrol_self: Adapting unit test to new can_self_enrol() output
David Monllao [Fri, 1 May 2015 07:43:09 +0000 (15:43 +0800)]
MDL-49232 enrol_self: Adapting unit test to new can_self_enrol() output

7 years agoMerge branch 'MDL-49998' of git://github.com/stronk7/moodle
David Monllao [Fri, 1 May 2015 07:05:42 +0000 (15:05 +0800)]
Merge branch 'MDL-49998' of git://github.com/stronk7/moodle

7 years agoMerge branch 'MDL-49840-master' of git://github.com/andrewnicols/moodle
David Monllao [Fri, 1 May 2015 03:05:59 +0000 (11:05 +0800)]
Merge branch 'MDL-49840-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-49232_master' of git://github.com/markn86/moodle
Andrew Nicols [Fri, 1 May 2015 01:27:11 +0000 (09:27 +0800)]
Merge branch 'MDL-49232_master' of git://github.com/markn86/moodle

7 years agoMerge branch 'MDL-50028' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 30 Apr 2015 15:06:58 +0000 (16:06 +0100)]
Merge branch 'MDL-50028' of git://github.com/timhunt/moodle

7 years agoMDL-49998 editpdf: Clean code to make it more readable.
Eloy Lafuente (stronk7) [Thu, 30 Apr 2015 08:52:58 +0000 (10:52 +0200)]
MDL-49998 editpdf: Clean code to make it more readable.

There was a big proliferation and reuse of $pdf variable
that was making the code hard to read/review. This commit
does change nothing but makes it more readable.

Also adds a couple of Close() calls, not strictly needed
because they don't have opened files. But think it makes
really clearer the scope of every variable. And, for sure
it frees some resources. That cannot be bad.

7 years agoMerge branch 'MDL-49986-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Thu, 30 Apr 2015 07:39:13 +0000 (15:39 +0800)]
Merge branch 'MDL-49986-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-49583' of https://github.com/NeillM/moodle
Andrew Nicols [Thu, 30 Apr 2015 07:00:25 +0000 (15:00 +0800)]
Merge branch 'MDL-49583' of https://github.com/NeillM/moodle

7 years agoMerge branch 'MDL-50038-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Thu, 30 Apr 2015 06:55:48 +0000 (14:55 +0800)]
Merge branch 'MDL-50038-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-49281-master' of git://github.com/mastnym/moodle
David Monllao [Thu, 30 Apr 2015 06:53:52 +0000 (14:53 +0800)]
Merge branch 'MDL-49281-master' of git://github.com/mastnym/moodle

7 years agoMDL-49637 mod_assign: Fixing behat test
David Monllao [Thu, 30 Apr 2015 03:04:09 +0000 (11:04 +0800)]
MDL-49637 mod_assign: Fixing behat test

The participant number is dynamically generated so it is not possible to
match known values.

Match on the submission text instead.

7 years agoMDL-49281 grades: Calculation settings upgraded
Martin Mastny [Thu, 16 Apr 2015 06:21:35 +0000 (14:21 +0800)]
MDL-49281 grades: Calculation settings upgraded

7 years agoMDL-49986 messages: Contacts in contact list should not be bold
Frederic Massart [Thu, 30 Apr 2015 04:40:03 +0000 (12:40 +0800)]
MDL-49986 messages: Contacts in contact list should not be bold

7 years agoMerge branch 'MDL-50033-master-enfix' of git://github.com/mudrd8mz/moodle
Andrew Nicols [Thu, 30 Apr 2015 02:47:33 +0000 (10:47 +0800)]
Merge branch 'MDL-50033-master-enfix' of git://github.com/mudrd8mz/moodle

7 years agoMerge branch 'MDL-49932_master' of git://github.com/markn86/moodle
Andrew Nicols [Thu, 30 Apr 2015 02:25:27 +0000 (10:25 +0800)]
Merge branch 'MDL-49932_master' of git://github.com/markn86/moodle

7 years agoMDL-49232 enrol_self: Add behat test for non-guest self-enrolment
Andrew Nicols [Thu, 30 Apr 2015 00:57:02 +0000 (08:57 +0800)]
MDL-49232 enrol_self: Add behat test for non-guest self-enrolment

7 years agoMDL-49232 enrol_self: display continue button
Mark Nelson [Mon, 20 Apr 2015 05:42:25 +0000 (22:42 -0700)]
MDL-49232 enrol_self: display continue button

7 years agoMDL-49932 core_install: removed upgrade step changing 'defaulthomepage'
Mark Nelson [Wed, 29 Apr 2015 01:24:21 +0000 (18:24 -0700)]
MDL-49932 core_install: removed upgrade step changing 'defaulthomepage'

The upgrade step was changing any site that had the setting
'defaulthomepage' set to HOMEPAGE_SITE to HOMEPAGE_MY. We can
not make the assumption that users want this setting changed.

7 years agoMDL-50033 lang: Update Behat scenarios to use the new strings
David Mudrák [Wed, 29 Apr 2015 21:15:44 +0000 (23:15 +0200)]
MDL-50033 lang: Update Behat scenarios to use the new strings

7 years agoMDL-50033 lang: Merge English strings from the en_fix language pack
Helen Foster [Wed, 29 Apr 2015 19:43:00 +0000 (21:43 +0200)]
MDL-50033 lang: Merge English strings from the en_fix language pack

7 years agoMDL-50038 my: Redirect admin users to the notifications page when needed
Frederic Massart [Wed, 29 Apr 2015 10:52:46 +0000 (18:52 +0800)]
MDL-50038 my: Redirect admin users to the notifications page when needed

7 years agoMerge branch 'MDL-50041-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 29 Apr 2015 10:53:47 +0000 (11:53 +0100)]
Merge branch 'MDL-50041-master' of git://github.com/FMCorz/moodle

7 years agoMDL-50041 gdlib: Badges need PNG files from process_new_icon()
Frederic Massart [Wed, 29 Apr 2015 07:04:47 +0000 (15:04 +0800)]
MDL-50041 gdlib: Badges need PNG files from process_new_icon()

7 years agoMDL-49843 navigation: Fixed fatal error when viewing reports.
Adrian Greeve [Mon, 20 Apr 2015 07:44:22 +0000 (15:44 +0800)]
MDL-49843 navigation: Fixed fatal error when viewing reports.

7 years agoMDL-49583 enrol: enrol/index.php page doesn't handle direct access well
Neill Magill [Thu, 19 Mar 2015 11:32:33 +0000 (11:32 +0000)]
MDL-49583 enrol: enrol/index.php page doesn't handle direct access well

Before this patch if a user who is not logged in to Moodle accesses the
enrol/index.php page directly they were redirected to the Moodle front
page after login, rather than back to a page that would allow them to
self enrol, if it is enabled on the course.

This change will cause a user who directly accesses the page to be
redirected back to it after they have logged in, unless the course has guest
access enabled.

Thanks to Marina Glancy for suggesting the use of get_referer()

7 years agoMerge branch 'MDL-49928-master' of git://github.com/ankitagarwal/moodle
Andrew Nicols [Wed, 29 Apr 2015 05:40:44 +0000 (13:40 +0800)]
Merge branch 'MDL-49928-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'MDL-50026' of git://github.com/timhunt/moodle
David Monllao [Wed, 29 Apr 2015 05:25:02 +0000 (13:25 +0800)]
Merge branch 'MDL-50026' of git://github.com/timhunt/moodle

7 years agoMDL-49928 userprofile: Reorder blocks
Ankit Agarwal [Wed, 22 Apr 2015 05:19:32 +0000 (10:49 +0530)]
MDL-49928 userprofile: Reorder blocks

7 years agoMerge branch 'wip-MDL-49888-master' of git://github.com/abgreeve/moodle
Andrew Nicols [Wed, 29 Apr 2015 04:18:52 +0000 (12:18 +0800)]
Merge branch 'wip-MDL-49888-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'MDL-49637' of git://github.com/NeillM/moodle
David Monllao [Wed, 29 Apr 2015 04:04:43 +0000 (12:04 +0800)]
Merge branch 'MDL-49637' of git://github.com/NeillM/moodle

7 years agoMDL-49998 unit tests: Close the pdf objects when needed.
Eloy Lafuente (stronk7) [Sun, 26 Apr 2015 22:59:39 +0000 (00:59 +0200)]
MDL-49998 unit tests: Close the pdf objects when needed.

When a pdf object is instantiated and any file is loaded
with set_pdf() or load_pdf(), the files remain open until
the pdf is saved with pdf_save() or outputted with Output()..

In that cases is needed to perform an explicit Close() in
order to free resources, parsers and, ultimately, fclose()
the files.

Note that only the uses detected in the editpdf unit tests have
been fixed. I'd recommend to analyse every instance of the tcpdf
libs.

Also, there was one incorrecly reused pdf instance in then
generate_combined_pdf_for_attempt() method. Apparently it was not
leading to problems, but better use a separate instance (#246).

7 years agoMDL-49998 unit tests: files left open are our fault.
Eloy Lafuente (stronk7) [Sun, 26 Apr 2015 22:45:32 +0000 (00:45 +0200)]
MDL-49998 unit tests: files left open are our fault.

Get rid of the gc_collect_cycles() that only was
hiding incorrectly left open files. This must be fixed
in code when possible. And pdf libs allow us to do so.

Note that a lot of gc_collect_cycles() were added
in MDL-47675, I'd recommend to take a look to all them,
being replaced by fixes in code when possible.

7 years agoMerge branch 'wip-mdl-49974' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 28 Apr 2015 14:01:08 +0000 (15:01 +0100)]
Merge branch 'wip-mdl-49974' of https://github.com/rajeshtaneja/moodle

7 years agoMDL-50026 quiz: don't show locks for random Qs in deferred feedback
Tim Hunt [Tue, 28 Apr 2015 10:31:00 +0000 (11:31 +0100)]
MDL-50026 quiz: don't show locks for random Qs in deferred feedback

can_finish_during_the_attempt was returning the wrong result for
random questions for behaviours like deferred feedback.

7 years agoMDL-50028 qtype_match: fix correct answer display
Tim Hunt [Tue, 28 Apr 2015 12:01:20 +0000 (13:01 +0100)]
MDL-50028 qtype_match: fix correct answer display

Atto's stupid tendency to create HTML like
<p>You don't need a br at the end of a paragraph!</br></p>
was breaking it.

7 years agoMDL-50028 questions: split into one testcase class per file
Tim Hunt [Tue, 28 Apr 2015 10:59:24 +0000 (11:59 +0100)]
MDL-50028 questions: split into one testcase class per file

7 years agoon-demand release 2.9beta+
Dan Poltawski [Tue, 28 Apr 2015 08:27:21 +0000 (09:27 +0100)]
on-demand release 2.9beta+

7 years agoMDL-49981 badges: Missing link to manage your badges
Frederic Massart [Fri, 24 Apr 2015 04:55:22 +0000 (12:55 +0800)]
MDL-49981 badges: Missing link to manage your badges

7 years agoMDL-49911 admin: Prevent notices when updatenotifications is disabled
Frederic Massart [Fri, 24 Apr 2015 06:41:01 +0000 (14:41 +0800)]
MDL-49911 admin: Prevent notices when updatenotifications is disabled

7 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Tue, 28 Apr 2015 08:27:19 +0000 (09:27 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

7 years agoMerge branch 'wip-MDL-17929-master' of git://github.com/marinaglancy/moodle
David Monllao [Tue, 28 Apr 2015 03:42:10 +0000 (11:42 +0800)]
Merge branch 'wip-MDL-17929-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-42449' of git://github.com/andrewhancox/moodle
David Monllao [Tue, 28 Apr 2015 03:08:07 +0000 (11:08 +0800)]
Merge branch 'MDL-42449' of git://github.com/andrewhancox/moodle

7 years agoMerge branch 'MDL-49926-master' of git://github.com/mastnym/moodle
Andrew Nicols [Tue, 28 Apr 2015 02:25:25 +0000 (10:25 +0800)]
Merge branch 'MDL-49926-master' of git://github.com/mastnym/moodle

7 years agoMerge branch 'MDL-49814' of git://github.com/timhunt/moodle
Andrew Nicols [Tue, 28 Apr 2015 01:50:37 +0000 (09:50 +0800)]
Merge branch 'MDL-49814' of git://github.com/timhunt/moodle

7 years agoMDL-49637 assign: Workflow & blind marking do not always show feedback
Neill Magill [Fri, 27 Mar 2015 16:16:18 +0000 (16:16 +0000)]
MDL-49637 assign: Workflow & blind marking do not always show feedback

Before this patch if an assignment has workflow and blind marking enabled if a teacher
sets a submission to have its grades released to students before they reveal student
identities the feedback they have given is not displayed to the student.

The patch causes the reveal_identities() method to pass the correct value to the
get_feedback_plugin_by_type() function in the assign class.

7 years agoMDL-49637 assign: Behat test for blind marking with workflow
Neill Magill [Wed, 22 Apr 2015 12:10:00 +0000 (13:10 +0100)]
MDL-49637 assign: Behat test for blind marking with workflow

This test checks that that if reveal student identities is used before or after the submissions grades have
been set released that the teacher's feedback is displayed to students.

7 years agoMDL-49888 navigation: Added missing reports to user profile.
Adrian Greeve [Thu, 16 Apr 2015 07:57:01 +0000 (15:57 +0800)]
MDL-49888 navigation: Added missing reports to user profile.

Added statistics and grade to the reports section in the user
profile.

7 years agoAutomatically generated installer lang files
AMOS bot [Mon, 27 Apr 2015 16:04:09 +0000 (00:04 +0800)]
Automatically generated installer lang files

7 years agoMerge branch 'MDL-49993_master' of git://github.com/grabs/moodle
Dan Poltawski [Mon, 27 Apr 2015 13:47:58 +0000 (14:47 +0100)]
Merge branch 'MDL-49993_master' of git://github.com/grabs/moodle

7 years agoMDL-49948 lesson: Answer and response format should be known for each form
Rajesh Taneja [Thu, 23 Apr 2015 07:28:47 +0000 (15:28 +0800)]
MDL-49948 lesson: Answer and response format should be known for each form

7 years agoMerge branch 'MDL-49913' of git://github.com/jmvedrine/moodle
Dan Poltawski [Mon, 27 Apr 2015 13:28:27 +0000 (14:28 +0100)]
Merge branch 'MDL-49913' of git://github.com/jmvedrine/moodle

7 years agoMDL-49814 quiz: make question dependency clear in the nav
Tim Hunt [Thu, 23 Apr 2015 14:57:29 +0000 (15:57 +0100)]
MDL-49814 quiz: make question dependency clear in the nav

7 years agoMerge branch 'MDL-49956_getstring' of https://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 27 Apr 2015 10:03:32 +0000 (11:03 +0100)]
Merge branch 'MDL-49956_getstring' of https://github.com/andyjdavis/moodle

7 years agoMerge branch 'MDL-49977_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 27 Apr 2015 09:46:08 +0000 (10:46 +0100)]
Merge branch 'MDL-49977_master' of git://github.com/markn86/moodle

7 years agoMDL-49993 mod_feedback: Question auto numbers have no space between number and question
Andreas Grabs [Sun, 26 Apr 2015 17:03:34 +0000 (19:03 +0200)]
MDL-49993 mod_feedback: Question auto numbers have no space between number and question

7 years agoMDL-49913 mod_lesson: studentanswer format should be HTML
Jean-Michel Vedrine [Wed, 22 Apr 2015 11:07:27 +0000 (13:07 +0200)]
MDL-49913 mod_lesson: studentanswer format should be HTML

7 years agoMDL-49913 mod_lesson: fix import scores and jumps
Jean-Michel Vedrine [Wed, 22 Apr 2015 10:51:59 +0000 (12:51 +0200)]
MDL-49913 mod_lesson: fix import scores and jumps

7 years agoMDL-49913 mod_lesson: defaultanswer to avoid duplication
Jean-Michel Vedrine [Wed, 22 Apr 2015 10:45:51 +0000 (12:45 +0200)]
MDL-49913 mod_lesson: defaultanswer to avoid duplication

7 years agoMDL-49913 mod_lesson: round question grades on import
Jean-Michel Vedrine [Wed, 22 Apr 2015 10:38:23 +0000 (12:38 +0200)]
MDL-49913 mod_lesson: round question grades on import

7 years agoAutomatically generated installer lang files
AMOS bot [Fri, 24 Apr 2015 16:04:04 +0000 (00:04 +0800)]
Automatically generated installer lang files

7 years agoMDL-42449 backup: Fix for activity grade category
Andrew Hancox [Thu, 2 Apr 2015 12:03:37 +0000 (13:03 +0100)]
MDL-42449 backup: Fix for activity grade category

Retain grade category when restoring an activity into the course that
it came from

7 years agoon-demand release 2.9beta+
Dan Poltawski [Fri, 24 Apr 2015 11:10:20 +0000 (12:10 +0100)]
on-demand release 2.9beta+

7 years agoMerge branch 'MDL-49960-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Fri, 24 Apr 2015 08:41:20 +0000 (09:41 +0100)]
Merge branch 'MDL-49960-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-49311-master' of git://github.com/lameze/moodle
Andrew Nicols [Fri, 24 Apr 2015 03:38:07 +0000 (11:38 +0800)]
Merge branch 'MDL-49311-master' of git://github.com/lameze/moodle

7 years agoMerge branch 'MDL-49813' of https://github.com/mkassaei/moodle
Andrew Nicols [Fri, 24 Apr 2015 02:25:29 +0000 (10:25 +0800)]
Merge branch 'MDL-49813' of https://github.com/mkassaei/moodle

7 years agoMerge branch 'MDL-49946' of https://github.com/jmvedrine/moodle
Dan Poltawski [Thu, 23 Apr 2015 12:32:33 +0000 (13:32 +0100)]
Merge branch 'MDL-49946' of https://github.com/jmvedrine/moodle

7 years agoMerge branch 'MDL-49972-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 23 Apr 2015 10:39:18 +0000 (11:39 +0100)]
Merge branch 'MDL-49972-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-49937-master' of git://github.com/jleyva/moodle
David Monllao [Thu, 23 Apr 2015 07:53:31 +0000 (15:53 +0800)]
Merge branch 'MDL-49937-master' of git://github.com/jleyva/moodle

7 years agoMerge branch 'm29_MDL-49922' of https://github.com/totara/moodle
Andrew Nicols [Thu, 23 Apr 2015 07:32:12 +0000 (15:32 +0800)]
Merge branch 'm29_MDL-49922' of https://github.com/totara/moodle

7 years agoMerge branch 'MDL-49477-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Thu, 23 Apr 2015 05:51:11 +0000 (13:51 +0800)]
Merge branch 'MDL-49477-master' of git://github.com/FMCorz/moodle

7 years agoMDL-49926 gradereport: Cursor changes to pointer on hover
Martin Mastny [Thu, 23 Apr 2015 05:21:19 +0000 (13:21 +0800)]
MDL-49926 gradereport: Cursor changes to pointer on hover

7 years agoMDL-49926 gradereport: Feedback gets saved when editing grade in ajax mode
Martin Mastny [Mon, 20 Apr 2015 07:56:58 +0000 (15:56 +0800)]
MDL-49926 gradereport: Feedback gets saved when editing grade in ajax mode

7 years agoMDL-49974 unit_test: Use datetime format supported by different os
Rajesh Taneja [Fri, 24 Apr 2015 05:01:01 +0000 (13:01 +0800)]
MDL-49974 unit_test: Use datetime format supported by different os

%k is not supported by windows, so using %H

7 years agoMDL-49311 user: fix default sorting problem
papillon [Mon, 16 Mar 2015 15:59:11 +0000 (00:59 +0900)]
MDL-49311 user: fix default sorting problem

7 years agoMDL-49956 admin: removed unused get_string() params
Andrew Davis [Wed, 22 Apr 2015 13:18:08 +0000 (21:18 +0800)]
MDL-49956 admin: removed unused get_string() params

7 years agoMDL-49977 mod_assign: added missing page titles
Mark Nelson [Thu, 23 Apr 2015 23:23:47 +0000 (16:23 -0700)]
MDL-49977 mod_assign: added missing page titles

7 years agoMDL-49813 quiz: add sections in the right place after page changes
M Kassaei [Wed, 15 Apr 2015 09:48:58 +0000 (10:48 +0100)]
MDL-49813 quiz: add sections in the right place after page changes

7 years agoMDL-49972 preferences: Fix incorrect title and headings
Frederic Massart [Thu, 23 Apr 2015 06:17:21 +0000 (14:17 +0800)]
MDL-49972 preferences: Fix incorrect title and headings

7 years agoMDL-49937 data: Handle admins/managers in get_databases_by_courses
Juan Leyva [Wed, 22 Apr 2015 08:08:53 +0000 (10:08 +0200)]
MDL-49937 data: Handle admins/managers in get_databases_by_courses

7 years agoMDL-17929 enrol_meta: unittest for unenrolment from group
Marina Glancy [Thu, 23 Apr 2015 07:08:07 +0000 (15:08 +0800)]
MDL-17929 enrol_meta: unittest for unenrolment from group

7 years agoMDL-49960 message: Adding behat test for recent conversations
Frederic Massart [Thu, 23 Apr 2015 06:05:55 +0000 (14:05 +0800)]
MDL-49960 message: Adding behat test for recent conversations

7 years agoMDL-49960 message: Prevent coding error when getting recent convos
Frederic Massart [Thu, 23 Apr 2015 04:08:33 +0000 (12:08 +0800)]
MDL-49960 message: Prevent coding error when getting recent convos

7 years agoMerge branch 'MDL-34921_master_unwanted-sitehome-redirects' of https://github.com...
Andrew Nicols [Thu, 23 Apr 2015 03:49:16 +0000 (11:49 +0800)]
Merge branch 'MDL-34921_master_unwanted-sitehome-redirects' of https://github.com/colin-umn/moodle

7 years agoMerge branch 'MDL-49613' of https://github.com/NeillM/moodle
Andrew Nicols [Thu, 23 Apr 2015 00:40:44 +0000 (08:40 +0800)]
Merge branch 'MDL-49613' of https://github.com/NeillM/moodle

7 years agoMDL-49946 mod_lesson: improve qformat_default::defaultquestion
Jean-Michel Vedrine [Wed, 22 Apr 2015 17:38:59 +0000 (19:38 +0200)]
MDL-49946 mod_lesson: improve qformat_default::defaultquestion

7 years agoMerge branch 'MDL-49921-master' of git://github.com/jleyva/moodle
Dan Poltawski [Wed, 22 Apr 2015 15:40:15 +0000 (16:40 +0100)]
Merge branch 'MDL-49921-master' of git://github.com/jleyva/moodle

7 years agoMerge branch 'wip-MDL-49953-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 22 Apr 2015 11:06:46 +0000 (12:06 +0100)]
Merge branch 'wip-MDL-49953-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-49800-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 22 Apr 2015 09:47:56 +0000 (10:47 +0100)]
Merge branch 'MDL-49800-master' of git://github.com/FMCorz/moodle

7 years agoMDL-49477 availability_grade-form: checkbox disable problem fixed
Viduranga Wijesooriya [Wed, 25 Mar 2015 19:33:45 +0000 (01:03 +0530)]
MDL-49477 availability_grade-form: checkbox disable problem fixed

Signed-off-by: Viduranga Wijesooriya <vpowerrc@gmail.com>
7 years agoMerge branch 'MDL-49933-master' of git://github.com/lucisgit/moodle
David Monllao [Wed, 22 Apr 2015 09:02:19 +0000 (17:02 +0800)]
Merge branch 'MDL-49933-master' of git://github.com/lucisgit/moodle

7 years agoMDL-49613 access: count_role_users gives unexpected results
Neill Magill [Fri, 20 Mar 2015 14:31:34 +0000 (14:31 +0000)]
MDL-49613 access: count_role_users gives unexpected results

The count_role_users function in lib/accesslib.php gives the wrong results if a user has the
same role at multiple levels in a context path.

For example a user is a coursecreator on a course and the category that the course is in,
in this case they would be counted twice, rather than being recognised as the same user.

This change will make the function only count unique users.

7 years agoMDL-49613 access: Unit test for count_role_users
Neill Magill [Fri, 20 Mar 2015 13:46:27 +0000 (13:46 +0000)]
MDL-49613 access: Unit test for count_role_users

7 years agoMDL-49921 forum: Handle exceptions correctly in get_forums_by_courses
Juan Leyva [Mon, 20 Apr 2015 10:23:20 +0000 (12:23 +0200)]
MDL-49921 forum: Handle exceptions correctly in get_forums_by_courses

7 years agoMerge branch 'MDL-49849-master' of git://github.com/gurgus/moodle
David Monllao [Wed, 22 Apr 2015 06:40:37 +0000 (14:40 +0800)]
Merge branch 'MDL-49849-master' of git://github.com/gurgus/moodle

7 years agoMDL-17929 groups: function to sync groups with enrolments
Marina Glancy [Thu, 9 Apr 2015 04:28:51 +0000 (12:28 +0800)]
MDL-17929 groups: function to sync groups with enrolments

7 years agoMDL-17929 enrol_meta: allow to edit instance
Marina Glancy [Wed, 8 Apr 2015 08:17:50 +0000 (16:17 +0800)]
MDL-17929 enrol_meta: allow to edit instance

7 years agoMDL-17929 enrol_meta: create new group if selected
Marina Glancy [Wed, 8 Apr 2015 07:46:20 +0000 (15:46 +0800)]
MDL-17929 enrol_meta: create new group if selected

AMOS BEGIN
  CPY [creategroup,enrol_cohort],[creategroup,enrol_meta]
AMOS END