Aaron Barnes [Wed, 4 Sep 2013 08:35:50 +0000 (20:35 +1200)]
MDL-41592 behat: Allow alt wwwroot to be set for acceptance testing
To set add $CFG->behat_wwwroot = 'http://alturl'; in your config.php
Dan Poltawski [Fri, 29 Nov 2013 04:52:39 +0000 (12:52 +0800)]
weekly release 2.7dev
Dan Poltawski [Fri, 29 Nov 2013 04:52:35 +0000 (12:52 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Eloy Lafuente (stronk7) [Thu, 28 Nov 2013 11:44:04 +0000 (12:44 +0100)]
Merge branch 'MDL-42957-master' of https://github.com/jamiepratt/moodle
Conflicts:
question/classes/statistics/questions/calculator.php
question/classes/statistics/responses/analyser.php
James Pratt [Thu, 28 Nov 2013 10:57:02 +0000 (17:57 +0700)]
MDL-42957 (3) quiz statistics : removing assertEquals(time(), ..) tests
James Pratt [Thu, 28 Nov 2013 10:13:26 +0000 (17:13 +0700)]
MDL-42957 (2) quiz statistics : Hardcoded sql LIMIT clause
Fixing some typos and adding some tests.
AMOS bot [Thu, 28 Nov 2013 09:12:39 +0000 (09:12 +0000)]
Automatically generated installer lang files
Dan Poltawski [Wed, 27 Nov 2013 03:33:11 +0000 (11:33 +0800)]
MDL-42942 behat: increment version
Dan Poltawski [Wed, 27 Nov 2013 03:32:23 +0000 (11:32 +0800)]
Merge branch 'MDL-42942_master' of git://github.com/dmonllao/moodle
AMOS bot [Wed, 27 Nov 2013 00:48:23 +0000 (00:48 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Tue, 26 Nov 2013 23:36:02 +0000 (12:36 +1300)]
Merge branch 'wip-MDL-42508-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 26 Nov 2013 20:27:35 +0000 (21:27 +0100)]
Merge branch 'master_MDL-43045' of git://github.com/totara/moodle
Damyon Wiese [Tue, 26 Nov 2013 08:56:20 +0000 (16:56 +0800)]
Merge branch 'wip-MDL-43008-master' of git://github.com/abgreeve/moodle
Adrian Greeve [Thu, 21 Nov 2013 09:14:07 +0000 (17:14 +0800)]
MDL-43008 calendar: Allow calendar plugins to display setting pages.
Dan Poltawski [Tue, 26 Nov 2013 07:05:42 +0000 (15:05 +0800)]
Merge branch 'MDL-43000' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 26 Nov 2013 06:52:21 +0000 (14:52 +0800)]
Merge branch 'MDL-40741_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 26 Nov 2013 06:48:21 +0000 (14:48 +0800)]
Merge branch 'MDL-42851' of git://github.com/rwijaya/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Tue, 26 Nov 2013 05:24:02 +0000 (13:24 +0800)]
Merge branch 'wip-MDL-43006-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 26 Nov 2013 04:09:45 +0000 (12:09 +0800)]
Merge branch 'MDL-42733_master' of git://github.com/dmonllao/moodle
David Monllao [Mon, 5 Aug 2013 05:02:06 +0000 (13:02 +0800)]
MDL-40741 behat: Changing xpaths for clean theme
Keeps compatibility with standard theme.
Damyon Wiese [Tue, 26 Nov 2013 02:49:32 +0000 (10:49 +0800)]
Merge branch 'master-mdl42998' of https://github.com/tlock/moodle
David Monllao [Wed, 20 Nov 2013 05:37:26 +0000 (13:37 +0800)]
MDL-42842 behat: Adding a new formatter
Based on ProgressFormatter, the site info
will be displayed when the suite begins.
David Monllao [Wed, 20 Nov 2013 05:31:06 +0000 (13:31 +0800)]
MDL-42842 testing: Generalization of the site info
Dan Poltawski [Tue, 26 Nov 2013 02:42:04 +0000 (10:42 +0800)]
Merge branch 'MDL-43050_master' of git://github.com/dmonllao/moodle
David Monllao [Mon, 25 Nov 2013 07:48:04 +0000 (15:48 +0800)]
MDL-43050 behat: Fixing moodlehq/behat-extension version
Dan Poltawski [Tue, 26 Nov 2013 02:24:59 +0000 (10:24 +0800)]
Merge branch 'wip-mdl-41635' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 26 Nov 2013 01:29:44 +0000 (09:29 +0800)]
Merge branch 'wip-MDL-40850-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 25 Nov 2013 19:42:25 +0000 (08:42 +1300)]
Merge branch 'MDL-43005-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 25 Nov 2013 19:36:36 +0000 (08:36 +1300)]
Merge branch 'MDL-43037_master' of https://github.com/markn86/moodle
Simon Coggins [Mon, 25 Nov 2013 03:25:51 +0000 (16:25 +1300)]
MDL-43045 report: Fix missing role name in security overview report
Dan Poltawski [Mon, 25 Nov 2013 07:43:44 +0000 (15:43 +0800)]
Merge branch 'wip-MDL-42925-master' of git://github.com/marinaglancy/moodle
rwijaya [Mon, 25 Nov 2013 07:35:26 +0000 (15:35 +0800)]
MDL-42858 Course Management: Update phpunit test for core_course_management_helper_test
Damyon Wiese [Mon, 25 Nov 2013 06:52:26 +0000 (14:52 +0800)]
Merge branch 'MDL-42985-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 25 Nov 2013 06:04:05 +0000 (14:04 +0800)]
Merge branch 'MDL-41257-Calendar-Day-and-Upcoming-Events-View-not-processed-through-text-filters' of git://github.com/michael-milette/moodle
Dan Poltawski [Mon, 25 Nov 2013 05:40:54 +0000 (13:40 +0800)]
Merge branch 'w48_MDL-37016_m27_sloppymysql' of https://github.com/skodak/moodle
Damyon Wiese [Mon, 25 Nov 2013 05:16:04 +0000 (13:16 +0800)]
Merge branch 'wip-mdl-42924' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Mon, 25 Nov 2013 05:11:24 +0000 (13:11 +0800)]
Merge branch 'MDL-42913a' of https://github.com/srynot4sale/moodle
Dan Poltawski [Mon, 25 Nov 2013 04:21:20 +0000 (12:21 +0800)]
Merge branch '43016-27' of git://github.com/samhemelryk/moodle
Marina Glancy [Mon, 25 Nov 2013 03:59:28 +0000 (14:59 +1100)]
MDL-43006 behat: adding javascript tag because of behat bug
behat without JS does not submit the empty textarea field causing notice in the form processing
Dan Poltawski [Mon, 25 Nov 2013 03:17:47 +0000 (11:17 +0800)]
Merge branch 'master_MDL-42992' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 25 Nov 2013 03:06:39 +0000 (11:06 +0800)]
Merge branch 'wip-MDL-43024-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 25 Nov 2013 02:48:33 +0000 (10:48 +0800)]
Merge branch 'MDL-42858' of git://github.com/rwijaya/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
James Pratt [Tue, 19 Nov 2013 14:11:50 +0000 (21:11 +0700)]
MDL-42957 quiz statistics : Hardcoded sql LIMIT clause
Dan Poltawski [Mon, 25 Nov 2013 02:37:33 +0000 (10:37 +0800)]
Merge branch 'MDL-42547_master' of https://github.com/markn86/moodle
Petr Škoda [Thu, 21 Nov 2013 01:44:41 +0000 (09:44 +0800)]
MDL-37016 fix sloppy mysql nulls in event.uuid
Mark Nelson [Sat, 23 Nov 2013 23:06:58 +0000 (15:06 -0800)]
MDL-43037 mod_quiz: retrieve all name fields for the user override pages
Tim Hunt [Fri, 22 Nov 2013 11:29:56 +0000 (11:29 +0000)]
MDL-43000 shortanswer qtype: handle patterns with many *s
Teachers were typing patterns like
********************************<em>****************************</em>
which translates into a pattern like .*.*.*.*, which is very inefficient
to try to match, althought it is equivalent ot a single .*. At a certain
point preg was just giving up.
Since people actually do this, we should simplify the regex by treating
runs of * like a single *.
Marina Glancy [Fri, 22 Nov 2013 04:23:52 +0000 (15:23 +1100)]
MDL-42508 folder: add module generator
rwijaya [Wed, 13 Nov 2013 09:38:09 +0000 (17:38 +0800)]
MDL-42851 frontpage: fix rtl in clean theme for course listings
Marina Glancy [Tue, 19 Nov 2013 03:50:21 +0000 (14:50 +1100)]
MDL-42508 imspcp: add module generator
Marina Glancy [Tue, 19 Nov 2013 03:49:45 +0000 (14:49 +1100)]
MDL-42508 scorm: add module generator
Marina Glancy [Fri, 22 Nov 2013 01:39:55 +0000 (12:39 +1100)]
MDL-43024 course: fixed bug for accessing section options
Sam Hemelryk [Thu, 21 Nov 2013 19:55:39 +0000 (08:55 +1300)]
MDL-43016 block_navigation: fixed category link display
Eloy Lafuente (stronk7) [Thu, 21 Nov 2013 18:33:52 +0000 (19:33 +0100)]
weekly on-sync release 2.7dev
Eloy Lafuente (stronk7) [Thu, 21 Nov 2013 18:33:47 +0000 (19:33 +0100)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
rwijaya [Thu, 21 Nov 2013 07:32:50 +0000 (15:32 +0800)]
MDL-42858 Course Management: fix regression for subcategories visibility
David Monllao [Thu, 21 Nov 2013 06:34:56 +0000 (14:34 +0800)]
MDL-42733 behat: Removing the restriction of an started output to handle the PHP errors
Ankit Agarwal [Thu, 21 Nov 2013 05:36:48 +0000 (13:36 +0800)]
MDL-43005 blogs: Fix issues with blog tags
Marina Glancy [Thu, 21 Nov 2013 02:29:31 +0000 (13:29 +1100)]
MDL-42925 course: Changed help string for course format selection
Frederic Massart [Wed, 20 Nov 2013 07:54:01 +0000 (15:54 +0800)]
MDL-42985 curl: Correctly apply rule proxybypass
Marina Glancy [Thu, 21 Nov 2013 00:55:20 +0000 (11:55 +1100)]
MDL-40850 editor: Manage files popup correctly sets the course/cm context
Tim Lock [Wed, 20 Nov 2013 22:47:04 +0000 (09:17 +1030)]
MDL-42998: Fix user selection search options autoselectunique.
Dan Marsden [Wed, 20 Nov 2013 21:18:43 +0000 (10:18 +1300)]
MDL-42992 SCORM: Always allow IE to resize window
James Pratt [Wed, 20 Nov 2013 04:33:49 +0000 (11:33 +0700)]
Merge branch 'MDL-42957-26' into MDL-42957-master
James Pratt [Tue, 19 Nov 2013 14:11:50 +0000 (21:11 +0700)]
MDL-42957 quiz statistics : Hardcoded sql LIMIT clause
Damyon Wiese [Wed, 20 Nov 2013 03:47:35 +0000 (11:47 +0800)]
MDL-42930 Release upgrade line: Fix ordering for tinymce
FilipBenco [Tue, 8 Oct 2013 19:19:16 +0000 (21:19 +0200)]
MDL-41635 Reports: Added missing string in loglive reports
Under course administration navigation log live doesn't appear
or appear with empty string (in some themes), this is happening
because text passed is empty.
Marina Glancy [Wed, 20 Nov 2013 02:20:17 +0000 (13:20 +1100)]
Merge branch 'MDL-42767-master' of git://github.com/ankitagarwal/moodle
Aaron Barnes [Fri, 15 Nov 2013 00:34:06 +0000 (13:34 +1300)]
MDL-42913 lib/grouplib.php: Avoid cache sometimes for groups_get_all_groups
The new groups cache returns unexpected results when you pass
in a field parameter than would normally change the result array index
Michael Milette [Tue, 19 Nov 2013 13:33:04 +0000 (08:33 -0500)]
MDL-41257 calendar: Day and Upcoming-Events view not processed through text_filters() function
This fix adds text filtering to the Calendar Day view and Upcoming Events view, specifically the event name and event description.
Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>
Ankit Agarwal [Tue, 19 Nov 2013 08:34:49 +0000 (16:34 +0800)]
MDL-42767 events: Remove ob_clean from tests
Ankit Agarwal [Fri, 8 Nov 2013 06:26:02 +0000 (14:26 +0800)]
MDL-42767 notes: Delete notes on a course delete
Mark Nelson [Thu, 14 Nov 2013 01:25:48 +0000 (17:25 -0800)]
MDL-42547 tool_uploaduser: trim values before uploading users
Rajesh Taneja [Tue, 19 Nov 2013 03:51:20 +0000 (11:51 +0800)]
MDL-42924 Administration: use normalize_component to extract plugin name and type
Dan Poltawski [Tue, 19 Nov 2013 03:43:39 +0000 (11:43 +0800)]
Merge branch 'wip-mdl-42403' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Thu, 31 Oct 2013 05:27:47 +0000 (13:27 +0800)]
MDL-42403 course: Added behat to check visibility of bluk move action
Rajesh Taneja [Wed, 30 Oct 2013 06:56:27 +0000 (14:56 +0800)]
MDL-42403 course: Show bluk move to category only when something selected
Dan Poltawski [Tue, 19 Nov 2013 02:39:30 +0000 (10:39 +0800)]
Merge branch '42060-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 19 Nov 2013 02:30:16 +0000 (10:30 +0800)]
Merge branch 'MDL-42504' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 19 Nov 2013 02:04:59 +0000 (10:04 +0800)]
Merge branch 'MDL-42181' of git://github.com/mkassaei/moodle
Damyon Wiese [Tue, 19 Nov 2013 01:49:57 +0000 (09:49 +0800)]
Merge branch 'master_MDL-40223' of git://github.com/danmarsden/moodle
Sam Hemelryk [Tue, 19 Nov 2013 01:37:28 +0000 (14:37 +1300)]
Merge branch 'MDL-42905-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 19 Nov 2013 01:31:51 +0000 (14:31 +1300)]
Merge branch 'MDL-42553_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 19 Nov 2013 01:19:20 +0000 (14:19 +1300)]
Merge branch 'wip-MDL-42850-master' of git://github.com/abgreeve/moodle
AMOS bot [Tue, 19 Nov 2013 00:40:26 +0000 (00:40 +0000)]
Automatically generated installer lang files
Dan Marsden [Tue, 19 Nov 2013 00:20:34 +0000 (13:20 +1300)]
MDL-40223 SCORM: pass limit into function instead of hardcoding to allow cross-db
Sam Hemelryk [Mon, 18 Nov 2013 23:28:08 +0000 (12:28 +1300)]
Merge branch 'MDL-41316-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 18 Nov 2013 23:24:56 +0000 (12:24 +1300)]
Merge branch 'w47_MDL-42612_m27_paypalruble' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 18 Nov 2013 23:06:29 +0000 (12:06 +1300)]
Merge branch 'MDL-42774-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 18 Nov 2013 23:03:41 +0000 (12:03 +1300)]
Merge branch 'MDL-42863' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 18 Nov 2013 22:50:44 +0000 (11:50 +1300)]
Merge branch 'MDL-42865' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 18 Nov 2013 22:44:29 +0000 (11:44 +1300)]
MDL-42852 theme_bootstrapbase: fixed whitespace
Sam Hemelryk [Mon, 18 Nov 2013 22:42:25 +0000 (11:42 +1300)]
Merge branch 'wip-MDL-42852_master' of git://github.com/gjb2048/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Mon, 18 Nov 2013 21:15:33 +0000 (10:15 +1300)]
Merge branch 'MDL-42184-master-3' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 18 Nov 2013 21:08:45 +0000 (10:08 +1300)]
Merge branch 'MDL-42853-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Mon, 18 Nov 2013 08:08:57 +0000 (16:08 +0800)]
Merge branch 'MDL-42100_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 18 Nov 2013 07:37:01 +0000 (15:37 +0800)]
Merge branch 'MDL-42880b' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 18 Nov 2013 07:26:52 +0000 (15:26 +0800)]
Merge branch 'MDL-42808-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 18 Nov 2013 07:12:56 +0000 (15:12 +0800)]
Merge branch 'master_MDL-41695' of git://github.com/danmarsden/moodle
Damyon Wiese [Mon, 18 Nov 2013 06:55:18 +0000 (14:55 +0800)]
Merge branch 'MDL-42582-master' of git://github.com/sammarshallou/moodle
