Petr Škoda
a07c89c632
MDL-37713 let phpunit bootstrap create test dataroot if necessary
2013-01-26 14:59:27 +01: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
Mark Nelson
93cc145f88
MDL-37082 core_course: include details of deprecation in the upgrade.txt file
2013-01-23 15:55:04 +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
David Monllao
1150aeb896
MDL-37458 testing: Removing wrong comments
2013-01-23 13:23:08 +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
9d98cb9f17
Merge branch 'wip-MDL-34436-master' of git://github.com/phalacee/moodle
2013-01-23 09:54:36 +13:00
Frederic Massart
31a783303e
MDL-29749 phpunit: Windows dir uses backslashes
2013-01-22 16:24:35 +01: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
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
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
Sam Hemelryk
59573bb447
MDL-36621 calendar: fixed up conflict error
2013-01-22 16:35:48 +13:00
Sam Hemelryk
36546841f1
Merge branch 'MDL-36621-master' of git://github.com/ankitagarwal/moodle
...
Conflicts:
calendar/lib.php
lib/db/caches.php
version.php
2013-01-22 16:35:03 +13:00
Dan Poltawski
68a6d87684
Merge branch 'MDL-37473' of git://github.com/srynot4sale/moodle
2013-01-22 11:14:19 +08:00
Aparup Banerjee
60f95aad6c
Merge branch 'MDL-37585' of git://github.com/timhunt/moodle
2013-01-22 11:08:16 +08:00
Eloy Lafuente (stronk7)
37027f431b
Merge branch 'MDL-29749-master-4th' of git://github.com/FMCorz/moodle
2013-01-21 23:26:35 +01:00
Eloy Lafuente (stronk7)
fa669c49ad
Merge branch 'w03_MDL-36411_m25_setup' of git://github.com/skodak/moodle
2013-01-21 20:08:12 +01:00
Eloy Lafuente (stronk7)
6ee4df92ab
Merge branch 'MDL-35924_master' of https://github.com/markn86/moodle
2013-01-21 19:41:45 +01:00
Tim Hunt
74fa94b26a
MDL-37585 Make $DB->set_debug(true) show run time of each query.
2013-01-21 08:48:15 +00:00
Petr Škoda
1764cd8e6f
MDL-37593 use https for editor script if required
2013-01-21 09:40:15 +01:00
Dan Poltawski
77ea8340de
Merge branch 'MDL-37458_master' of git://github.com/dmonllao/moodle
2013-01-21 11:14:38 +08:00
Ankit Agarwal
793d38552a
MDL-37100 webservices: Define core_calendar_get_calendar_events() api
2013-01-21 11:05:50 +08:00
Ankit Agarwal
475896bdbc
MDL-37100 webservices: Implement core_calendar_get_calendar_events()
2013-01-21 11:05:50 +08:00
Dan Poltawski
73ce4ac996
Merge branch 'MDL-37457_master' of git://github.com/dmonllao/moodle
2013-01-21 10:53:12 +08:00
Dan Poltawski
b77cce5c5c
Merge branch 'MDL-30769_iframe' of git://github.com/rwijaya/moodle
2013-01-21 10:25:42 +08:00
Dan Poltawski
be576cb0e8
Merge branch 'wip-mdl-36674' of git://github.com/rajeshtaneja/moodle
2013-01-21 10:15:16 +08:00
Dan Poltawski
94abbef12f
Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle
2013-01-21 09:59:35 +08:00
Dan Poltawski
2f61796c26
Merge branch 'w03_MDL-36809_m25_mysqlipers' of git://github.com/skodak/moodle
2013-01-21 09:04:57 +08:00
Sam Hemelryk
11a5fab670
Merge branch 'MDL-35817' of git://github.com/rwijaya/moodle
2013-01-21 09:47:00 +13:00
Petr Škoda
33b5b9f97a
MDL-36809 add support for mysqli persistent connections
2013-01-19 13:25:28 +01:00
Petr Škoda
6a8e467916
MDL-36411 make sure asserts in setUp() do not cause problems
2013-01-19 13:19:49 +01:00
Petr Škoda
c7a3399041
MDL-37257 improve enrol overview page and enrol plugin info
2013-01-19 13:14:41 +01:00
Mark Nelson
e06bfd3df3
MDL-35924 filemanager: added label for the input field when creating a new folder
2013-01-18 15:36:25 +08:00
Petr Skoda
b5fc5675a2
MDL-30769 - URL module: always use iframe instead of problematic object tag
2013-01-18 11:11:49 +08:00
David Monllao
0ea35584ae
MDL-37458 testing common methods generalization
2013-01-18 09:17:30 +08:00
Petr Škoda
009f190c69
MDL-37429 hack around zip limitations in PHP versions < 5.3.10
2013-01-17 16:48:29 +01:00
David Monllao
f822840223
MDL-37458 testing tests finder externalization
2013-01-17 15:15:27 +08:00
Ankit Agarwal
e73b527c82
MDL-36621 calendar: cache calendar subscriptions and showicalsource setting
...
Now MUC is used to cache subscription information when the constructor for an event is called, which is child of a ical subscription.
A new setting calendar_showicalsource is introduced which controls if the ical source should be displayed along with events in the calendar
Also minor changes has been done in places to make sure subscription id is always associated with ical events
2013-01-17 13:40:06 +08:00
Rossiani Wijaya
a170cdf4a4
MDL-35817 login: convert html tag to use html_writer and change <a> tag id to be more specific to login
2013-01-17 13:01:27 +08:00
Frederic Massart
caf16a57e5
MDL-29749 files: Improved params PARAM_PATH and PARAM_FILE
...
The logic change here allows for multiple dots to be part
of a file name or folder name. Most Unit Tests have not
been altered and reflect the exact logic as it was before.
2013-01-17 11:32:59 +08:00
Sam Hemelryk
e17dbeeb1a
MDL-34398 groups: implemented caching of group information.
2013-01-17 09:24:58 +13:00
Eloy Lafuente (stronk7)
937ad8c626
Merge branch 'MDL-37555' of git://github.com/stronk7/moodle
2013-01-16 20:52:47 +01:00
Tim Hunt
67cc80197f
MDL-31616 blocks: ensure showinsubcontexts is only 0 or 1 in the DB.
2013-01-16 19:16:09 +01:00
Eloy Lafuente (stronk7)
c6523d2f94
MDL-37555 Apply realpath() 2 CFG->phpunit_dataroot
2013-01-16 16:15:56 +01:00
David Monllao
3f7211f45a
MDL-37458 testing lock externalization
2013-01-16 13:43:25 +08:00
Sam Hemelryk
20a3199397
Merge branch 'wip-mdl-35873' of git://github.com/rajeshtaneja/moodle
2013-01-16 18:22:04 +13:00
Dan Poltawski
7acc743f06
Merge branch 'MDL-36553' of git://github.com/rwijaya/moodle
2013-01-16 13:19:36 +08:00
Rossiani Wijaya
b3e02098a4
MDL-36553: Admin settings: remove border attribute from HTML settings table
2013-01-16 13:15:40 +08:00