moodle.git
12 years agoMerge branch 'MDL-37413-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
Dan Poltawski [Tue, 15 Jan 2013 02:58:47 +0000 (10:58 +0800)]
Merge branch 'MDL-37413-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'MDL-37194-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23...
Dan Poltawski [Tue, 15 Jan 2013 02:43:44 +0000 (10:43 +0800)]
Merge branch 'MDL-37194-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'MDL-37431_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 14 Jan 2013 23:16:34 +0000 (00:16 +0100)]
Merge branch 'MDL-37431_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'MDL-37485_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 14 Jan 2013 22:22:03 +0000 (23:22 +0100)]
Merge branch 'MDL-37485_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'MDL-37378_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 14 Jan 2013 21:42:36 +0000 (10:42 +1300)]
Merge branch 'MDL-37378_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'wip-MDL-30797-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 14 Jan 2013 07:26:25 +0000 (15:26 +0800)]
Merge branch 'wip-MDL-30797-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

12 years agoMDL-30797 - backup groups: Added a parameter to the groups_assign_grouping function.
Adrian Greeve [Tue, 8 Jan 2013 05:17:24 +0000 (13:17 +0800)]
MDL-30797 - backup groups: Added a parameter to the groups_assign_grouping function.

$timeadded has now been included so that the backup / restore functions can now use
this API rather than duplicating the code.

12 years agoMDL-30797 backup: Use correct API call for mapping groups to groupings on import...
Adam Olley [Thu, 3 May 2012 07:08:37 +0000 (16:38 +0930)]
MDL-30797 backup: Use correct API call for mapping groups to groupings on import/restore

12 years agoMerge branch 'wip-mdl-29534-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Dan Poltawski [Mon, 14 Jan 2013 06:59:41 +0000 (14:59 +0800)]
Merge branch 'wip-mdl-29534-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'MDL-37048-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
Sam Hemelryk [Mon, 14 Jan 2013 01:08:02 +0000 (14:08 +1300)]
Merge branch 'MDL-37048-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

12 years agoMDL-35568 course dndupload - resources created with the same visibility as the sectio...
Davo Smith [Fri, 4 Jan 2013 12:31:31 +0000 (12:31 +0000)]
MDL-35568 course dndupload - resources created with the same visibility as the section they are dragged onto

12 years agoMerge branch 'wip-MDL-35885-stable23' of git://github.com/phalacee/moodle into MOODLE...
Sam Hemelryk [Mon, 14 Jan 2013 00:39:43 +0000 (13:39 +1300)]
Merge branch 'wip-MDL-35885-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'MDL-36095-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_...
Sam Hemelryk [Sun, 13 Jan 2013 23:23:37 +0000 (12:23 +1300)]
Merge branch 'MDL-36095-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'MDL-36511-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 13 Jan 2013 23:12:30 +0000 (12:12 +1300)]
Merge branch 'MDL-36511-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'wip-MDL-36335-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 13 Jan 2013 22:43:29 +0000 (11:43 +1300)]
Merge branch 'wip-MDL-36335-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'MDL-37397-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
Sam Hemelryk [Sun, 13 Jan 2013 22:04:28 +0000 (11:04 +1300)]
Merge branch 'MDL-37397-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'wip-mdl-35780-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Sam Hemelryk [Sun, 13 Jan 2013 21:59:23 +0000 (10:59 +1300)]
Merge branch 'wip-mdl-35780-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

12 years agoMoodle release 2.3.4 v2.3.4
Eloy Lafuente (stronk7) [Fri, 11 Jan 2013 21:21:52 +0000 (22:21 +0100)]
Moodle release 2.3.4

12 years agoMDL-37485 plugins overview: require_login before _capability.
Tim Hunt [Fri, 11 Jan 2013 12:51:53 +0000 (12:51 +0000)]
MDL-37485 plugins overview: require_login before _capability.

12 years agoMDL-37431 question preview: cron performance problem.
Tim Hunt [Wed, 9 Jan 2013 15:35:10 +0000 (15:35 +0000)]
MDL-37431 question preview: cron performance problem.

This query was performing badly. The solution seems to be to add a
redundant JOIN and WHERE to the subquery.

I renamed the table aliases in the subquery to avoid name collisions
elsewhere. I am afraid that makes the diff rather unhelpful. The
    AND subq_qu.component = :qubacomponent2
