Commit Graph

14045 Commits

Author SHA1 Message Date
Dan Poltawski 0f1513be80 Merge branch 'w19_MDL-32775_m23_searchpix' of git://github.com/skodak/moodle 2012-05-09 10:22:48 +08: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 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
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
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
Petr Skoda 0dbe494b39 MDL-32846 force async loading of all YUI2 modules 2012-05-08 14:16:48 +02: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
Petr Skoda 353efa008d MDL-32843 import YUI 3.5.1 2012-05-08 09:21:27 +02:00
Sam Hemelryk bbb0a6eb02 Merge branch 'MDL-32509' of git://github.com/danpoltawski/moodle 2012-05-08 18:12:28 +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
Petr Skoda fcc4f23d0d MDL-32683 fix outdated tests 2012-05-07 12:49:26 +02:00
Dan Poltawski a84b57e603 Merge branch 'w19_MDL-32683_m23_publiccache' of git://github.com/skodak/moodle 2012-05-07 17:55:31 +08:00
Dan Poltawski 5c46aee8fd Revert "MDL-32379: Fix memory leak in session_set_user"
This reverts commit 22dc32042a.

This integrator didn't properly read the diff, sorry.
2012-05-07 14:39:43 +08:00
Dan Poltawski 57417ab1ec Merge branch 'MDL-32684' of git://github.com/lazydaisy/moodle 2012-05-07 13:03:50 +08:00
Dan Poltawski 73c670423d Merge branch 'w19_MDL-31617_m23_coursesortorder' of git://github.com/skodak/moodle 2012-05-07 12:51:20 +08:00
Dan Poltawski 35be447cda Merge branch 'wip-MDL-32267-m23' of git://github.com/samhemelryk/moodle 2012-05-07 11:35:26 +08:00
Dan Poltawski 11a4313109 Merge branch 'mdl32379_23' of git://github.com/tlevi/moodle 2012-05-07 11:29:01 +08:00
Sam Hemelryk 98556b23c7 MDL-28967 navigation: PHPdoc and coding style cleanup 2012-05-07 13:00:29 +12:00
Sam Hemelryk 80c695228e MDL-28967 navigation: courses branch is only shown if all courses are loaded or you're not enrolled in any course 2012-05-07 13:00:28 +12:00
Sam Hemelryk f7ee4baaee MDL-28967 navigation: Removed buggy caching of course loading information 2012-05-07 13:00:28 +12:00
Sam Hemelryk d4bb6462fc MDL-28967 navigation: Fixed up AJAX loading of categories 2012-05-07 13:00:28 +12:00
Sam Hemelryk 176b75b59c MDL-28967 navigation: Optimised load_all_categories to load preload contexts to greatly reduce database queries 2012-05-07 13:00:23 +12:00
Sam Hemelryk ee03fe79ef MDL-28967 navigation: Fixed up front page generation when showing categories and no enrolled courses 2012-05-07 12:42:24 +12:00
Sam Hemelryk 8e8de15f6c MDL-28967 navigation: Several navigation fixes
* Fixed implementation of navigation settings navshowcategories, navshowallcourses, and navcourselimit
    * Improved performance associated with loading all, or a collection of courses
    * Fixed duplicate calls to loading functions when we had the information required to know it had already occurred
2012-05-07 12:42:24 +12:00
Petr Skoda 082513badf MDL-32807 remove PHP4 object reference coding style 2012-05-06 13:31:55 +02:00
Petr Skoda 869b12554d MDL-32683 minor css related refactoring 2012-05-05 18:46:00 +02:00
Petr Skoda 8ab2974341 MDL-32683 improve and standardise JS serving 2012-05-05 18:16:50 +02:00
Petr Skoda 2c61e7cc4a MDL-32683 fine tune theme style sheet caching 2012-05-05 17:06:58 +02:00
Petr Skoda 6e7b46018e MDL-32683 use slashargument urls for yui combo loader 2012-05-05 16:13:35 +02:00
Petr Skoda ecbad2ad1c MDL-32683 use slashargument urls for theme javascript files 2012-05-05 15:31:27 +02:00
Petr Skoda 7070b7f261 MDL-32683 use slashargument urls for theme style sheets 2012-05-05 15:26:24 +02:00
Petr Skoda 9d473266a7 MDL-32683 use slashargument urls for theme images 2012-05-05 15:23:59 +02:00
Petr Skoda 8c672cf9f3 MDL-32683 explicitly allow more caching of static content 2012-05-05 14:09:31 +02:00
Petr Skoda c119a2eeb5 MDL-31617 add course sortorder index to improve perf 2012-05-05 10:55:57 +02:00
Petr Skoda bc81191a09 MDL-32775 fix invalid url in mediaplugin CSS 2012-05-05 10:31:51 +02:00
Dan Poltawski 9fa74379dc MDL-32509 enablecourseajax: remove setting from DB 2012-05-05 11:00:47 +08:00
Aparup Banerjee b21a1d4086 Merge branch 'wip-MDL-32416-master' of git://github.com/marinaglancy/moodle 2012-05-03 11:33:55 +08:00
Marina Glancy 169709383a MDL-32416: Picasa repository now returns path, also fixed album title retrieval 2012-05-03 11:30:08 +08:00
Eloy Lafuente (stronk7) 03764014af MDL-32234 Library: usergetdate tests moved to assertSame()
(to check both type and value)
2012-05-03 00:52:25 +02:00
Eloy Lafuente (stronk7) 150166d371 Merge branch 'wip-mdl-32234' of git://github.com/rajeshtaneja/moodle 2012-05-03 00:35:34 +02:00
Rajesh Taneja 86b600d67a MDL-31498 formslib: repeat_elements will now set default for group elements 2012-05-02 13:20:40 +08:00
Mary Evans c6e8b3b235 MDL-32684 lib/pagelib: adds break; statements to theme order in lib/pagelib.php 2012-05-02 01:20:04 +01:00
Sam Hemelryk fe9693df87 Merge branch 'w18_MDL-26028_m23_xsendfile' of git://github.com/skodak/moodle 2012-05-02 11:48:24 +12:00
Sam Hemelryk a6d2cf82dc Merge branch 'w18_MDL-32595_m23_unsignedandlob' of git://github.com/skodak/moodle 2012-05-02 10:25:09 +12:00
Petr Skoda a090587234 MDL-32697 improve MySQL and Oracle test reset performance 2012-05-01 14:35:23 +02:00