moodle.git
8 years agoMerge branch 'MDL-34435-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Sam Hemelryk [Tue, 22 Jan 2013 22:07:40 +0000 (11:07 +1300)]
Merge branch 'MDL-34435-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

Conflicts:
version.php

8 years agoMerge branch 'wip-MDL-15930-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 19:40:56 +0000 (20:40 +0100)]
Merge branch 'wip-MDL-15930-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'wip-mdl-37339-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Aparup Banerjee [Tue, 22 Jan 2013 08:28:53 +0000 (16:28 +0800)]
Merge branch 'wip-mdl-37339-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'wip-mdl-32526-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Dan Poltawski [Tue, 22 Jan 2013 06:00:42 +0000 (14:00 +0800)]
Merge branch 'wip-mdl-32526-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-27164-MOODLE_23_STABLE' of git://github.com/micaherne/moodle into...
Dan Poltawski [Tue, 22 Jan 2013 04:52:08 +0000 (12:52 +0800)]
Merge branch 'MDL-27164-MOODLE_23_STABLE' of git://github.com/micaherne/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37275_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 22 Jan 2013 04:46:23 +0000 (12:46 +0800)]
Merge branch 'MDL-37275_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37375_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 22 Jan 2013 04:44:07 +0000 (12:44 +0800)]
Merge branch 'MDL-37375_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37430-23' of github.com:damyon/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 22 Jan 2013 03:53:57 +0000 (11:53 +0800)]
Merge branch 'MDL-37430-23' of github.com:damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-35357_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 22 Jan 2013 03:48:26 +0000 (11:48 +0800)]
Merge branch 'MDL-35357_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37599_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 22 Jan 2013 03:40:28 +0000 (11:40 +0800)]
Merge branch 'MDL-37599_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37473-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 22 Jan 2013 03:14:42 +0000 (11:14 +0800)]
Merge branch 'MDL-37473-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37540-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Aparup Banerjee [Tue, 22 Jan 2013 03:00:05 +0000 (11:00 +0800)]
Merge branch 'MDL-37540-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37543-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Aparup Banerjee [Tue, 22 Jan 2013 02:56:54 +0000 (10:56 +0800)]
Merge branch 'MDL-37543-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37355-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23...
Dan Poltawski [Tue, 22 Jan 2013 01:06:44 +0000 (09:06 +0800)]
Merge branch 'MDL-37355-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36104_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 00:20:06 +0000 (01:20 +0100)]
Merge branch 'MDL-36104_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37539-23' of github.com:damyon/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 00:06:23 +0000 (01:06 +0100)]
Merge branch 'MDL-37539-23' of github.com:damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-28512_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 00:02:34 +0000 (01:02 +0100)]
Merge branch 'MDL-28512_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMDL-37473 completion: Add missing cap checks to tracked users functions
Aaron Barnes [Fri, 11 Jan 2013 01:41:05 +0000 (14:41 +1300)]
MDL-37473 completion: Add missing cap checks to tracked users functions

Namely get_num_tracked_users and is_tracked_user()

8 years agoMerge branch 'MDL-37563-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
Sam Hemelryk [Mon, 21 Jan 2013 20:10:23 +0000 (09:10 +1300)]
Merge branch 'MDL-37563-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37577_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 19:01:56 +0000 (20:01 +0100)]
Merge branch 'MDL-37577_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-35924_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 18:44:27 +0000 (19:44 +0100)]
Merge branch 'MDL-35924_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-34050_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 15:47:45 +0000 (16:47 +0100)]
Merge branch 'MDL-34050_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

8 years agoMDL-37577 quiz overdue handling: optimise database query
Tim Hunt [Fri, 18 Jan 2013 16:43:48 +0000 (16:43 +0000)]
MDL-37577 quiz overdue handling: optimise database query

This is the standard trick of adding a redundant WHERE clause to a
subquery to help the database realise that it does not have to inspect
so many rows.

8 years agoMDL-37599 question import: add missing string.
Tim Hunt [Mon, 21 Jan 2013 12:07:47 +0000 (12:07 +0000)]
MDL-37599 question import: add missing string.

AMOS BEGIN
 MOV [matcherror,question],[invalidgrade,question]