line is new. The other lines have just had subq_ added.

12 years agoMDL-37378 quiz restore: timecheckstate not in old backups.
Tim Hunt [Mon, 7 Jan 2013 15:56:20 +0000 (15:56 +0000)]
MDL-37378 quiz restore: timecheckstate not in old backups.

We need to avoid a notice. If the value is missing, setting it to 0 is
fine. It will get sorted out the next time cron is run.

12 years agoMDL-37397 Test for a valid select in formautosubmit
Andrew Robert Nicols [Wed, 9 Jan 2013 22:47:19 +0000 (22:47 +0000)]
MDL-37397 Test for a valid select in formautosubmit

Ideally we shouldn't get into this situation, but in cases where the
generated select element is incorrectly configured, we should try and
handle it gracefully with a warning.

12 years agoweekly release 2.3.3+
Eloy Lafuente (stronk7) [Fri, 11 Jan 2013 11:33:07 +0000 (12:33 +0100)]
weekly release 2.3.3+

12 years agoMerge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23...
Eloy Lafuente (stronk7) [Fri, 11 Jan 2013 11:16:51 +0000 (12:16 +0100)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

12 years agoMDL-37420 rework pg schema (partial backport take2)
Eloy Lafuente (stronk7) [Fri, 11 Jan 2013 10:36:48 +0000 (11:36 +0100)]
MDL-37420 rework pg schema (partial backport take2)

12 years agoMDL-37420 rework pg schema (partial backport of 92b00c3)
Eloy Lafuente (stronk7) [Thu, 10 Jan 2013 10:42:22 +0000 (11:42 +0100)]
MDL-37420 rework pg schema (partial backport of 92b00c3)

12 years agoMDL-37413 Use correct variable in chooserdialogue
Andrew Robert Nicols [Tue, 8 Jan 2013 08:26:59 +0000 (08:26 +0000)]
MDL-37413 Use correct variable in chooserdialogue

12 years agoMDL-35885 - Wiki - add a legend element to the search wikis form
Jason Fowler [Thu, 10 Jan 2013 05:45:13 +0000 (13:45 +0800)]
MDL-35885 - Wiki - add a legend element to the search wikis form

12 years agoMDL-32341 calendar: get_file_by_hash() expects a hash
Damyon Wiese [Fri, 11 Jan 2013 03:44:34 +0000 (11:44 +0800)]
MDL-32341 calendar: get_file_by_hash() expects a hash

12 years agoMDL-35780 Administration: email display on user profile view page will respect user...
Rajesh Taneja [Fri, 11 Jan 2013 01:33:28 +0000 (09:33 +0800)]
MDL-35780 Administration: email display on user profile view page will respect user capability

12 years agoMerge branch 'MDL-37467-blogs_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_...
Eloy Lafuente (stronk7) [Thu, 10 Jan 2013 17:13:27 +0000 (18:13 +0100)]
Merge branch 'MDL-37467-blogs_23' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

12 years agoMDL-37467 Do not provide blog posts via RSS when blogging is disabled
David Mudrák [Thu, 10 Jan 2013 15:57:10 +0000 (16:57 +0100)]
MDL-37467 Do not provide blog posts via RSS when blogging is disabled

12 years agoMerge branch 'MDL-36741_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Thu, 10 Jan 2013 10:14:07 +0000 (11:14 +0100)]
Merge branch 'MDL-36741_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

12 years agoMDL-36741 mod_forum: fixed the function forum_rss_newstuff that was using count_recor...
Mark Nelson [Thu, 10 Jan 2013 09:15:51 +0000 (17:15 +0800)]
MDL-36741 mod_forum: fixed the function forum_rss_newstuff that was using count_records_sql incorrectly as well as generating RSS content when no data exists

12 years agoMDL-36600 Add missing sesskey check when previewing the message
Andrew Robert Nicols [Wed, 9 Jan 2013 08:35:02 +0000 (08:35 +0000)]
MDL-36600 Add missing sesskey check when previewing the message

12 years agoRevert "MDL-xxxx show appropriate instance status on user enrolments page"
Dan Poltawski [Thu, 10 Jan 2013 01:40:19 +0000 (09:40 +0800)]
Revert "MDL-xxxx show appropriate instance status on user enrolments page"

This was incorrectly integrated

This reverts commit 0431cc0e16d9855b0adcc7b4612838f6407f462f.

12 years agoMDL-29534 Forum: if forum_replytouser is not set then send forum email using noreplya...
Rajesh Taneja [Tue, 8 Jan 2013 08:15:25 +0000 (16:15 +0800)]
MDL-29534 Forum: if forum_replytouser is not set then send forum email using noreplyaddress.

12 years agoMDL-29534 Forum: If forum_replytouser is not set then don't display from user email"
Isaac Marco Blancas [Tue, 8 Jan 2013 08:10:57 +0000 (16:10 +0800)]
MDL-29534 Forum: If forum_replytouser is not set then don't display from user email"

12 years agoMDL-36511 course: Save "completion starts on enrolment" disabled state
Aaron Barnes [Sun, 11 Nov 2012 11:03:52 +0000 (00:03 +1300)]
MDL-36511 course: Save "completion starts on enrolment" disabled state

12 years agoMerge branch 'wip-MDL-36367-s23' of git://github.com/phalacee/moodle into MOODLE_23_S...
Dan Poltawski [Wed, 9 Jan 2013 01:50:54 +0000 (09:50 +0800)]
Merge branch 'wip-MDL-36367-s23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'w51_MDL-37420_m23_pgschema' of git://github.com/skodak/moodle into...
Eloy Lafuente (stronk7) [Wed, 9 Jan 2013 00:33:20 +0000 (01:33 +0100)]
Merge branch 'w51_MDL-37420_m23_pgschema' of git://github.com/skodak/moodle into MOODLE_23_STABLE

12 years agoMDL-36600 user: improve course messaging checks
Andrew Robert Nicols [Tue, 8 Jan 2013 20:22:37 +0000 (09:22 +1300)]
MDL-36600 user: improve course messaging checks

12 years agoMerge branch 'w51_MDL-37152_m23_smtp' of git://github.com/skodak/moodle into MOODLE_2...
Eloy Lafuente (stronk7) [Tue, 8 Jan 2013 17:02:51 +0000 (18:02 +0100)]
Merge branch 'w51_MDL-37152_m23_smtp' of git://github.com/skodak/moodle into MOODLE_23_STABLE

12 years agoMDL-37420 add support for more PostgreSQL schemas
Petr Škoda [Tue, 8 Jan 2013 16:12:31 +0000 (17:12 +0100)]
MDL-37420 add support for more PostgreSQL schemas

12 years agoMDL-37194 activity chooser displays entire list of default activities/resources
Jerome Mouneyrac [Tue, 8 Jan 2013 08:39:55 +0000 (16:39 +0800)]
MDL-37194 activity chooser displays entire list of default activities/resources

12 years agoMerge branch 'MDL-32639-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 8 Jan 2013 06:46:34 +0000 (14:46 +0800)]
Merge branch 'MDL-32639-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

12 years agoMDL-xxxx show appropriate instance status on user enrolments page
Petr Škoda [Wed, 26 Dec 2012 16:28:09 +0000 (17:28 +0100)]
MDL-xxxx show appropriate instance status on user enrolments page

12 years agoMDL-36620 - Blog, RSS - Preventing Guests from viewing the RSS of site level blogs
Jason Fowler [Thu, 22 Nov 2012 07:44:27 +0000 (15:44 +0800)]
MDL-36620 - Blog, RSS - Preventing Guests from viewing the RSS of site level blogs

Conflicts:
blog/rsslib.php

12 years agoMDL-36335 - course: Orphaned activities no longer show a notice.
Adrian Greeve [Tue, 8 Jan 2013 04:25:09 +0000 (12:25 +0800)]
MDL-36335 - course: Orphaned activities no longer show a notice.

12 years agoMDL-36335 - course: Orphaned activities no longer show a notice.
Joseph Rézeau [Mon, 7 Jan 2013 08:07:48 +0000 (16:07 +0800)]
MDL-36335 - course: Orphaned activities no longer show a notice.

12 years agoMerge branch 'w51_MDL-37191_m23_plugindelete' of git://github.com/skodak/moodle into...
Dan Poltawski [Tue, 8 Jan 2013 03:17:05 +0000 (11:17 +0800)]
Merge branch 'w51_MDL-37191_m23_plugindelete' of git://github.com/skodak/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'MDL-31641_drag_drop_help_23' of git://github.com/davosmith/moodle into...
Dan Poltawski [Tue, 8 Jan 2013 02:54:24 +0000 (10:54 +0800)]
Merge branch 'MDL-31641_drag_drop_help_23' of git://github.com/davosmith/moodle into MOODLE_23_STABLE

12 years agoMDL-35130 shibboleth: remove hard-coded string
Charles Fulton [Wed, 29 Aug 2012 19:24:08 +0000 (12:24 -0700)]
MDL-35130 shibboleth: remove hard-coded string

12 years agoMerge branch 'MDL-36456-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 8 Jan 2013 02:31:10 +0000 (10:31 +0800)]
Merge branch 'MDL-36456-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'w51_MDL-37301_m23_coursecatinfoas' of git://github.com/skodak/moodle...
Dan Poltawski [Tue, 8 Jan 2013 02:27:12 +0000 (10:27 +0800)]
Merge branch 'w51_MDL-37301_m23_coursecatinfoas' of git://github.com/skodak/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'w51_MDL-37254_m23_courseinfoas' of git://github.com/skodak/moodle into...
Dan Poltawski [Tue, 8 Jan 2013 02:24:21 +0000 (10:24 +0800)]
Merge branch 'w51_MDL-37254_m23_courseinfoas' of git://github.com/skodak/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'wip-mdl-36958-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Sam Hemelryk [Tue, 8 Jan 2013 01:06:36 +0000 (14:06 +1300)]
Merge branch 'wip-mdl-36958-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

12 years agoMDL-36977 Be more picky when it comes to migrating files in moodle1 backups
David Mudrák [Mon, 7 Jan 2013 21:21:08 +0000 (22:21 +0100)]
MDL-36977 Be more picky when it comes to migrating files in moodle1 backups

12 years agoMDL-36977 Add more unit tests for moodle1 backup conversion
David Mudrák [Mon, 7 Jan 2013 21:20:09 +0000 (22:20 +0100)]
MDL-36977 Add more unit tests for moodle1 backup conversion

12 years agoMerge branch 'MDL-35794_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 7 Jan 2013 21:38:48 +0000 (22:38 +0100)]
Merge branch 'MDL-35794_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'MDL-35792_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 7 Jan 2013 21:36:29 +0000 (22:36 +0100)]
Merge branch 'MDL-35792_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

