Dan Poltawski [Tue, 22 Jan 2013 04:58:27 +0000 (12:58 +0800)]
Merge branch 'MDL-33206-master' of git://github.com/StudiUM/moodle
Dan Poltawski [Tue, 22 Jan 2013 04:51:51 +0000 (12:51 +0800)]
Merge branch 'MDL-27164-master' of git://github.com/micaherne/moodle
Dan Poltawski [Tue, 22 Jan 2013 04:49:18 +0000 (12:49 +0800)]
Merge branch 'master_MDL-36853' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 22 Jan 2013 04:46:09 +0000 (12:46 +0800)]
Merge branch 'MDL-37275_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 22 Jan 2013 04:43:47 +0000 (12:43 +0800)]
Merge branch 'MDL-37375' of git://github.com/rwijaya/moodle
Dan Poltawski [Tue, 22 Jan 2013 04:41:12 +0000 (12:41 +0800)]
Merge branch 'MDL-37426-m' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 22 Jan 2013 04:35:54 +0000 (12:35 +0800)]
Merge branch 'w03_MDL-37593_m25_httpslogineditor' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 22 Jan 2013 04:10:48 +0000 (12:10 +0800)]
Merge branch 'wip-MDL-37541-master' of git://github.com/marinaglancy/moodle
Conflicts:
repository/wikimedia/wikimedia.php
Dan Poltawski [Tue, 22 Jan 2013 03:53:10 +0000 (11:53 +0800)]
Merge branch 'MDL-37430-master' of github.com:damyon/moodle
Dan Poltawski [Tue, 22 Jan 2013 03:48:04 +0000 (11:48 +0800)]
Merge branch 'MDL-35357' of git://github.com/rwijaya/moodle
Dan Poltawski [Tue, 22 Jan 2013 03:40:04 +0000 (11:40 +0800)]
Merge branch 'MDL-37599' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 22 Jan 2013 03:37:24 +0000 (11:37 +0800)]
Merge branch 'MDL-37583' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 22 Jan 2013 03:35:48 +0000 (16:35 +1300)]
MDL-36621 calendar: fixed up conflict error
Sam Hemelryk [Tue, 22 Jan 2013 03:35:03 +0000 (16:35 +1300)]
Merge branch 'MDL-36621-master' of git://github.com/ankitagarwal/moodle
Conflicts:
calendar/lib.php
lib/db/caches.php
version.php
Dan Poltawski [Tue, 22 Jan 2013 03:14:19 +0000 (11:14 +0800)]
Merge branch 'MDL-37473' of git://github.com/srynot4sale/moodle
Dan Poltawski [Tue, 22 Jan 2013 03:11:53 +0000 (11:11 +0800)]
Merge branch 'MDL-17812' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 22 Jan 2013 03:08:16 +0000 (11:08 +0800)]
Merge branch 'MDL-37585' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 22 Jan 2013 02:59:26 +0000 (10:59 +0800)]
Merge branch 'MDL-37540-master' of git://github.com/damyon/moodle
Aparup Banerjee [Tue, 22 Jan 2013 02:56:06 +0000 (10:56 +0800)]
Merge branch 'MDL-37543-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 22 Jan 2013 01:39:58 +0000 (12:39 +1100)]
MDL-37541 Wikimedia allows to resize found images
Marina Glancy [Wed, 16 Jan 2013 04:19:15 +0000 (15:19 +1100)]
MDL-37541 Wikimedia returns more information about images
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 01:10:47 +0000 (02:10 +0100)]
Merge branch 'MDL-37539-master' of github.com:damyon/moodle
Dan Poltawski [Tue, 22 Jan 2013 01:05:46 +0000 (09:05 +0800)]
Merge branch 'MDL-37358-master' of git://github.com/mouneyrac/moodle
Damyon Wiese [Tue, 22 Jan 2013 01:04:13 +0000 (09:04 +0800)]
MDL-37539 assign: Fix unit test after changes to upgrade for advanced file assignments.
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 00:11:48 +0000 (01:11 +0100)]
Merge branch 'MDL-36104_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 00:05:54 +0000 (01:05 +0100)]
Merge branch 'MDL-37539-master' of github.com:damyon/moodle
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 00:02:12 +0000 (01:02 +0100)]
Merge branch 'MDL-28512' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 23:52:42 +0000 (00:52 +0100)]
Merge branch 'wip-mdl-37432' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 22:26:35 +0000 (23:26 +0100)]
Merge branch 'MDL-29749-master-4th' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 21 Jan 2013 20:10:44 +0000 (09:10 +1300)]
Merge branch 'MDL-37563-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 19:08:12 +0000 (20:08 +0100)]
Merge branch 'w03_MDL-36411_m25_setup' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 19:01:39 +0000 (20:01 +0100)]
Merge branch 'MDL-37577' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 18:41:45 +0000 (19:41 +0100)]
Merge branch 'MDL-35924_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Mon, 21 Jan 2013 15:47:18 +0000 (16:47 +0100)]
Merge branch 'MDL-34050' of git://github.com/rwijaya/moodle
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.
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
Aparup Banerjee [Mon, 21 Jan 2013 09:06:09 +0000 (17:06 +0800)]
Merge branch 'wip-MDL-37541-master' of git://github.com/marinaglancy/moodle
Tim Hunt [Fri, 18 Jan 2013 16:46:16 +0000 (16:46 +0000)]
MDL-37585 Make $DB->set_debug(true) show run time of each query.
Petr Škoda [Mon, 21 Jan 2013 08:40:15 +0000 (09:40 +0100)]
MDL-37593 use https for editor script if required
Michael de Raadt [Mon, 21 Jan 2013 07:34:26 +0000 (15:34 +0800)]
MDL-35357 Lesson Module: fixed undefined property for $answerformat
Aparup Banerjee [Mon, 21 Jan 2013 07:26:13 +0000 (15:26 +0800)]
Merge branch 'w03_MDL-37559_m25_otherusers' of git://github.com/skodak/moodle
Aparup Banerjee [Mon, 21 Jan 2013 07:05:46 +0000 (15:05 +0800)]
Merge branch 'MDL-37571' of git://github.com/tmuras/moodle
Rossiani Wijaya [Mon, 21 Jan 2013 06:59:23 +0000 (14:59 +0800)]
MDL-37375 Report: fixed blog post link from course activity report
Marina Glancy [Wed, 16 Jan 2013 04:19:15 +0000 (15:19 +1100)]
MDL-37541 Wikimedia returns more information about images
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
Aparup Banerjee [Mon, 21 Jan 2013 04:49:15 +0000 (12:49 +0800)]
Merge branch 'wip-MDL-37591_master' of git://github.com/lazydaisy/moodle
Aparup Banerjee [Mon, 21 Jan 2013 04:38:13 +0000 (12:38 +0800)]
Merge branch 'wip-MDL-37592_master' of git://github.com/lazydaisy/moodle
Andrew Davis [Thu, 10 Jan 2013 06:57:32 +0000 (14:57 +0800)]
MDL-37352 core_grade:fixed some ajax display issues
Dan Poltawski [Mon, 21 Jan 2013 03:14:38 +0000 (11:14 +0800)]
Merge branch 'MDL-37458_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 21 Jan 2013 02:53:12 +0000 (10:53 +0800)]
Merge branch 'MDL-37457_master' of git://github.com/dmonllao/moodle
Rajesh Taneja [Tue, 15 Jan 2013 08:29:16 +0000 (16:29 +0800)]
MDL-37432 Calendar: If Calendar url is invalid then remove invalid subscription
Rajesh Taneja [Tue, 15 Jan 2013 03:48:29 +0000 (11:48 +0800)]
MDL-37432 Calendar: Added check for empty calendar url
Dan Poltawski [Mon, 21 Jan 2013 02:25:42 +0000 (10:25 +0800)]
Merge branch 'MDL-30769_iframe' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 21 Jan 2013 02:15:16 +0000 (10:15 +0800)]
Merge branch 'wip-mdl-36674' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 21 Jan 2013 02:07:43 +0000 (10:07 +0800)]
Merge branch 'MDL-35074_master_2' of git://github.com/pauln/moodle
Dan Poltawski [Mon, 21 Jan 2013 02:03:34 +0000 (10:03 +0800)]
Merge branch 'MDL-37527-master' of github.com:damyon/moodle
Dan Poltawski [Mon, 21 Jan 2013 01:59:35 +0000 (09:59 +0800)]
Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle
Dan Poltawski [Mon, 21 Jan 2013 01:04:57 +0000 (09:04 +0800)]
Merge branch 'w03_MDL-36809_m25_mysqlipers' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 21 Jan 2013 01:01:00 +0000 (09:01 +0800)]
Merge branch 'master_MDL-36421' of git://github.com/danmarsden/moodle
Mary Evans [Sun, 20 Jan 2013 22:23:53 +0000 (22:23 +0000)]
MDL-37592 admin/toot/xmldb/actions/: changed all instances of generalbox class to generaltable class in twelve files as listed.
Mary Evans [Sun, 20 Jan 2013 21:52:09 +0000 (21:52 +0000)]
MDL-37591 admin/mnet: replaced generalbox class with generaltable
Sam Hemelryk [Sun, 20 Jan 2013 21:18:33 +0000 (10:18 +1300)]
Merge branch 'MDL-37295-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 20 Jan 2013 20:47:00 +0000 (09:47 +1300)]
Merge branch 'MDL-35817' of git://github.com/rwijaya/moodle
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
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.
Petr Škoda [Sat, 24 Nov 2012 09:47:28 +0000 (10:47 +0100)]
MDL-36809 add support for mysqli persistent connections
Petr Škoda [Sat, 10 Nov 2012 12:09:16 +0000 (13:09 +0100)]
MDL-36411 make sure asserts in setUp() do not cause problems
Tim Hunt [Fri, 18 Jan 2013 15:53:35 +0000 (15:53 +0000)]
MDL-17812 shortanswer qtype: rename DB stuff to match coding guidelines.
We should be leading by example in Moodle core.
Jean-Philippe Gaudreau [Fri, 18 Jan 2013 14:32:54 +0000 (09:32 -0500)]
MDL-33206 mod_book: Add a link to display the print dialog in the print book tool
Tim Hunt [Fri, 18 Jan 2013 14:43:17 +0000 (14:43 +0000)]
MDL-37583 quiz statistics report. Delete junk code.
Tim Hunt [Fri, 18 Jan 2013 12:20:10 +0000 (12:20 +0000)]
MDL-28512 qtype essay: clean up garbage qtype_essay_options rows.
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.
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
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
Dan Poltawski [Fri, 18 Jan 2013 06:28:36 +0000 (14:28 +0800)]
weekly release 2.5dev
Dan Poltawski [Fri, 18 Jan 2013 06:27:21 +0000 (14:27 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
Petr Skoda [Fri, 18 Jan 2013 03:11:49 +0000 (11:11 +0800)]
MDL-30769 - URL module: always use iframe instead of problematic object tag
David Monllao [Fri, 11 Jan 2013 09:34:24 +0000 (17:34 +0800)]
MDL-37458 testing common methods generalization
Tomasz Muras [Thu, 17 Jan 2013 22:03:27 +0000 (23:03 +0100)]
MDL-37571 Correct form element id.
Petr Škoda [Thu, 17 Jan 2013 15:38:47 +0000 (16:38 +0100)]
MDL-37429 hack around zip limitations in PHP versions < 5.3.10
Dan Poltawski [Thu, 17 Jan 2013 07:48:29 +0000 (15:48 +0800)]
MDL-31682 - fix for online text assignments
Marina Glancy [Thu, 17 Jan 2013 03:24:05 +0000 (14:24 +1100)]
MDL-37085 bug fix with glued together class names
David Monllao [Mon, 15 Oct 2012 05:00:16 +0000 (13:00 +0800)]
MDL-37458 testing tests finder externalization
Damyon Wiese [Thu, 17 Jan 2013 06:00:46 +0000 (14:00 +0800)]
MDL-37563 Assignment upgrade: Upgrade conditional activity settings.
Dan Poltawski [Thu, 17 Jan 2013 05:47:25 +0000 (13:47 +0800)]
Merge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle
Rajesh Taneja [Thu, 17 Jan 2013 05:45:01 +0000 (13:45 +0800)]
MDL-29534 Forum: Fixed userfrom reference problem
Ankit Agarwal [Thu, 17 Jan 2013 03:11:15 +0000 (11:11 +0800)]
MDL-36621 calendar: cache calendar subscriptions and showicalsource setting
Now MUC is used to cache subscription information when the constructor for an event is called, which is child of a ical subscription.
A new setting calendar_showicalsource is introduced which controls if the ical source should be displayed along with events in the calendar
Also minor changes has been done in places to make sure subscription id is always associated with ical events
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
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.
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
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.
Frederic Massart [Wed, 16 Jan 2013 07:53:10 +0000 (15:53 +0800)]
MDL-29749 files: Improved params PARAM_PATH and PARAM_FILE
The logic change here allows for multiple dots to be part
of a file name or folder name. Most Unit Tests have not
been altered and reflect the exact logic as it was before.
Ankit Agarwal [Thu, 27 Dec 2012 08:05:24 +0000 (16:05 +0800)]
MDL-36621 calendar: Display subscription info in calendar event popups
Ankit Agarwal [Thu, 27 Dec 2012 07:06:37 +0000 (15:06 +0800)]
MDL-36621 calendar: Ical event should display source info
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".
Dan Poltawski [Thu, 17 Jan 2013 02:36:10 +0000 (10:36 +0800)]
Merge branch 'wip-MDL-34398-m25-integration' of git://github.com/samhemelryk/moodle
Dan Poltawski [Thu, 17 Jan 2013 02:22:55 +0000 (10:22 +0800)]
Merge branch 'MDL-37374' of git://github.com/timhunt/moodle
Marina Glancy [Thu, 17 Jan 2013 01:45:24 +0000 (12:45 +1100)]
MDL-37085 bug fix in link for module subtypes. Thanks to Andrew Nicols
Sam Hemelryk [Thu, 20 Dec 2012 20:43:31 +0000 (09:43 +1300)]
MDL-34398 groups: implemented caching of group information.
Sam Hemelryk [Wed, 16 Jan 2013 20:15:26 +0000 (09:15 +1300)]
MDL-36035 course: fixed typo in function name
