Eloy Lafuente (stronk7) [Tue, 5 Mar 2013 15:45:01 +0000 (16:45 +0100)]
Merge branch 'MDL-38119' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 5 Mar 2013 14:43:15 +0000 (15:43 +0100)]
Merge branch 'MDL-38271_master' of git://github.com/dmonllao/moodle
Aparup Banerjee [Tue, 5 Mar 2013 09:14:02 +0000 (17:14 +0800)]
Merge branch 'MDL-38209' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 5 Mar 2013 09:07:50 +0000 (17:07 +0800)]
Merge branch 'MDL-38072' of git://github.com/lazydaisy/moodle
Aparup Banerjee [Tue, 5 Mar 2013 09:01:54 +0000 (17:01 +0800)]
Merge branch 'wip-MDL-34775-master' of git://github.com/phalacee/moodle
Frederic Massart [Wed, 27 Feb 2013 06:30:03 +0000 (14:30 +0800)]
MDL-37852 phpunit: Tests for repository::can_be_edited_by_user()
Frederic Massart [Wed, 27 Feb 2013 00:43:17 +0000 (08:43 +0800)]
MDL-37852 repository: Prevent undesired access to repositories settings
David Monllao [Tue, 5 Mar 2013 08:11:15 +0000 (16:11 +0800)]
MDL-38007 behat: Refining error texts
Also removing a couple of silly notices
Damyon Wiese [Tue, 5 Mar 2013 08:06:31 +0000 (16:06 +0800)]
Merge branch 'MDL-38282' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 5 Mar 2013 08:00:49 +0000 (16:00 +0800)]
Merge branch 'MDL-38240' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 5 Mar 2013 07:22:38 +0000 (15:22 +0800)]
Merge branch 'MDL-38279' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 5 Mar 2013 07:10:52 +0000 (15:10 +0800)]
Merge branch 'MDL-38178_master' of git://github.com/dmonllao/moodle
Aparup Banerjee [Tue, 5 Mar 2013 06:43:46 +0000 (14:43 +0800)]
Merge branch 'MDL-38025_master' of git://github.com/dmonllao/moodle
David Monllao [Mon, 25 Feb 2013 04:50:21 +0000 (12:50 +0800)]
MDL-38178 behat: New tests for fieldsets expansion
David Monllao [Mon, 25 Feb 2013 04:49:56 +0000 (12:49 +0800)]
MDL-38178 behat: Adding find_all and step to expand all form's fieldsets
Aparup Banerjee [Tue, 5 Mar 2013 06:37:05 +0000 (14:37 +0800)]
Merge branch 'MDL-38007_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Tue, 5 Mar 2013 06:13:42 +0000 (14:13 +0800)]
Merge branch 'MDL-38241' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 5 Mar 2013 06:10:00 +0000 (14:10 +0800)]
Merge branch 'MDL-38280' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 5 Mar 2013 05:12:12 +0000 (13:12 +0800)]
Merge branch 'wip-MDL-37903-m25' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Tue, 5 Mar 2013 05:09:37 +0000 (13:09 +0800)]
Merge branch 'wip-MDL-38251-m25' of git://github.com/samhemelryk/moodle
Damyon Wiese [Tue, 5 Mar 2013 05:06:49 +0000 (13:06 +0800)]
MDL-37935: Cache - fix spelling mistake in language string
Damyon Wiese [Tue, 5 Mar 2013 05:05:57 +0000 (13:05 +0800)]
Merge branch 'wip-MDL-37935-m25' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Tue, 5 Mar 2013 04:55:41 +0000 (12:55 +0800)]
Merge branch 'MDL-30481' of git://github.com/rwijaya/moodle
Sam Hemelryk [Tue, 5 Mar 2013 03:57:50 +0000 (16:57 +1300)]
Merge branch 'MDL-38094' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 5 Mar 2013 03:42:25 +0000 (11:42 +0800)]
Merge branch 'wip-MDL-38055-m25' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Tue, 5 Mar 2013 03:13:33 +0000 (11:13 +0800)]
Merge branch 'MDL-36171-m' of git://github.com/andrewnicols/moodle
Aparup Banerjee [Tue, 5 Mar 2013 03:06:55 +0000 (11:06 +0800)]
Merge branch 'MDL-38067-m' of git://github.com/andrewnicols/moodle
Aparup Banerjee [Tue, 5 Mar 2013 02:37:33 +0000 (10:37 +0800)]
Merge branch 'MDL-34300-m' of git://github.com/andrewnicols/moodle
Frederic Massart [Mon, 11 Feb 2013 07:20:11 +0000 (15:20 +0800)]
MDL-34284 library: Import ZF2012-01 security patch for Zend
Sam Hemelryk [Tue, 5 Mar 2013 02:30:45 +0000 (15:30 +1300)]
Merge branch 'MDL-37932' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 5 Mar 2013 02:15:24 +0000 (15:15 +1300)]
Merge branch 'wip-MDL-37901_master' of git://github.com/gjb2048/moodle
Aparup Banerjee [Tue, 5 Mar 2013 02:21:25 +0000 (10:21 +0800)]
Merge branch 'MDL-33946_label_dndupload_text' of git://github.com/davosmith/moodle
Sam Hemelryk [Tue, 5 Mar 2013 02:12:08 +0000 (15:12 +1300)]
Merge branch 'MDL-38298' of git://github.com/stronk7/moodle
Sam Hemelryk [Tue, 5 Mar 2013 01:11:35 +0000 (14:11 +1300)]
MDL-37127 js: fixed indentation of tooltip.js
Sam Hemelryk [Tue, 5 Mar 2013 00:54:10 +0000 (13:54 +1300)]
Merge branch 'MDL-37127-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 5 Mar 2013 00:27:50 +0000 (01:27 +0100)]
Merge branch 'wip-MDL-36215-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 5 Mar 2013 00:21:47 +0000 (01:21 +0100)]
Merge branch 'wip-MDL-38300-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 5 Mar 2013 00:08:23 +0000 (01:08 +0100)]
Merge branch 'wip-MDL-38247-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 5 Mar 2013 00:03:26 +0000 (01:03 +0100)]
Merge branch 'm25_MDL-37515_Notice_when_submitting_change_password_form' of https://github.com/scara/moodle
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 23:56:24 +0000 (00:56 +0100)]
Merge branch 'MDL-37897' of git://github.com/jmvedrine/moodle
Conflicts:
lib/db/upgrade.php
version.php
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 23:48:47 +0000 (00:48 +0100)]
Merge branch 'MDL-38261-workshop-attachments-size' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 23:46:12 +0000 (00:46 +0100)]
Merge branch 'master_MDL-37907' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 22:44:39 +0000 (23:44 +0100)]
MDL-32975 mini-bump to get navsortmycoursessort defined.
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 22:03:46 +0000 (23:03 +0100)]
Merge branch 'wip-MDL-32975-m25' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Mon, 18 Feb 2013 23:12:24 +0000 (12:12 +1300)]
MDL-32975 navigation: Added option to select how my courses are sorted
Sam Hemelryk [Mon, 4 Mar 2013 20:30:02 +0000 (09:30 +1300)]
Merge branch 'MDL-38101-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 4 Mar 2013 20:24:19 +0000 (09:24 +1300)]
MDL-31983 navigation: fixed copy+paste typo
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 19:46:41 +0000 (20:46 +0100)]
Merge branch 'MDL-37522-published-attachment' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 19:37:57 +0000 (20:37 +0100)]
Merge branch 'MDL-38133-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 19:18:48 +0000 (20:18 +0100)]
Merge branch 'wip-MDL-33013-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 17:18:09 +0000 (18:18 +0100)]
MDL-31390 document the set_source_table() api change.
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 17:08:54 +0000 (18:08 +0100)]
Merge branch 'MDL-31390-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 16:59:39 +0000 (17:59 +0100)]
Merge branch 'MDL-36380-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 15:42:25 +0000 (16:42 +0100)]
Merge branch 'wip-MDL-37983-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 15:25:00 +0000 (16:25 +0100)]
Merge branch 'MDL-38170-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 4 Mar 2013 03:25:50 +0000 (16:25 +1300)]
Merge branch 'MDL-38243-master' of git://github.com/lucisgit/moodle
Sam Hemelryk [Mon, 4 Mar 2013 03:13:09 +0000 (16:13 +1300)]
Merge branch 'MDL-35350' of git://github.com/rwijaya/moodle
Sam Hemelryk [Mon, 4 Mar 2013 03:08:08 +0000 (16:08 +1300)]
Merge branch 'MDL-35127-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 02:01:11 +0000 (03:01 +0100)]
Merge branch 'wip-MDL-38205-m25' of git://github.com/samhemelryk/moodle
Frederic Massart [Mon, 4 Feb 2013 06:58:46 +0000 (14:58 +0800)]
MDL-36426 repository: Prevent login_as() users to access private repositories
Sam Hemelryk [Mon, 4 Mar 2013 01:35:59 +0000 (14:35 +1300)]
Merge branch 'MDL-31557_master' of git://github.com/markn86/moodle
Conflicts:
lib/db/upgrade.php
version.php
Sam Hemelryk [Mon, 4 Mar 2013 01:18:49 +0000 (14:18 +1300)]
Merge branch 'MDL-37625-master' of https://github.com/jfilip/moodle
Sam Hemelryk [Mon, 4 Mar 2013 00:59:58 +0000 (13:59 +1300)]
Merge branch 'MDL-36128-master' of https://github.com/StudiUM/moodle
Frederic Massart [Mon, 4 Mar 2013 00:45:32 +0000 (13:45 +1300)]
MDL-37681 repository_webdav: improved form handling when configuring an instance
Rajesh Taneja [Mon, 14 Jan 2013 06:29:08 +0000 (14:29 +0800)]
MDL-37338 Calendar: User will not see calendar subscription, which he/she can't edit
Signed-off-by: Rajesh Taneja <rajesh@moodle.com>
Sam Hemelryk [Mon, 4 Mar 2013 00:35:16 +0000 (13:35 +1300)]
Merge branch 'MDL-38168-master' of git://github.com/sammarshallou/moodle
Frederic Massart [Mon, 4 Mar 2013 00:25:17 +0000 (13:25 +1300)]
MDL-37507 repositories: improved formatting of external resources
Mark Nielsen [Sun, 3 Mar 2013 22:52:09 +0000 (23:52 +0100)]
MDL-36901: Remove system paths from exceptions
Replaces any server paths, like dataroot, with a token
in exception messages and debug info.
Dan Marsden [Sun, 10 Feb 2013 20:52:35 +0000 (09:52 +1300)]
MDL-37907 Participants layout - move checkbox to first column
Frederic Massart [Sun, 3 Mar 2013 22:17:14 +0000 (11:17 +1300)]
MDL-37481 user: fixed bug when logged in as guest
Eloy Lafuente (stronk7) [Sun, 3 Mar 2013 22:07:05 +0000 (23:07 +0100)]
Merge branch 'wip-MDL-38165-m25' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Sun, 3 Mar 2013 21:37:51 +0000 (10:37 +1300)]
Merge branch 'MDL-32125-master' of git://github.com/StudiUM/moodle
Sam Hemelryk [Sun, 3 Mar 2013 20:31:35 +0000 (09:31 +1300)]
MDL-38055 block_courseoverview: fixed formatting of course fullname
Eloy Lafuente (stronk7) [Sun, 3 Mar 2013 18:10:09 +0000 (19:10 +0100)]
MDL-38298 Take out harcoded dependency + tests.
With that change the filte_emoticon will be easily
resusable by other "emoticon filters".
Andrew Davis [Tue, 26 Feb 2013 03:07:19 +0000 (11:07 +0800)]
MDL-38149 core_grade: added a guard for when there are no old grades
Gareth J Barnard [Sat, 2 Mar 2013 12:38:29 +0000 (12:38 +0000)]
MDL-37901 format_topics & format_weeks: Fix drag icon tooltip after move.
Tim Hunt [Fri, 1 Mar 2013 17:33:32 +0000 (17:33 +0000)]
MDL-39282 quiz: always allow removal of bogus questions.
Tim Hunt [Fri, 1 Mar 2013 17:04:04 +0000 (17:04 +0000)]
MDL-38280 manual graded behaviour: unit test for when not answered.
If the student does not submit an answer, the questoin goes to state
gaveup, rather than requiresgrading.
Tim Hunt [Fri, 1 Mar 2013 15:21:09 +0000 (15:21 +0000)]
MDL-38279 questions: must have default mark positive.
Tim Hunt [Thu, 7 Feb 2013 20:44:17 +0000 (20:44 +0000)]
MDL-37932 formslib: setAdvanced for repeatelements.
I think this commit also fixes some other problems with repeatelements
and shortforms. The shortforms code was trying to use hidden elements
with names like in conjunction with ...[0] with optional_param which
will not work. Hidden form fields that relate to other parts of the form
must use the other elements's id, no name, to make the hidden field
name.
Andrew Robert Nicols [Tue, 29 Jan 2013 17:05:36 +0000 (17:05 +0000)]
MDL-31390 Convert set_source_sql with order clauses to set_source_table
sam marshall [Tue, 19 Feb 2013 16:54:13 +0000 (16:54 +0000)]
MDL-38101 Completion: Error when teacher/admin marks activity complete
sam marshall [Fri, 22 Feb 2013 17:23:01 +0000 (17:23 +0000)]
MDL-38170 SimplePie: Cannot read https feeds through proxy
Andrew Robert Nicols [Thu, 26 Jan 2012 15:32:30 +0000 (15:32 +0000)]
MDL-31390 Allow data to be sorted at backup
David Monllao [Thu, 21 Feb 2013 04:12:57 +0000 (12:12 +0800)]
MDL-38026 behat: New tests
David Monllao [Thu, 21 Feb 2013 04:08:46 +0000 (12:08 +0800)]
MDL-38026 behat: Base to write steps to work with specific DOM parts
David Monllao [Mon, 18 Feb 2013 09:00:20 +0000 (17:00 +0800)]
MDL-38025 behat: Compliant with moodlechecker and codechecker
David Monllao [Mon, 18 Feb 2013 08:08:21 +0000 (16:08 +0800)]
MDL-38025 behat: Updating tests according to modified steps
David Monllao [Mon, 18 Feb 2013 08:06:24 +0000 (16:06 +0800)]
MDL-38025 behat: Adding generic manipulation methods
Also required modifications in the affected
steps definitions
David Monllao [Mon, 18 Feb 2013 07:22:33 +0000 (15:22 +0800)]
MDL-38025 behat: Replacing selector-based steps by human-friendly options
David Monllao [Fri, 1 Mar 2013 03:39:42 +0000 (11:39 +0800)]
MDL-38271 behat: Adds site shortname
David Monllao [Tue, 19 Feb 2013 09:58:58 +0000 (17:58 +0800)]
MDL-38007 behat: Adding new script using util.php
David Monllao [Tue, 19 Feb 2013 09:58:22 +0000 (17:58 +0800)]
MDL-38007 behat: Changing check_behat_setup interface
Andrew Robert Nicols [Tue, 19 Feb 2013 13:52:00 +0000 (13:52 +0000)]
MDL-37127 JavaScript: Switch moodle-core-tooltip to shifter
Andrew Robert Nicols [Thu, 6 Dec 2012 11:53:07 +0000 (11:53 +0000)]
MDL-37127 JavaScript: Add support for development using YUI Shifter
Sam Hemelryk [Thu, 28 Feb 2013 22:37:27 +0000 (11:37 +1300)]
MDL-38165 cache: fixed issues purging peristent caches by event
Sam Hemelryk [Thu, 28 Feb 2013 22:36:49 +0000 (11:36 +1300)]
MDL-38165 cache: added unit tests for event purging of persistent caches
Davo Smith [Fri, 4 Jan 2013 16:13:52 +0000 (16:13 +0000)]
MDL-33946 mod_label - create label from text dragged and dropped into the course
Sam Hemelryk [Thu, 28 Feb 2013 03:41:34 +0000 (16:41 +1300)]
MDL-38251 course: fixed add category button on top level
Sam Hemelryk [Thu, 28 Feb 2013 02:22:01 +0000 (15:22 +1300)]
MDL-38247 cache: Improved documentation