AMOS END

8 years agoMDL-35357 Lesson Module: fixed undefined property for $answerformat
Michael de Raadt [Mon, 21 Jan 2013 07:34:26 +0000 (15:34 +0800)]
MDL-35357 Lesson Module: fixed undefined property for $answerformat

8 years agoMerge branch 'w03_MDL-37559_m23_otherusers' of git://github.com/skodak/moodle into...
Aparup Banerjee [Mon, 21 Jan 2013 07:26:51 +0000 (15:26 +0800)]
Merge branch 'w03_MDL-37559_m23_otherusers' of git://github.com/skodak/moodle into MOODLE_23_STABLE

8 years agoMDL-37375 Report: fixed blog post link from course activity report
Rossiani Wijaya [Mon, 21 Jan 2013 06:57:05 +0000 (14:57 +0800)]
MDL-37375 Report: fixed blog post link from course activity report

8 years agoMDL-36104 mod_assign: added hidden labels to the feedback input fields
Mark Nelson [Tue, 15 Jan 2013 09:03:00 +0000 (17:03 +0800)]
MDL-36104 mod_assign: added hidden labels to the feedback input fields

8 years agoMDL-37352 core_grade:fixed some ajax display issues
Andrew Davis [Thu, 10 Jan 2013 06:57:32 +0000 (14:57 +0800)]
MDL-37352 core_grade:fixed some ajax display issues

Conflicts:
grade/report/grader/styles.css

8 years agoMerge branch 'wip-mdl-36674-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Dan Poltawski [Mon, 21 Jan 2013 02:15:31 +0000 (10:15 +0800)]
Merge branch 'wip-mdl-36674-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-35074_23_2' of git://github.com/pauln/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 21 Jan 2013 02:09:07 +0000 (10:09 +0800)]
Merge branch 'MDL-35074_23_2' of git://github.com/pauln/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37527-23' of github.com:damyon/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 21 Jan 2013 02:04:04 +0000 (10:04 +0800)]
Merge branch 'MDL-37527-23' of github.com:damyon/moodle into MOODLE_23_STABLE

8 years agoMDL-37563 Assignment upgrade: Upgrade conditional activity settings.
Damyon Wiese [Thu, 17 Jan 2013 06:00:46 +0000 (14:00 +0800)]
MDL-37563 Assignment upgrade: Upgrade conditional activity settings.

Conflicts:

mod/assign/upgradelib.php

8 years agoMerge branch 'm23_MDL-36421' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 21 Jan 2013 01:01:26 +0000 (09:01 +0800)]
Merge branch 'm23_MDL-36421' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37295-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
Sam Hemelryk [Sun, 20 Jan 2013 21:18:10 +0000 (10:18 +1300)]
Merge branch 'MDL-37295-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-35817_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 20 Jan 2013 20:46:01 +0000 (09:46 +1300)]
Merge branch 'MDL-35817_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36757_hidden_23' of git://github.com/andyjdavis/moodle into MOODLE_...
Sam Hemelryk [Sun, 20 Jan 2013 20:31:12 +0000 (09:31 +1300)]
Merge branch 'MDL-36757_hidden_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

8 years agoMDL-37559 fix display of multiple roles of other users
Petr Škoda [Sat, 19 Jan 2013 15:50:38 +0000 (16:50 +0100)]
MDL-37559 fix display of multiple roles of other users

Credit goes to Tyron Delean, thanks.

8 years agoMDL-28512 qtype essay: clean up properly when a question is deleted.
Tim Hunt [Fri, 18 Jan 2013 11:27:53 +0000 (11:27 +0000)]
MDL-28512 qtype essay: clean up properly when a question is deleted.

8 years agoMDL-35924 filemanager: added label for the input field when creating a new folder
Mark Nelson [Tue, 15 Jan 2013 10:15:14 +0000 (18:15 +0800)]
MDL-35924 filemanager: added label for the input field when creating a new folder

8 years agoMDL-37275 webservices: ensure a webservice function is chosen before attempting to...
Mark Nelson [Tue, 15 Jan 2013 06:09:50 +0000 (14:09 +0800)]
MDL-37275 webservices: ensure a webservice function is chosen before attempting to add to service