12 years agoMDL-36095 Section availability: Make behaviour consistent with activities
sam marshall [Wed, 17 Oct 2012 11:53:00 +0000 (12:53 +0100)]
MDL-36095 Section availability: Make behaviour consistent with activities

12 years agoMDL-31641 filemanager - display help message when drag and drop upload is not supported
Davo Smith [Tue, 18 Dec 2012 20:22:20 +0000 (20:22 +0000)]
MDL-31641 filemanager - display help message when drag and drop upload is not supported

12 years agoMDL-37157: Normalize short answers before comparison
Didier Raboud [Tue, 18 Dec 2012 13:32:15 +0000 (14:32 +0100)]
MDL-37157: Normalize short answers before comparison

This ensures that ambiguous Unicode representations can be compared sanely.
Also add some tests to ensure it keeps working.

Thanks to Tim Hunt for the syntax check.

12 years agoMerge branch 'w51_MDL-37128_m23_rssrestore' of git://github.com/skodak/moodle into...
Dan Poltawski [Mon, 7 Jan 2013 05:57:10 +0000 (13:57 +0800)]
Merge branch 'w51_MDL-37128_m23_rssrestore' of git://github.com/skodak/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'w51_MDL-36893_m23_mnetestrict' of git://github.com/skodak/moodle into...
Dan Poltawski [Mon, 7 Jan 2013 05:53:29 +0000 (13:53 +0800)]
Merge branch 'w51_MDL-36893_m23_mnetestrict' of git://github.com/skodak/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'MDL-27884-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
Dan Poltawski [Mon, 7 Jan 2013 05:30:43 +0000 (13:30 +0800)]
Merge branch 'MDL-27884-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

