53221 Commits

Author SHA1 Message Date
Sam Hemelryk
09d64cadee Merge branch 'MDL-32164-master-2' of git://git.luns.net.uk/moodle 2012-05-09 11:47:00 +12:00
Sam Hemelryk
55a8b2eefc Merge branch 'MDL-31940-master' of git://github.com/ankitagarwal/moodle 2012-05-09 11:43:27 +12:00
Sam Hemelryk
a6c1f5a4cc Merge branch 'MDL-31943-master' of git://github.com/ankitagarwal/moodle 2012-05-09 11:39:02 +12:00
Sam Hemelryk
d7e6345c11 Merge branch 'MDL-31945-master' of git://github.com/ankitagarwal/moodle 2012-05-09 11:37:29 +12:00
Sam Hemelryk
b1851f4639 Merge branch 'MDL-31946-master' of git://github.com/ankitagarwal/moodle 2012-05-09 11:35:38 +12:00
Sam Hemelryk
3803b4706a Merge branch 'MDL-18095-master-2' of git://git.luns.net.uk/moodle 2012-05-09 11:31:58 +12:00
Sam Hemelryk
70ebfcee6f Merge branch 'w19_MDL-32178_m23_dbenrolignore' of git://github.com/skodak/moodle 2012-05-09 11:17:39 +12:00
Sam Hemelryk
b11afed8cd Merge branch 'w19_MDL-32807_m23_navref' of git://github.com/skodak/moodle 2012-05-09 11:01:31 +12:00
Sam Hemelryk
b3c35188b0 MDL-32654 course-toolbox: Fixed up JS issue caused by incorrect selector 2012-05-09 10:55:17 +12:00
Sam Hemelryk
45d79572b5 Merge branch 'w19_MDL-32849_m23_urlrewriting' of git://github.com/skodak/moodle 2012-05-09 10:41:58 +12:00
Sam Hemelryk
9eb54eb4d7 Merge branch 'w19_MDL-32846_m23_syncyui2' of git://github.com/skodak/moodle 2012-05-09 10:27:46 +12:00
Petr Skoda
8c6136a879 MDL-32793 use geoLookup for IP address lookup by default 2012-05-08 23:45:28 +02:00
Sam Hemelryk
73002f1992 Merge branch 'MDL-32654-master-2' of git://git.luns.net.uk/moodle
Conflicts:
	course/yui/toolboxes/toolboxes.js
2012-05-09 09:32:01 +12:00
Sam Hemelryk
b34e00c197 Merge branch 'MDL-32771-2' of git://github.com/danpoltawski/moodle 2012-05-09 09:14:20 +12:00
Petr Skoda
18ac11b730 MDL-32849 add support for url rewriting in min_get_slash_argument() and combo loader
This helps especially IIS servers using ^([^\?]+?\.php)(\/.+)$ rewrite rule.
2012-05-08 20:11:44 +02:00
Dan Poltawski
f7ae27e887 Merge branch 'w19_MDL-32683_m23_publiccache' of git://github.com/skodak/moodle 2012-05-08 21:10:49 +08:00
Petr Skoda
acc165aac7 MDL-32846 do not forget to create dir for bogus image file placeholders 2012-05-08 14:44:50 +02:00
Petr Skoda
1c6d3af542 MDL-32683 fix sloppy copy/pasting from yui_combo 2012-05-08 14:31:23 +02:00
Petr Skoda
0dbe494b39 MDL-32846 force async loading of all YUI2 modules 2012-05-08 14:16:48 +02:00
Ruslan Kabalin
c5883e7994 MDL-18095 gradebook: Make sure grade override flag is cleared whenever required
The check for feedback and grade equality between recorded values and the current
form ones before removing override flag is not really required.
2012-05-08 11:53:31 +01:00
Dan Poltawski
cd41392c83 Merge branch 'w19_MDL-32825_m23_caches' of git://github.com/skodak/moodle 2012-05-08 17:46:39 +08:00
Andrew Robert Nicols
b003b556cc MDL-32683 M.util.image_url shouldn't require the component 2012-05-08 10:25:58 +01:00
Andrew Robert Nicols
45b364b92c MDL-32654 Improve course javascript status spinner 2012-05-08 09:12:15 +01:00
Frederic Massart
114dd080e1 MDL-32718 Fixed typo in column name 2012-05-08 15:54:11 +08:00
Petr Skoda
353efa008d MDL-32843 import YUI 3.5.1 2012-05-08 09:21:27 +02:00
Ankit Agarwal
d5f7468eca MDL-31940 data: Removing deprecated function data_get_participants 2012-05-08 15:04:53 +08:00
Dan Poltawski
3a35a9ff8b MDL-32771 - course: add ability to increase/reduce number of sections
* addsection.php is renamed to changenumsections.php to reflect new purpose
* The add button is changed to a +- toggle rahter than big 'add section'
2012-05-08 15:00:46 +08:00
Ankit Agarwal
8bb7fb7008 MDL-31940 assignment: Removing deprecated function assignment_get_participants 2012-05-08 14:59:23 +08:00
Jason Fowler
ce5f042b82 MDL-31948 - IMC-CP - Removing the deprecated imscp_get_participants function 2012-05-08 14:58:02 +08:00
Jason Fowler
3edf380de6 MDL-31950 - Label - Removing the deprecated label_get_participants function 2012-05-08 14:53:54 +08:00
Ankit Agarwal
ecb6b25b0d MDL-31946 forum: Removing deprecated function folder_get_participants 2012-05-08 14:50:22 +08:00
Ankit Agarwal
c1413e22e2 MDL-31945 folder: Removing deprecated function folder_get_participants 2012-05-08 14:44:47 +08:00
Jason Fowler
dd6ae1784c MDL-31952 - Resource - Removing the deprecated page_get_participants function 2012-05-08 14:40:53 +08:00
Jason Fowler
c72c01b184 MDL-31953 - Resource - Removing the deprecated resource_get_participants function 2012-05-08 14:37:43 +08:00
Jason Fowler
58cc51ee15 MDL-31947 - Glossary - Removing the deprecated glossary_get_participants function 2012-05-08 14:33:42 +08:00
Sam Hemelryk
bbb0a6eb02 Merge branch 'MDL-32509' of git://github.com/danpoltawski/moodle 2012-05-08 18:12:28 +12:00
Sam Hemelryk
cd6b62c849 Merge branch 'MDL-32670' of git://github.com/rlorenzo/moodle 2012-05-08 18:07:07 +12:00
Sam Hemelryk
d7013dba20 Merge branch 'MDL-32777' of git://github.com/danpoltawski/moodle 2012-05-08 17:49:44 +12:00
Sam Hemelryk
301cf946a6 Merge branch 'MDL-31671-master2' of git://github.com/ankitagarwal/moodle 2012-05-08 17:42:03 +12:00
Dan Poltawski
4022860ea8 Merge branch 'w19_MDL-31691_m23_cohortidnumber' of git://github.com/skodak/moodle 2012-05-08 12:40:33 +08:00
Dan Poltawski
1fb26160f2 Merge branch 'MDL-32718-sql-typo' of git://github.com/mudrd8mz/moodle 2012-05-08 12:35:49 +08:00
Dan Poltawski
92e1ae5447 Merge branch 'MDL-31854' of git://github.com/timhunt/moodle 2012-05-08 12:33:45 +08:00
Dan Poltawski
35c5e46d88 Merge branch 'master-MDL-30598' of git://github.com/danmarsden/moodle 2012-05-08 12:22:30 +08:00
Dan Poltawski
8243bc686b Merge branch 'MDL-32768-CLEAN' of git://github.com/netspotau/moodle-mod_assign 2012-05-08 11:24:43 +08:00
Damyon Wiese
3ec209133d MDL-32768: Remove unused function count_files from mod_assign
This is implemented in the plugins and is not used in the base assign class.
This was also using a constant from the assignsubmission_file plugin which is
bad form.
2012-05-08 11:02:25 +08:00
Sam Hemelryk
4ecbd65d32 Merge branch 'MDL-32681-master-2' of git://git.luns.net.uk/moodle 2012-05-08 11:14:12 +12:00
Sam Hemelryk
42708cbeb1 Merge branch 'MDL-32743-master-2' of git://git.luns.net.uk/moodle 2012-05-08 11:05:53 +12:00
Petr Skoda
979d320722 MDL-32825 try to improve atomicity of cache file operations in themes and javascript 2012-05-07 18:45:13 +02:00
Dan Poltawski
4dd63b6d70 Merge branch 'w19_MDL-32683_m23_publiccache' of git://github.com/skodak/moodle 2012-05-07 19:17:40 +08:00
Petr Skoda
3db67789a1 MDL-32683 assert $CFG->slasharguments is enabled in new installs
Thanks Dan Poltawski for spotting it.
2012-05-07 13:05:42 +02:00