8 years agoweekly release 2.3.4+
Dan Poltawski [Fri, 18 Jan 2013 06:32:02 +0000 (14:32 +0800)]
weekly release 2.3.4+

8 years agoMerge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23...
Dan Poltawski [Fri, 18 Jan 2013 06:31:25 +0000 (14:31 +0800)]
Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE

8 years agoMDL-37295 forum: Parse old log entries during restore
Ankit Agarwal [Tue, 15 Jan 2013 05:53:12 +0000 (13:53 +0800)]
MDL-37295 forum: Parse old log entries during restore

8 years agoMDL-35873 Blocks: Fixed roles icon
Rajesh Taneja [Thu, 17 Jan 2013 06:04:16 +0000 (14:04 +0800)]
MDL-35873 Blocks: Fixed roles icon

8 years agoMerge branch 'wip-mdl-29534-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Dan Poltawski [Thu, 17 Jan 2013 05:48:42 +0000 (13:48 +0800)]
Merge branch 'wip-mdl-29534-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

8 years agoMDL-29534 Forum: Fixed userfrom reference problem
Rajesh Taneja [Thu, 17 Jan 2013 05:45:01 +0000 (13:45 +0800)]
MDL-29534 Forum: Fixed userfrom reference problem

8 years agoMDL-35817 login: convert html tag to use html_writer and change <a> tag id to be...
Rossiani Wijaya [Thu, 17 Jan 2013 05:01:27 +0000 (13:01 +0800)]
MDL-35817 login: convert html tag to use html_writer and change <a> tag id to be more specific to login

8 years agoMDL-35817 Login: set page focus to error message for login error
Rossiani Wijaya [Tue, 15 Jan 2013 07:45:15 +0000 (15:45 +0800)]
MDL-35817 Login: set page focus to error message for login error

8 years agoMDL-37539 Assignment upgrade: Disable submission comments if allow notes was not...
Damyon Wiese [Thu, 17 Jan 2013 04:09:36 +0000 (12:09 +0800)]
MDL-37539 Assignment upgrade: Disable submission comments if allow notes was not enabled.

For advanced upload of files only - this setting was stored in var2.

Conflicts:

mod/assign/submission/comments/locallib.php

8 years agoMDL-37540 Assignment upgrade: Upgrade setting "Hide description before due date"
Damyon Wiese [Thu, 17 Jan 2013 03:44:57 +0000 (11:44 +0800)]
MDL-37540 Assignment upgrade: Upgrade setting "Hide description before due date"

Advanced upload of files has this setting which is stored in var3.

8 years agoMDL-35780 Administration: current user email should be always displayed on participan...
Rajesh Taneja [Thu, 17 Jan 2013 03:50:23 +0000 (11:50 +0800)]
MDL-35780 Administration: current user email should be always displayed on participants page

8 years agoMDL-36757 course: avoid accidently overwriting the hidden/visible values set on grade...
Andrew Davis [Wed, 19 Dec 2012 01:46:16 +0000 (09:46 +0800)]
MDL-36757 course: avoid accidently overwriting the hidden/visible values set on grade items

8 years agoMDL-37543 Assignment upgrade: convert advanced upload files "Send for marking" setting
Damyon Wiese [Thu, 17 Jan 2013 03:05:31 +0000 (11:05 +0800)]
MDL-37543 Assignment upgrade: convert advanced upload files "Send for marking" setting

Advanced upload files assignment type has "Enable send for marking" setting instead
of "Allow resubmissions". Needs special handling in upgrade code to convert to
"Require students click submit button".

Conflicts:

mod/assign/submission/file/locallib.php

8 years agoMerge branch 'MDL-37374_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Thu, 17 Jan 2013 02:23:15 +0000 (10:23 +0800)]
Merge branch 'MDL-37374_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMDL-37555 Apply realpath() 2 CFG->phpunit_dataroot
Eloy Lafuente (stronk7) [Wed, 16 Jan 2013 15:15:56 +0000 (16:15 +0100)]
MDL-37555 Apply realpath() 2 CFG->phpunit_dataroot