12 years agoMDL-37244 Assignment: Submission comments plugin does not implement comments callbacks.
Damyon Wiese [Thu, 20 Dec 2012 07:19:14 +0000 (15:19 +0800)]
MDL-37244 Assignment: Submission comments plugin does not implement comments callbacks.

This allows anyone to view or modify anyone elses submission comments.

12 years agoMDL-33340 completion: Incorrect logic in hidden field check
Ankit Agarwal [Mon, 25 Jun 2012 06:10:42 +0000 (14:10 +0800)]
MDL-33340 completion: Incorrect logic in hidden field check

Credit to Jody Steele

12 years agoMDL-35991 - use PARAM_LOCALURL for local urls
Simon Coggins [Mon, 7 Jan 2013 02:09:20 +0000 (10:09 +0800)]
MDL-35991 - use PARAM_LOCALURL for local urls

12 years agoMerge branch 'MDL-36667-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 7 Jan 2013 01:45:15 +0000 (09:45 +0800)]
Merge branch 'MDL-36667-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'MDL-37161-moodle23' of https://github.com/StudiUM/moodle into MOODLE_23...
Sam Hemelryk [Mon, 7 Jan 2013 01:14:28 +0000 (14:14 +1300)]
Merge branch 'MDL-37161-moodle23' of https://github.com/StudiUM/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'w51_MDL-36212_m23_entities' of git://github.com/skodak/moodle into...
Sam Hemelryk [Mon, 7 Jan 2013 00:44:36 +0000 (13:44 +1300)]
Merge branch 'w51_MDL-36212_m23_entities' of git://github.com/skodak/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'MDL-37068_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 7 Jan 2013 00:39:52 +0000 (13:39 +1300)]
Merge branch 'MDL-37068_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'w51_MDL-37281_m23_othersnav' of git://github.com/skodak/moodle into...
Sam Hemelryk [Mon, 7 Jan 2013 00:33:45 +0000 (13:33 +1300)]
Merge branch 'w51_MDL-37281_m23_othersnav' of git://github.com/skodak/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'MDL-36855-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
Sam Hemelryk [Sun, 6 Jan 2013 23:04:51 +0000 (12:04 +1300)]
Merge branch 'MDL-36855-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

