Sam Hemelryk [Thu, 19 Dec 2013 03:12:46 +0000 (16:12 +1300)]
Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges
Dan Poltawski [Thu, 19 Dec 2013 02:56:41 +0000 (10:56 +0800)]
Merge branch 'wip-mdl-43437' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Thu, 19 Dec 2013 01:40:14 +0000 (09:40 +0800)]
MDL-34432 Assign: Set up the commentinline form element properly.
Eloy Lafuente (stronk7) [Thu, 19 Dec 2013 01:13:05 +0000 (02:13 +0100)]
Revert "MDL-43306 restore: fix grade item sortorder restoration"
This reverts commit
e238b2cb928a1024b766032549168d04062a970c.
Eloy Lafuente (stronk7) [Thu, 19 Dec 2013 00:37:57 +0000 (01:37 +0100)]
Merge branch 'MDL-42425' of https://github.com/Lightwork-Marking/moodle
Conflicts:
mod/assign/upgrade.txt
Yuliya Bozhko [Wed, 18 Dec 2013 21:26:44 +0000 (10:26 +1300)]
MDL-42965 badges: Fix empty string comparison for Oracle
Paul Charsley [Wed, 18 Dec 2013 20:39:22 +0000 (09:39 +1300)]
MDL-42425 modify mod_assign_save_grade to process advanced grading data
David Monllao [Wed, 18 Dec 2013 08:02:02 +0000 (16:02 +0800)]
MDL-43235 behat: Remove notice about undeclared var
Dan Poltawski [Wed, 18 Dec 2013 06:40:18 +0000 (14:40 +0800)]
Merge branch 'MDL-41198-master' of https://github.com/mr-russ/moodle
Rajesh Taneja [Wed, 18 Dec 2013 05:56:44 +0000 (13:56 +0800)]
MDL-43437 wiki: Fixed unit test for page_version_deleted event
Russell Smith [Wed, 18 Dec 2013 05:48:41 +0000 (16:48 +1100)]
MDL-41198 lib: Add comment about the changes to srand on adodb
Russell Smith [Fri, 22 Nov 2013 00:34:23 +0000 (11:34 +1100)]
MDL-41198 lib: Allow PHP to generate random seed on script start
Most srand instances are removed to allow PHP to do the work.
srand was left for group randomization due to the method used.
Russell Smith [Thu, 31 Oct 2013 22:36:05 +0000 (09:36 +1100)]
MDL-41198 lib: Allow PHP to generate random seed on script start
All mt_srand instances are removed to allow PHP to do the work.
Sam Hemelryk [Wed, 18 Dec 2013 03:26:35 +0000 (16:26 +1300)]
Merge branch 'MDL-43241-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Fri, 6 Dec 2013 08:51:46 +0000 (16:51 +0800)]
MDL-43241 JavaScript: Deprecate findChildNodes
Eloy Lafuente (stronk7) [Wed, 18 Dec 2013 01:24:08 +0000 (02:24 +0100)]
Merge branch 'MDL-43404_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 18 Dec 2013 01:23:08 +0000 (02:23 +0100)]
Merge branch 'MDL-41292-master' of git://github.com/mr-russ/moodle
Eloy Lafuente (stronk7) [Tue, 17 Dec 2013 23:13:15 +0000 (00:13 +0100)]
Merge branch 'MDL-40920_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 17 Dec 2013 22:19:34 +0000 (11:19 +1300)]
Merge branch 'MDL-43235_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 17 Dec 2013 21:58:51 +0000 (22:58 +0100)]
Merge branch 'MDL-43025-master' of git://github.com/damyon/moodle
Sam Hemelryk [Tue, 17 Dec 2013 21:52:41 +0000 (10:52 +1300)]
Merge branch 'MDL-43355_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 17 Dec 2013 21:33:51 +0000 (22:33 +0100)]
Merge branch 'wip-mdl-43311' of https://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 17 Dec 2013 21:30:30 +0000 (10:30 +1300)]
Merge branch 'w51_MDL-43213_m27_simplebehat' of https://github.com/skodak/moodle
Sam Hemelryk [Tue, 17 Dec 2013 21:08:33 +0000 (10:08 +1300)]
Merge branch 'MDL-41359-master' of https://github.com/mr-russ/moodle
Sam Hemelryk [Tue, 17 Dec 2013 20:59:05 +0000 (09:59 +1300)]
Merge branch 'MDL-43074-master' of git://github.com/damyon/moodle
Sam Hemelryk [Tue, 17 Dec 2013 20:55:04 +0000 (09:55 +1300)]
Merge branch 'MDL-43272-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 17 Dec 2013 20:53:02 +0000 (09:53 +1300)]
Merge branch 'MDL-43234-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
Sam Hemelryk [Tue, 17 Dec 2013 20:21:50 +0000 (09:21 +1300)]
Merge branch 'MDL-38698-master' of git://github.com/FMCorz/moodle
David Monllao [Tue, 17 Dec 2013 08:30:32 +0000 (16:30 +0800)]
MDL-43404 behat: Form change checker disabled when running behat
Eloy Lafuente (stronk7) [Tue, 17 Dec 2013 09:29:25 +0000 (10:29 +0100)]
Merge branch 'MDL-43306-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 17 Dec 2013 08:29:56 +0000 (16:29 +0800)]
MDL-43404 behat: Removing auto accept_alert
Frederic Massart [Tue, 17 Dec 2013 06:03:02 +0000 (07:03 +0100)]
MDL-38698 filter_urltolink: Remove performance test in Unit Test
Frederic Massart [Thu, 12 Dec 2013 10:31:51 +0000 (11:31 +0100)]
MDL-38698 filter_urltolink: Do not link the URL property of CSS
Marina Glancy [Tue, 17 Dec 2013 05:37:19 +0000 (16:37 +1100)]
Merge branch 'MDL-37679-master' of git://github.com/phalacee/moodle
Marina Glancy [Tue, 17 Dec 2013 05:35:31 +0000 (16:35 +1100)]
Merge branch 'wip-MDL-43295-master' of git://github.com/abgreeve/moodle
Jason Fowler [Wed, 11 Dec 2013 08:03:27 +0000 (16:03 +0800)]
MDL-37679 Course: Adding section name to page title
Sam Hemelryk [Tue, 17 Dec 2013 03:32:35 +0000 (16:32 +1300)]
Merge branch 'MDL-43259-master' of git://github.com/andrewnicols/moodle
Conflicts:
lib/upgrade.txt
Sam Hemelryk [Tue, 17 Dec 2013 03:20:34 +0000 (16:20 +1300)]
Merge branch 'MDL-38832-master' of git://github.com/danpoltawski/moodle
Adrian Greeve [Thu, 12 Dec 2013 01:46:21 +0000 (09:46 +0800)]
MDL-43295 mod_assign: Removed wrongly used format_text call in online text submission.
Marina Glancy [Tue, 17 Dec 2013 00:23:43 +0000 (11:23 +1100)]
Merge branch 'MDL-41075-master-3' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 16 Dec 2013 20:31:19 +0000 (09:31 +1300)]
Merge branch 'MDL-39725_analyze' of https://github.com/mr-russ/moodle
Conflicts:
lib/dml/moodle_database.php
Sam Hemelryk [Mon, 16 Dec 2013 19:54:33 +0000 (08:54 +1300)]
Merge branch 'MDL-25473-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 16 Dec 2013 19:48:08 +0000 (08:48 +1300)]
Merge branch 'MDL-34321-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 16 Dec 2013 19:45:05 +0000 (08:45 +1300)]
Merge branch 'MDL-36984-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 16 Dec 2013 19:25:08 +0000 (08:25 +1300)]
Merge branch 'w51_MDL-43268_m27_filternotice' of https://github.com/skodak/moodle
Andrew Nicols [Mon, 16 Dec 2013 08:59:11 +0000 (16:59 +0800)]
MDL-43322 JavaScript: Correct cache-base entry in base rollup
Jerome Mouneyrac [Mon, 16 Dec 2013 04:07:33 +0000 (12:07 +0800)]
MDL-41075 Remove "Choose..." option from participants page.
Andrew Nicols [Wed, 11 Dec 2013 01:34:36 +0000 (09:34 +0800)]
MDL-43322 JavaScript: Include moodle-core-popuphelp in the mcore rollup
moodle-core-popuphelp is used on every page in Moodle, so it should be
included in the rollup by default to save a request each time.
Sam Hemelryk [Mon, 16 Dec 2013 03:03:09 +0000 (16:03 +1300)]
Merge branch 'MDL-43240-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 16 Dec 2013 02:46:56 +0000 (15:46 +1300)]
Merge branch 'MDL-34432-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 16 Dec 2013 02:44:15 +0000 (15:44 +1300)]
Merge branch 'wip-mdl-21180' of https://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 16 Dec 2013 02:40:40 +0000 (15:40 +1300)]
Merge branch 'MDL-43062-master-nomerge' of git://github.com/mouneyrac/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Tue, 10 Dec 2013 03:46:33 +0000 (11:46 +0800)]
MDL-34432: Allow comment inline (stripping embedded images version)
Rajesh Taneja [Thu, 12 Dec 2013 01:53:48 +0000 (09:53 +0800)]
MDL-21180 Gradebook: Consistent handling of change in aggregation
Change from/to GRADE_AGGREGATE_WEIGHTED_MEAN and GRADE_AGGREGATE_EXTRACREDIT_MEAN was only
handled prior to this patch. GRADE_AGGREGATE_SUM and GRADE_AGGREGATE_WEIGHTED_MEAN2 also
behave similar and should be handled same way
Marina Glancy [Mon, 16 Dec 2013 01:27:38 +0000 (12:27 +1100)]
Merge branch 'MDL-37972-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 16 Dec 2013 01:10:15 +0000 (14:10 +1300)]
Merge branch 'wip-MDL-43348_master' of git://github.com/gjb2048/moodle
Sam Hemelryk [Mon, 16 Dec 2013 00:52:16 +0000 (13:52 +1300)]
Merge branch 'MDL-40096-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 16 Dec 2013 00:47:57 +0000 (13:47 +1300)]
Merge branch 'MDL-42965_master' of https://github.com/totara/openbadges
Sam Hemelryk [Sun, 15 Dec 2013 22:31:29 +0000 (11:31 +1300)]
Merge branch 'MDL-40436-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Sun, 15 Dec 2013 22:18:02 +0000 (11:18 +1300)]
Merge branch 'w51_MDL-42931_m27_env27' of https://github.com/skodak/moodle
Sam Hemelryk [Sun, 15 Dec 2013 22:11:38 +0000 (11:11 +1300)]
Merge branch 'MDL-42085-master' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Sun, 15 Dec 2013 20:46:47 +0000 (09:46 +1300)]
Merge branch 'MDL-43326-master' of git://github.com/damyon/moodle
David Monllao [Thu, 5 Dec 2013 05:18:45 +0000 (13:18 +0800)]
MDL-43235 behat: Ensure that behat_config_manager::get_config_file_contents() has always a behat_wwwroot
Petr Škoda [Tue, 10 Dec 2013 00:46:27 +0000 (08:46 +0800)]
MDL-42931 fix hardcoded PHP version tests for 2.7
Petr Škoda [Tue, 10 Dec 2013 00:40:33 +0000 (08:40 +0800)]
MDL-42931 set new requirements for 2.7
Petr Škoda [Wed, 4 Dec 2013 09:09:41 +0000 (17:09 +0800)]
MDL-43213 try to simplify behat config and init code
1/ always require 3 behat settings - $CFG->behat_wwwroot, $CFG->behat_dataroot and $CFG->behat_prefix
2/ cleanup init code
3/ do not require $CFG->wwwroot and $CFG->dataroot on test sites
4/ remove switch completely - the most confusing part for me
5/ print out behat_wwwwroot in init script so that you can test the test site manually
Petr Škoda [Fri, 13 Dec 2013 00:15:21 +0000 (08:15 +0800)]
MDL-43268 fix filter notice when not in debug mode
Jerome Mouneyrac [Fri, 13 Dec 2013 05:27:26 +0000 (13:27 +0800)]
MDL-43062 course: Content of label is left-aligned, regardless of alignment chosen
Sam Hemelryk [Fri, 13 Dec 2013 03:59:10 +0000 (16:59 +1300)]
weekly release 2.7dev
Sam Hemelryk [Fri, 13 Dec 2013 03:59:08 +0000 (16:59 +1300)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
AMOS bot [Fri, 13 Dec 2013 00:42:11 +0000 (00:42 +0000)]
Automatically generated installer lang files
Tim Lock [Wed, 4 Dec 2013 04:12:49 +0000 (14:42 +1030)]
MDL-33925: auth_imap: add self-signed cert support
David Monllao [Thu, 12 Dec 2013 08:38:25 +0000 (16:38 +0800)]
MDL-42625 behat: Wrapping select an option extra actions in a try & catch
To select an option is specially painful, every browser
behaves differently and phantomjs just joined the party
throwing "Element does not exist in cache" random
exceptions that we need to catch.
Gareth J Barnard [Thu, 12 Dec 2013 11:07:03 +0000 (11:07 +0000)]
MDL-43348 theme: html <nav> element on the wrong content.
David Monllao [Thu, 12 Dec 2013 09:26:22 +0000 (17:26 +0800)]
MDL-43355 testing: Return the hash when HEAD points to a hash
Dan Poltawski [Thu, 12 Dec 2013 08:42:38 +0000 (16:42 +0800)]
MDL-38832 course: remove unused constants
Jerome Mouneyrac [Thu, 12 Dec 2013 08:04:52 +0000 (16:04 +0800)]
MDL-42085 Enrol: Always apply enrolment duration.
Before the fix, the startdates and duration fields were integrated to HTML code only
when the user clicked on the collapsible region to see them.
It was wrong because their values were not sent by the form
if ever the user didn't expand this Enrolment options region.
Frederic Massart [Thu, 12 Dec 2013 08:04:16 +0000 (09:04 +0100)]
MDL-40436 block_course_list: Fix bad context resolution
We were trying to get the course context of a remote course
from a completely unrelated ID. It would sometimes work if the
ID was matching the one of a local course. In other places
we are not trying to find a context for the remote course, we
simply use the $PAGE context in format_string. So the usage
of the context has been removed here too.
Jason Fowler [Thu, 12 Dec 2013 06:19:26 +0000 (14:19 +0800)]
MDL-36984 Assign: Add redirect after saving grades
Marina Glancy [Thu, 12 Dec 2013 05:49:56 +0000 (16:49 +1100)]
Merge branch 'MDL-42625_master-failures-fix' of git://github.com/dmonllao/moodle
David Monllao [Thu, 12 Dec 2013 04:18:01 +0000 (12:18 +0800)]
MDL-42625 behat: Fixing failures
* Expanding fieldsets before setting the course format
* Ensure editors are loaded moved to expand_all_fieldsets
* Return true rather than false when JS is disabled and
non-allowed steps should continue without throwing an
exception.
* Submit create user form after editing it
Marina Glancy [Thu, 12 Dec 2013 04:39:14 +0000 (15:39 +1100)]
Merge branch 'mucupdates27' of https://github.com/skodak/moodle
Petr Škoda [Thu, 12 Dec 2013 03:36:36 +0000 (11:36 +0800)]
MDL-42973 fix MUC caching issue when fetching available updates
Jason Fowler [Wed, 11 Dec 2013 06:56:51 +0000 (14:56 +0800)]
MDL-34321 Assignment2.2 - Fixing submission count
Rajesh Taneja [Thu, 12 Dec 2013 01:36:24 +0000 (09:36 +0800)]
MDL-40058 mod_wiki: trigger event on page map view
Eloy Lafuente (stronk7) [Thu, 12 Dec 2013 01:03:41 +0000 (02:03 +0100)]
MDL-31410 paypal: fix problem on notifications
This commit fixes a PHP warning about using a
unititialised variable and also the problems when
notifications are enabled and there is not yet a
teacher in the course, defaulting to admin for student
notifications and preventing teacher notifications to happen.
Eloy Lafuente (stronk7) [Thu, 12 Dec 2013 00:09:02 +0000 (01:09 +0100)]
Merge branch 'w50_MDL-31410_m27_paypalipn' of https://github.com/skodak/moodle
Sam Hemelryk [Wed, 11 Dec 2013 20:13:42 +0000 (09:13 +1300)]
Merge branch 'MDL-43232-master-1' of git://github.com/andrewnicols/moodle
David Monllao [Wed, 11 Dec 2013 09:02:46 +0000 (17:02 +0800)]
MDL-42625 behat: Fixing ExpectationException::__construct() call
Also adding an extra checking to the selector to
ensure it is no updating the list of files.
Andrew Nicols [Sun, 8 Dec 2013 08:15:42 +0000 (16:15 +0800)]
MDL-43259 JavaScript: Stop using deprecated lightbox config setting when instantiating dialogues
Andrew Nicols [Wed, 11 Dec 2013 05:29:39 +0000 (13:29 +0800)]
MDL-43232 JavaScript: Correct typo when cancelling the confirmcancel
Damyon Wiese [Wed, 11 Dec 2013 03:59:15 +0000 (11:59 +0800)]
MDL-43326 Assign: Start new attempt from previous missing sesskey
Rajesh Taneja [Tue, 3 Dec 2013 06:42:49 +0000 (14:42 +0800)]
MDL-40058 mod_wiki: modified wiki_restore_page api to accept version and context
Rajesh Taneja [Mon, 2 Dec 2013 08:50:03 +0000 (16:50 +0800)]
MDL-40058 Events: added unit test
Rajesh Taneja [Mon, 2 Dec 2013 02:59:30 +0000 (10:59 +0800)]
MDL-40058 Events: Replaced add_to_log for page comments to event
Rajesh Taneja [Fri, 29 Nov 2013 08:23:06 +0000 (16:23 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for page version viewed to event
Rajesh Taneja [Fri, 29 Nov 2013 07:53:53 +0000 (15:53 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for page created to event
Rajesh Taneja [Fri, 29 Nov 2013 07:33:58 +0000 (15:33 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for page map viewed to event
Rajesh Taneja [Fri, 29 Nov 2013 07:19:53 +0000 (15:19 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for admin to event
Rajesh Taneja [Fri, 29 Nov 2013 06:51:42 +0000 (14:51 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for override locks with event