8 years agoMDL-31616 blocks: ensure showinsubcontexts is only 0 or 1 in the DB.
Tim Hunt [Wed, 16 Jan 2013 12:38:04 +0000 (12:38 +0000)]
MDL-31616 blocks: ensure showinsubcontexts is only 0 or 1 in the DB.

8 years agoMDL-37374 questions: fix property_exists calls.
Tim Hunt [Wed, 16 Jan 2013 11:13:53 +0000 (11:13 +0000)]
MDL-37374 questions: fix property_exists calls.

8 years agoMDL-32526 Course: After creating course user should be redirected to newly created...
Rajesh Taneja [Fri, 11 Jan 2013 05:07:12 +0000 (13:07 +0800)]
MDL-32526 Course: After creating course user should be redirected to newly created course

After creating a new course if user has capability to enrol users then
enrol user page should be visible else user should see newly created course

8 years agoMDL-35873 Blocks: Made alt-text on block control icons more descriptive
Rajesh Taneja [Thu, 10 Jan 2013 06:20:12 +0000 (14:20 +0800)]
MDL-35873 Blocks: Made alt-text on block control icons more descriptive

Conflicts:
lib/blocklib.php

8 years agoMDL-37527 Assignment - Change query for print_overview so it uses an index (postgres)
Damyon Wiese [Wed, 16 Jan 2013 04:26:23 +0000 (12:26 +0800)]
MDL-37527 Assignment - Change query for print_overview so it uses an index (postgres)

Reported by Mark Neilsen.

Conflicts:

mod/assign/lib.php

8 years agoMDL-31484 backup - repeated restores with anonymised users now works correctly
Davo Smith [Wed, 18 Apr 2012 10:01:30 +0000 (11:01 +0100)]
MDL-31484 backup - repeated restores with anonymised users now works correctly

8 years agoMerge branch 'MDL-36412-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_...
Dan Poltawski [Wed, 16 Jan 2013 01:57:01 +0000 (09:57 +0800)]
Merge branch 'MDL-36412-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

8 years agoMDL-37339 Administration: Unique custom profile should not be checked if it's empty.
Rajesh Taneja [Tue, 8 Jan 2013 02:25:46 +0000 (10:25 +0800)]
MDL-37339 Administration: Unique custom profile should not be checked if it's empty.

Currently we have two options for custom profile fields 'Unique' and 'Required'
If value s not entered for unique and not required field then we should allow
duplicate empty values. If value is entered then we should check for unique input.
In case field is unique and required then it should be always checked as required
field can't be empty.

8 years agoMDL-37313 question: fix trailing whitespace
Dan Poltawski [Tue, 15 Jan 2013 08:36:14 +0000 (16:36 +0800)]
MDL-37313 question: fix trailing whitespace

8 years agoMerge branch 'MDL-37313_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Dan Poltawski [Wed, 16 Jan 2013 01:40:07 +0000 (09:40 +0800)]
Merge branch 'MDL-37313_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE

8 years agoAutomatically generated installer lang files
AMOS bot [Wed, 16 Jan 2013 00:43:45 +0000 (00:43 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'wip-MDL-35818-stable23' of git://github.com/phalacee/moodle into MOODLE...
Sam Hemelryk [Tue, 15 Jan 2013 22:03:09 +0000 (11:03 +1300)]
Merge branch 'wip-MDL-35818-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37173-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_S...
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 20:56:49 +0000 (21:56 +0100)]
Merge branch 'MDL-37173-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37354-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23...
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 20:51:38 +0000 (21:51 +0100)]
Merge branch 'MDL-37354-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

8 years agoRevert "MDL-33117 grade: adding unit tests for the user report function inject_rowspa...
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 20:35:02 +0000 (21:35 +0100)]
Revert "MDL-33117 grade: adding unit tests for the user report function inject_rowspans()"

This reverts commit b65bd8b65825e1a0ef4e6dcc5280381433930495.

8 years agoRevert "MDL-33117 Whitespace fixes"
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 20:34:41 +0000 (21:34 +0100)]
Revert "MDL-33117 Whitespace fixes"

This reverts commit 5696c69b3b3e18d1198cc6c0fb5683134d16e374.