12 years agoMDL-4781 forum: show discussion link when user has ability to view discussion
Charles Fulton [Tue, 3 Jul 2012 15:22:21 +0000 (08:22 -0700)]
MDL-4781 forum: show discussion link when user has ability to view discussion

Conflicts:
mod/forum/lib.php

12 years agoMDL-35887 course dndupload - correct default used for completion tracking when resour...
Davo Smith [Tue, 18 Dec 2012 20:46:26 +0000 (20:46 +0000)]
MDL-35887 course dndupload - correct default used for completion tracking when resources created by drag and drop

12 years agoMerge branch 'MDL-16730-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
Sam Hemelryk [Sun, 6 Jan 2013 21:14:54 +0000 (10:14 +1300)]
Merge branch 'MDL-16730-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

12 years agoMDL-37359 groups: fixing typo in the web service function create_groupings_parameters
Mark Nelson [Fri, 4 Jan 2013 07:23:12 +0000 (15:23 +0800)]
MDL-37359 groups: fixing typo in the web service function create_groupings_parameters

12 years agoMerge branch 'MDL-29327_none_23' of git://github.com/andyjdavis/moodle into MOODLE_23...
Sam Hemelryk [Sun, 6 Jan 2013 20:34:52 +0000 (09:34 +1300)]
Merge branch 'MDL-29327_none_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'MDL-36741_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 6 Jan 2013 20:15:34 +0000 (09:15 +1300)]
Merge branch 'MDL-36741_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

12 years agoMDL-37161 Backup: Database error caused by grade book settings when importing or...
Jean-Philippe Gaudreau [Fri, 4 Jan 2013 14:53:03 +0000 (09:53 -0500)]
MDL-37161 Backup: Database error caused by grade book settings when importing or restoring a course

12 years agoMDL-36712: Assignment - Do not always send feedback available emails when grade is...
Damyon Wiese [Wed, 21 Nov 2012 08:26:47 +0000 (16:26 +0800)]
MDL-36712: Assignment - Do not always send feedback available emails when grade is created

The entry in the assign_grades table contains grades feedback and other settings such as locked.
Only send the student an email about new feedback if it is actually grades or feedback that
has been added. This is done by using another state for the mailed flag (2) which means "unset".

Conflicts:

mod/assign/feedback/file/importziplib.php
mod/assign/feedback/file/locallib.php
mod/assign/feedback/offline/locallib.php
mod/assign/locallib.php

12 years agoMDL-29327 core_grade: removing some code that is messing up the categories and items...
Andrew Davis [Fri, 21 Dec 2012 03:48:54 +0000 (11:48 +0800)]
MDL-29327 core_grade: removing some code that is messing up the categories and items screen when no grade categories are used

12 years agoMDL-36855 scorm: update to api get_scorm_question_count()
Ankit Agarwal [Thu, 3 Jan 2013 06:40:03 +0000 (14:40 +0800)]
MDL-36855 scorm: update to api get_scorm_question_count()

get_scorm_question_count() should return 0 not 1 when no attempt is made in a scorm by any student

12 years agoMDL-27884 Implement proper username validation during csv import
Ankit Agarwal [Wed, 2 Jan 2013 05:59:31 +0000 (13:59 +0800)]
MDL-27884 Implement proper username validation during csv import

12 years agoMDL-27884 blocks: Correcting config title string
Ankit Agarwal [Wed, 17 Oct 2012 08:06:06 +0000 (16:06 +0800)]
MDL-27884 blocks: Correcting config title string

AMOS BEGIN
 CPY [configtitle,block_html],[configtitle,block_tags]
AMOS END

Conflicts:

blocks/tags/edit_form.php
blocks/tags/lang/en/block_tags.php

12 years agoAutomatically generated installer lang files
AMOS bot [Tue, 1 Jan 2013 00:43:01 +0000 (00:43 +0000)]
Automatically generated installer lang files

12 years agoweekly release 2.3.3+
Eloy Lafuente (stronk7) [Sun, 30 Dec 2012 00:05:13 +0000 (01:05 +0100)]
weekly release 2.3.3+

12 years agoMDL-36893 fix mnet E_STRICT issue
Petr Škoda [Thu, 27 Dec 2012 13:32:31 +0000 (14:32 +0100)]
MDL-36893 fix mnet E_STRICT issue

12 years agoMDL-37128 fix E_STRICT rss restore issue
Petr Škoda [Thu, 27 Dec 2012 12:39:09 +0000 (13:39 +0100)]
MDL-37128 fix E_STRICT rss restore issue

12 years agoMDL-37301 fix missing AS in select
Petr Škoda [Wed, 26 Dec 2012 21:25:24 +0000 (22:25 +0100)]
MDL-37301 fix missing AS in select

This was breaking pg 8.3. Credit goes to Thomas Robb, thanks.

12 years agoMerge branch 'MDL-35569-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_...
Dan Poltawski [Mon, 24 Dec 2012 03:43:41 +0000 (11:43 +0800)]
Merge branch 'MDL-35569-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'w51_MDL-37233_m23_skype' of git://github.com/skodak/moodle into MOODLE_...
Dan Poltawski [Mon, 24 Dec 2012 03:34:55 +0000 (11:34 +0800)]
Merge branch 'w51_MDL-37233_m23_skype' of git://github.com/skodak/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'wip-MDL-37290-m23' of git://github.com/samhemelryk/moodle into MOODLE_2...
Dan Poltawski [Mon, 24 Dec 2012 02:55:37 +0000 (10:55 +0800)]
Merge branch 'wip-MDL-37290-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'w51_MDL-37283_m23_spell' of git://github.com/skodak/moodle into MOODLE_...
Dan Poltawski [Mon, 24 Dec 2012 02:35:47 +0000 (10:35 +0800)]
Merge branch 'w51_MDL-37283_m23_spell' of git://github.com/skodak/moodle into MOODLE_23_STABLE

12 years agoMDL-37290 course: fixed up navbar when editing categories
Sam Hemelryk [Mon, 24 Dec 2012 00:05:56 +0000 (13:05 +1300)]
MDL-37290 course: fixed up navbar when editing categories

12 years agoMerge branch 'wip-MDL-35833-stable23' of git://github.com/phalacee/moodle into MOODLE...
Sam Hemelryk [Sun, 23 Dec 2012 22:43:37 +0000 (11:43 +1300)]
Merge branch 'wip-MDL-35833-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

12 years agoMerge branch 'MDL-36966-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 23 Dec 2012 22:16:07 +0000 (11:16 +1300)]
Merge branch 'MDL-36966-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE