Eloy Lafuente (stronk7) [Mon, 28 Jan 2013 18:23:17 +0000 (19:23 +0100)]
Merge branch 'wip-MDL-37545-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 28 Jan 2013 17:25:38 +0000 (18:25 +0100)]
MDL-37086 phpunit: use alt reset method.
When code executed in test cases is using/preventing
database transactions, phpunit itself cannot
use transactions for reseting between cases. But we
can tell it about, so some alternative (and slower)
method for reseting will be used.
Sam Hemelryk [Mon, 28 Jan 2013 05:00:07 +0000 (18:00 +1300)]
Merge branch 'w04_MDL-37638_m25_rolecloning' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 28 Jan 2013 04:56:05 +0000 (17:56 +1300)]
Merge branch 'w04_MDL-37666_m25_cssiesend' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 28 Jan 2013 04:53:54 +0000 (17:53 +1300)]
Merge branch 'w04_MDL-37713_m25_testdir' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 28 Jan 2013 04:50:48 +0000 (17:50 +1300)]
Merge branch 'MDL-37677-obsolete-cache-debug' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 28 Jan 2013 04:49:24 +0000 (17:49 +1300)]
Merge branch 'MDL-37673-muc-groupdata-typo' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 28 Jan 2013 04:46:13 +0000 (17:46 +1300)]
Merge branch 'MDL-37548-m' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 28 Jan 2013 04:40:08 +0000 (17:40 +1300)]
Merge branch 'wip-MDL-37614_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 28 Jan 2013 04:40:01 +0000 (17:40 +1300)]
Merge branch 'wip-MDL-37611_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 28 Jan 2013 04:38:36 +0000 (17:38 +1300)]
Merge branch 'wip-MDL-37613_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 28 Jan 2013 04:37:07 +0000 (17:37 +1300)]
Merge branch 'wip-MDL-37612_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 28 Jan 2013 04:35:04 +0000 (17:35 +1300)]
Merge branch 'wip-MDL-29723_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 28 Jan 2013 04:29:24 +0000 (17:29 +1300)]
Merge branch 'MDL-37172' of git://github.com/jmvedrine/moodle
Sam Hemelryk [Mon, 28 Jan 2013 04:25:51 +0000 (17:25 +1300)]
Merge branch 'w04_MDL-37728_m25_roledef' of git://github.com/skodak/moodle
Andrew Davis [Fri, 18 Jan 2013 03:35:45 +0000 (11:35 +0800)]
MDL-13805 core_message: altered some strings so it isnt weird when viewing a different users messages
Andrew Davis [Mon, 12 Nov 2012 07:25:49 +0000 (15:25 +0800)]
MDL-13805 core_message: fixed the admin's ability to read another users messages
David Monllao [Wed, 23 Jan 2013 01:52:36 +0000 (09:52 +0800)]
MDL-37634 lesson: readquestion visibility to protected
Sam Hemelryk [Mon, 28 Jan 2013 00:42:07 +0000 (13:42 +1300)]
Merge branch 'MDL-37628-master' of git://github.com/grabs/moodle
Sam Hemelryk [Mon, 28 Jan 2013 00:36:28 +0000 (13:36 +1300)]
Merge branch 'w04_MDL-37640_m25_zipclose' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 28 Jan 2013 00:32:09 +0000 (13:32 +1300)]
Merge branch 'w04_MDL-37407_m25_chineseunzip' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 28 Jan 2013 00:29:17 +0000 (13:29 +1300)]
Merge branch 'MDL-37414_master' of https://github.com/markn86/moodle
Sam Hemelryk [Sun, 27 Jan 2013 22:57:17 +0000 (11:57 +1300)]
Merge branch 'MDL-32750' of git://github.com/colchambers/moodle
Sam Hemelryk [Sun, 27 Jan 2013 22:32:53 +0000 (11:32 +1300)]
Merge branch 'MDL-19069' of git://github.com/rwijaya/moodle
Sam Hemelryk [Wed, 16 Jan 2013 04:49:14 +0000 (17:49 +1300)]
MDL-37545 cache: fixed bug during initialisation and updating of cache config
Petr Škoda [Sun, 27 Jan 2013 13:47:15 +0000 (14:47 +0100)]
MDL-37728 show role risks
Petr Škoda [Sun, 27 Jan 2013 13:29:27 +0000 (14:29 +0100)]
MDL-37728 list only relevant capabilities when reviewing role permissions
Petr Škoda [Sun, 27 Jan 2013 13:13:35 +0000 (14:13 +0100)]
MDL-37728 show allow matrix info in role overview
Petr Škoda [Fri, 25 Jan 2013 22:35:46 +0000 (23:35 +0100)]
MDL-37713 let phpunit bootstrap create test dataroot if necessary
Andreas Grabs [Tue, 22 Jan 2013 21:35:16 +0000 (22:35 +0100)]
MDL-37628 feedback - Coding error in Recent Activity
Jean-Michel Vedrine [Sat, 22 Dec 2012 16:02:58 +0000 (17:02 +0100)]
MDL-37172 Hardcoded strings in some question imports formats
AMOS BEGIN
MOV [unknownorunhandledtype,qformat_blackboard_six],[unknownorunhandledtype,question]
AMOS END
Petr Škoda [Fri, 25 Jan 2013 19:20:04 +0000 (20:20 +0100)]
MDL-37666 fix comment describing IE CSS limitations
Petr Škoda [Fri, 25 Jan 2013 18:35:40 +0000 (19:35 +0100)]
MDL-37638 fix name of duplicate role
Petr Škoda [Sun, 13 Jan 2013 11:30:04 +0000 (12:30 +0100)]
MDL-37407 add support for zh_cn unicode unzip
Petr Škoda [Wed, 23 Jan 2013 08:33:22 +0000 (09:33 +0100)]
MDL-37640 close all zip archives after use in unit tests
Colin Chambers [Fri, 11 May 2012 10:23:18 +0000 (11:23 +0100)]
MDL-32750 Question: make the html editor tools collapsible
Dan Poltawski [Fri, 25 Jan 2013 04:18:41 +0000 (12:18 +0800)]
MDL-37684 - phpunit add missing definitions to phpunit.xml.dist
Dan Poltawski [Fri, 25 Jan 2013 07:52:26 +0000 (15:52 +0800)]
weekly release 2.5dev
Dan Poltawski [Fri, 25 Jan 2013 07:57:20 +0000 (15:57 +0800)]
Fix permissions
Dan Poltawski [Fri, 25 Jan 2013 07:56:27 +0000 (15:56 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
Dan Poltawski [Fri, 25 Jan 2013 04:35:40 +0000 (12:35 +0800)]
Merge branch 'MDL-37473b' of git://github.com/srynot4sale/moodle
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()
Dan Poltawski [Fri, 25 Jan 2013 03:52:15 +0000 (11:52 +0800)]
Revert "MDL-32652 - Make block drag-drop work throughout Moodle"
This reverts commit
d7c29c22572314680350ccdcf801f188aca541e4.
David Mudrák [Thu, 24 Jan 2013 22:14:16 +0000 (23:14 +0100)]
MDL-37677 Do not display debug info about obsolete string manager caches
David Mudrák [Thu, 24 Jan 2013 21:52:10 +0000 (22:52 +0100)]
MDL-37673 Fix core_groupdata cache definition
Andrew Robert Nicols [Wed, 23 Jan 2013 22:23:29 +0000 (22:23 +0000)]
MDL-37548 Show the incorrect value in a colour picker after validation
AMOS bot [Thu, 24 Jan 2013 00:46:47 +0000 (00:46 +0000)]
Automatically generated installer lang files
Dan Poltawski [Wed, 23 Jan 2013 07:58:34 +0000 (15:58 +0800)]
Merge branch 'MDL-37547-master' of github.com:damyon/moodle
Mark Nelson [Wed, 23 Jan 2013 07:48:50 +0000 (15:48 +0800)]
MDL-37082 core_course: include details of deprecation in the upgrade.txt file
Dan Poltawski [Wed, 23 Jan 2013 07:53:20 +0000 (15:53 +0800)]
Merge branch 'MDL-37082-master' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 23 Jan 2013 07:18:46 +0000 (15:18 +0800)]
MDL-37082: Fixed failed unit tests from previous patch
Aparup Banerjee [Wed, 23 Jan 2013 06:57:45 +0000 (14:57 +0800)]
Merge branch 'MDL-37100-master' of git://github.com/ankitagarwal/moodle
Conflicts:
version.php
Damyon Wiese [Wed, 23 Jan 2013 06:56:21 +0000 (14:56 +0800)]
MDL-37547 Assign: Fix failed unit test on oracle.
Oracle is rounding numbers with no decimals - which causes a test failure.
Dan Poltawski [Wed, 23 Jan 2013 06:45:59 +0000 (14:45 +0800)]
Merge branch 'MDL-37082_master' of git://github.com/markn86/moodle
Mark Nelson [Wed, 23 Jan 2013 06:25:02 +0000 (14:25 +0800)]
MDL-37082 mod_assign: removed reference to deprecated delete_course_module function in the unit tests
David Monllao [Wed, 23 Jan 2013 05:23:08 +0000 (13:23 +0800)]
MDL-37458 testing: Removing wrong comments
Eloy Lafuente (stronk7) [Wed, 23 Jan 2013 01:07:53 +0000 (02:07 +0100)]
Merge branch 'MDL-37619-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 23 Jan 2013 00:54:32 +0000 (08:54 +0800)]
Merge branch 'MDL-37506' of git://github.com/timhunt/moodle
Dan Poltawski [Wed, 23 Jan 2013 00:53:02 +0000 (08:53 +0800)]
Merge branch 'MDL-37082_master' of git://github.com/markn86/moodle
Sam Hemelryk [Tue, 22 Jan 2013 22:08:55 +0000 (11:08 +1300)]
Merge branch 'MDL-34435-master' of git://github.com/FMCorz/moodle
Conflicts:
version.php
Sam Hemelryk [Tue, 22 Jan 2013 21:03:42 +0000 (10:03 +1300)]
Merge branch 'wip-MDL-35826-master' of git://github.com/phalacee/moodle
Conflicts:
calendar/upgrade.txt
Sam Hemelryk [Tue, 22 Jan 2013 20:58:43 +0000 (09:58 +1300)]
MDL-36621 cache: added missing calendar subscription string
Sam Hemelryk [Tue, 22 Jan 2013 20:54:36 +0000 (09:54 +1300)]
Merge branch 'wip-MDL-34436-master' of git://github.com/phalacee/moodle
Eloy Lafuente (stronk7) [Tue, 22 Jan 2013 19:34:42 +0000 (20:34 +0100)]
Merge branch 'wip-MDL-15930-master' of git://github.com/abgreeve/moodle
Mary Evans [Tue, 22 Jan 2013 16:17:11 +0000 (16:17 +0000)]
MDL-29723 mod/quiz: Modified show/hide button in edit.php and added some extra CSS rules to styles.css to make Question bank block more compatible/adaptable with themes.
Frederic Massart [Tue, 22 Jan 2013 01:41:25 +0000 (09:41 +0800)]
MDL-29749 phpunit: Windows dir uses backslashes
Ankit Agarwal [Tue, 22 Jan 2013 09:10:31 +0000 (17:10 +0800)]
MDL-37100 Version bump
Mark Nelson [Mon, 10 Dec 2012 09:33:09 +0000 (17:33 +0800)]
MDL-37082 core_course: create new course_delete_module function that handles the whole deletion process
Instead of repeating code all over the place because the original function delete_course_module only partially deletes data, we now place all the functionality needed to delete a module here.
Aparup Banerjee [Tue, 22 Jan 2013 08:28:31 +0000 (16:28 +0800)]
Merge branch 'wip-mdl-37339' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 22 Jan 2013 07:45:34 +0000 (15:45 +0800)]
MDL-36602 - fix whitespace
Dan Poltawski [Tue, 22 Jan 2013 07:44:28 +0000 (15:44 +0800)]
Merge branch 'w03_MDL-36602_m25_mnetuser' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 22 Jan 2013 07:37:36 +0000 (15:37 +0800)]
Merge branch 'w03_MDL-37257_m25_enrolsettings' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 22 Jan 2013 06:00:26 +0000 (14:00 +0800)]
Merge branch 'wip-mdl-32526' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 22 Jan 2013 05:57:25 +0000 (13:57 +0800)]
Merge branch 'MDL-37547-master' of github.com:damyon/moodle
Ankit Agarwal [Fri, 18 Jan 2013 03:05:07 +0000 (11:05 +0800)]
MDL-37100 webservices: Adding warnings and cleaning up get_calendar_events() api
Jason Fowler [Thu, 10 Jan 2013 03:11:12 +0000 (11:11 +0800)]
MDL-35826 - Calendar - Creating a caption containing the month name for mini-calendars
Dan Poltawski [Tue, 22 Jan 2013 05:40:02 +0000 (13:40 +0800)]
Merge branch 'MDL-36138-master' of git://github.com/StudiUM/moodle
Damyon Wiese [Tue, 22 Jan 2013 05:34:01 +0000 (13:34 +0800)]
MDL-37619 Assign: Fix failed unit tests for mod/assign/lib.php
The failure was caused by a regression in MDL-37527.
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
Mark Nelson [Fri, 18 Jan 2013 06:14:40 +0000 (14:14 +0800)]
MDL-37414 blocks: re-added the ability to add some blocks to the My 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