8 years agoMerge branch 'MDL-31616_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 19:16:29 +0000 (20:16 +0100)]
Merge branch 'MDL-31616_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'wip-mdl-37062-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 19:06:26 +0000 (20:06 +0100)]
Merge branch 'wip-mdl-37062-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE

8 years agoNOBUG: 1 more whitespace, was hurting my eyes all the time.
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 18:19:04 +0000 (19:19 +0100)]
NOBUG: 1 more whitespace, was hurting my eyes all the time.

8 years agoMDL-33117 Whitespace fixes
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 18:09:57 +0000 (19:09 +0100)]
MDL-33117 Whitespace fixes

8 years agoMerge branch 'MDL-34883_unit_tests_23' of git://github.com/andyjdavis/moodle into...
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 17:21:35 +0000 (18:21 +0100)]
Merge branch 'MDL-34883_unit_tests_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37395-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_...
Eloy Lafuente (stronk7) [Tue, 15 Jan 2013 17:17:33 +0000 (18:17 +0100)]
Merge branch 'MDL-37395-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

8 years agoMDL-34612 Grade condition range validation allows impossible conditions
sam marshall [Wed, 7 Nov 2012 10:54:23 +0000 (10:54 +0000)]
MDL-34612 Grade condition range validation allows impossible conditions

8 years agoMDL-36421 SCORM: fix SCORM course format new window popups
Ben Johnson [Tue, 15 Jan 2013 08:42:56 +0000 (21:42 +1300)]
MDL-36421 SCORM: fix SCORM course format new window popups

8 years agoMerge branch 'MDL-37162_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 15 Jan 2013 05:34:02 +0000 (13:34 +0800)]
Merge branch 'MDL-37162_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-37374_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 15 Jan 2013 04:59:54 +0000 (12:59 +0800)]
Merge branch 'MDL-37374_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

8 years agoMDL-30316 - Libraries - improving pagination output to allow a shifting start page...
Jason Fowler [Wed, 29 Aug 2012 03:25:20 +0000 (11:25 +0800)]
MDL-30316 - Libraries - improving pagination output to allow a shifting start page for displays of less than 18 pages -- original code provided by Martha (martha dot morelos at gmail dot com)

8 years agoMerge branch 'MDL-29835_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 15 Jan 2013 04:42:09 +0000 (12:42 +0800)]
Merge branch 'MDL-29835_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE

8 years agoMerge branch 'MDL-36616-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 15 Jan 2013 03:48:30 +0000 (11:48 +0800)]
Merge branch 'MDL-36616-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

8 years agoMDL-34050 Lesson Module: Fixed spacing and removed array_unique() for responses
Rossiani Wijaya [Tue, 15 Jan 2013 03:17:55 +0000 (11:17 +0800)]
MDL-34050 Lesson Module: Fixed spacing and removed array_unique() for responses

8 years agoMDL-37430 Course - Make modules created in hidden sections visible when section is...
Damyon Wiese [Wed, 9 Jan 2013 05:32:48 +0000 (13:32 +0800)]
MDL-37430 Course - Make modules created in hidden sections visible when section is made visible.

Conflicts:

course/lib.php

8 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

8 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

8 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

8 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

8 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

8 years agoMDL-36674 Administration: out_as_local_url will check for both http and https url's
Rajesh Taneja [Mon, 19 Nov 2012 03:52:15 +0000 (11:52 +0800)]
MDL-36674 Administration: out_as_local_url will check for both http and https url's

out_as_local_url will first check if url passed in wwwroot, if it's not then it will check
if loginhttps is enabled and url is httpswwwroot

8 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

8 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.

8 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

8 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

8 years agoMDL-15930 - admin: reorganize logic to allow ->fullnamedisplay to be used as default...
Anthony Borrow [Thu, 3 Jan 2013 03:03:06 +0000 (11:03 +0800)]
MDL-15930 - admin: reorganize logic to allow ->fullnamedisplay to be used as default sort.

8 years agoMDL-35818 - Enrolment - Changing all enrolment method icon alt text attributes to...
Jason Fowler [Fri, 7 Dec 2012 06:25:24 +0000 (14:25 +0800)]
MDL-35818 - Enrolment - Changing all enrolment method icon alt text attributes to include the name of the course

8 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