Petr Škoda
a07c89c632
MDL-37713 let phpunit bootstrap create test dataroot if necessary
2013-01-26 14:59:27 +01:00
Dan Poltawski
b3778a0dec
MDL-37684 - phpunit add missing definitions to phpunit.xml.dist
2013-01-25 16:33:51 +08:00
Dan Poltawski
a737019604
weekly release 2.5dev
2013-01-25 15:57:30 +08:00
Dan Poltawski
ec0f4373fa
Fix permissions
2013-01-25 15:57:20 +08:00
Dan Poltawski
a7b860a0c7
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
2013-01-25 15:56:27 +08:00
Dan Poltawski
ebf6e8f60a
Merge branch 'MDL-37473b' of git://github.com/srynot4sale/moodle
2013-01-25 12:35:40 +08:00
Aaron Barnes
10a8581f2b
MDL-37473 completion: Add missing cap checks to tracked users functions
...
Namely get_num_tracked_users and is_tracked_user()
2013-01-25 17:08:44 +13:00
Dan Poltawski
dec70f2599
Revert "MDL-32652 - Make block drag-drop work throughout Moodle"
...
This reverts commit d7c29c22572314680350ccdcf801f188aca541e4.
2013-01-25 11:52:15 +08:00
AMOS bot
7bc7c3fef2
Automatically generated installer lang files
2013-01-24 00:46:47 +00:00
Dan Poltawski
a42a78754f
Merge branch 'MDL-37547-master' of github.com:damyon/moodle
2013-01-23 15:58:34 +08:00
Mark Nelson
93cc145f88
MDL-37082 core_course: include details of deprecation in the upgrade.txt file
2013-01-23 15:55:04 +08:00
Dan Poltawski
1c426a56f8
Merge branch 'MDL-37082-master' of git://github.com/damyon/moodle
2013-01-23 15:53:20 +08:00
Damyon Wiese
8549deb969
MDL-37082: Fixed failed unit tests from previous patch
2013-01-23 15:23:37 +08:00
Aparup Banerjee
46112c0277
Merge branch 'MDL-37100-master' of git://github.com/ankitagarwal/moodle
...
Conflicts:
version.php
2013-01-23 14:57:45 +08:00
Damyon Wiese
d021941d6c
MDL-37547 Assign: Fix failed unit test on oracle.
...
Oracle is rounding numbers with no decimals - which causes a test failure.
2013-01-23 14:56:21 +08:00
Dan Poltawski
bc5165c2be
Merge branch 'MDL-37082_master' of git://github.com/markn86/moodle
2013-01-23 14:45:59 +08:00
Mark Nelson
18aaeef0b6
MDL-37082 mod_assign: removed reference to deprecated delete_course_module function in the unit tests
2013-01-23 14:25:02 +08:00
David Monllao
1150aeb896
MDL-37458 testing: Removing wrong comments
2013-01-23 13:23:08 +08:00
Eloy Lafuente (stronk7)
c9c75b39fd
Merge branch 'MDL-37619-master' of git://github.com/damyon/moodle
2013-01-23 02:07:53 +01:00
Dan Poltawski
ad3a730c3a
Merge branch 'MDL-37506' of git://github.com/timhunt/moodle
2013-01-23 08:54:32 +08:00
Dan Poltawski
0a93b3127f
Merge branch 'MDL-37082_master' of git://github.com/markn86/moodle
2013-01-23 08:53:02 +08:00
Sam Hemelryk
8c35fcdcd9
Merge branch 'MDL-34435-master' of git://github.com/FMCorz/moodle
...
Conflicts:
version.php
2013-01-23 11:08:55 +13:00
Sam Hemelryk
8af97c2c2e
Merge branch 'wip-MDL-35826-master' of git://github.com/phalacee/moodle
...
Conflicts:
calendar/upgrade.txt
2013-01-23 10:03:42 +13:00
Sam Hemelryk
a659a79f23
MDL-36621 cache: added missing calendar subscription string
2013-01-23 09:58:43 +13:00
Sam Hemelryk
9d98cb9f17
Merge branch 'wip-MDL-34436-master' of git://github.com/phalacee/moodle
2013-01-23 09:54:36 +13:00
Eloy Lafuente (stronk7)
5afd8bfede
Merge branch 'wip-MDL-15930-master' of git://github.com/abgreeve/moodle
2013-01-22 20:34:42 +01:00
Frederic Massart
31a783303e
MDL-29749 phpunit: Windows dir uses backslashes
2013-01-22 16:24:35 +01:00
Ankit Agarwal
38c52ef291
MDL-37100 Version bump
2013-01-22 17:10:31 +08:00
Mark Nelson
a347aee32e
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.
2013-01-22 17:05:16 +08:00
Aparup Banerjee
072844a158
Merge branch 'wip-mdl-37339' of git://github.com/rajeshtaneja/moodle
2013-01-22 16:28:31 +08:00
Dan Poltawski
397ccf1309
MDL-36602 - fix whitespace
2013-01-22 15:45:34 +08:00
Dan Poltawski
079b83f34e
Merge branch 'w03_MDL-36602_m25_mnetuser' of git://github.com/skodak/moodle
2013-01-22 15:44:28 +08:00
Dan Poltawski
d7687c3a23
Merge branch 'w03_MDL-37257_m25_enrolsettings' of git://github.com/skodak/moodle
2013-01-22 15:37:36 +08:00
Dan Poltawski
bfaf3041fa
Merge branch 'wip-mdl-32526' of git://github.com/rajeshtaneja/moodle
2013-01-22 14:00:26 +08:00
Aparup Banerjee
1a6192f928
Merge branch 'MDL-37547-master' of github.com:damyon/moodle
2013-01-22 13:57:25 +08:00
Ankit Agarwal
e6a1f8c102
MDL-37100 webservices: Adding warnings and cleaning up get_calendar_events() api
2013-01-22 13:54:49 +08:00
Jason Fowler
512edd65d8
MDL-35826 - Calendar - Creating a caption containing the month name for mini-calendars
2013-01-22 13:51:09 +08:00
Dan Poltawski
499e1f11a5
Merge branch 'MDL-36138-master' of git://github.com/StudiUM/moodle
2013-01-22 13:40:02 +08:00
Damyon Wiese
c1432fad2c
MDL-37619 Assign: Fix failed unit tests for mod/assign/lib.php
...
The failure was caused by a regression in MDL-37527.
2013-01-22 13:34:01 +08:00
Dan Poltawski
5a4a346834
Merge branch 'MDL-33206-master' of git://github.com/StudiUM/moodle
2013-01-22 12:58:27 +08:00
Dan Poltawski
f6623fe130
Merge branch 'MDL-27164-master' of git://github.com/micaherne/moodle
2013-01-22 12:51:51 +08:00
Dan Poltawski
cba645b850
Merge branch 'master_MDL-36853' of git://github.com/danmarsden/moodle
2013-01-22 12:49:18 +08:00
Dan Poltawski
928639c06e
Merge branch 'MDL-37275_master' of git://github.com/markn86/moodle
2013-01-22 12:46:09 +08:00
Dan Poltawski
8f43dfac3a
Merge branch 'MDL-37375' of git://github.com/rwijaya/moodle
2013-01-22 12:43:47 +08:00
Dan Poltawski
011ee6742f
Merge branch 'MDL-37426-m' of git://github.com/andrewnicols/moodle
2013-01-22 12:41:12 +08:00
Dan Poltawski
f5ba8b0f03
Merge branch 'w03_MDL-37593_m25_httpslogineditor' of git://github.com/skodak/moodle
2013-01-22 12:35:54 +08:00
Aparup Banerjee
447e59a1f2
Merge branch 'wip-MDL-37541-master' of git://github.com/marinaglancy/moodle
...
Conflicts:
repository/wikimedia/wikimedia.php
2013-01-22 12:10:48 +08:00
Dan Poltawski
8cd57fb26a
Merge branch 'MDL-37430-master' of github.com:damyon/moodle
2013-01-22 11:53:10 +08:00
Dan Poltawski
ad0bcfe6a6
Merge branch 'MDL-35357' of git://github.com/rwijaya/moodle
2013-01-22 11:48:04 +08:00
Dan Poltawski
97d3e09cd8
Merge branch 'MDL-37599' of git://github.com/timhunt/moodle
2013-01-22 11:40:04 +08:00