53018 Commits

Author SHA1 Message Date
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
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
96a241736e Merge branch 'MDL-18335' of git://github.com/rwijaya/moodle 2012-05-07 15:32:24 +08:00
Dan Poltawski
63313eca72 Merge branch 'w19_MDL-32762_m23_forumstrict' of git://github.com/skodak/moodle 2012-05-07 15:27:51 +08:00
Dan Poltawski
c3c70f09d6 Merge branch 'w19_MDL-32735_m23_feedbackstrict' of git://github.com/skodak/moodle 2012-05-07 15:08:21 +08:00
Dan Poltawski
5c46aee8fd Revert "MDL-32379: Fix memory leak in session_set_user"
This reverts commit 22dc32042a92f1ed521afaf4352cd931c20b11ea.

This integrator didn't properly read the diff, sorry.
2012-05-07 14:39:43 +08:00
Dan Poltawski
74bf5cb999 Merge branch 'MDL-32781' of git://github.com/netspotau/moodle-mod_assign 2012-05-07 13:17:07 +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
007fe3f775 Merge branch 'w19_MDL-32719_m23_enrolstrict' of git://github.com/skodak/moodle 2012-05-07 12:58:40 +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
efff2ab77f Merge branch 'MDL-32430' of git://github.com/timhunt/moodle 2012-05-07 12:48:18 +08:00
Dan Poltawski
9af52f493a Merge branch 'MDL-32786' of git://github.com/stronk7/moodle 2012-05-07 12:44:19 +08:00
Dan Poltawski
deda57ae1a Merge branch 'MDL-32768-CLEAN' of git://github.com/netspotau/moodle-mod_assign 2012-05-07 12:37:09 +08:00
Dan Poltawski
defbe24610 Merge branch 'MDL-32772-CLEAN' of git://github.com/netspotau/moodle-mod_assign 2012-05-07 12:34:06 +08:00
Dan Poltawski
7e6d3880b4 Merge branch 'MDL-32774-CLEAN' of git://github.com/netspotau/moodle-mod_assign 2012-05-07 12:28:34 +08:00
Damyon Wiese
9f91316495 MDL-32781: assignfeedback_comments plugin not loading previous comments
Was setting the wrong field names in the form.
2012-05-07 12:15:08 +08:00
Dan Poltawski
33e71140bb Merge branch 'MDL-32698_questionengine_typos' of git://github.com/davosmith/moodle 2012-05-07 12:05:43 +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
Dan Poltawski
11c33d32be Merge branch 'MDL-32788' of git://github.com/timhunt/moodle 2012-05-07 11:16:22 +08:00
Dan Poltawski
b2344ab366 Merge branch 'MDL-32009-master-3' of git://git.luns.net.uk/moodle 2012-05-07 11:07:28 +08:00
Damyon Wiese
8ab7bb9f56 MDL-32768: mod_assign - Change plugin constants to use correct prefix for component 2012-05-07 10:59:07 +08:00
Damyon Wiese
ee225061dc MDL-32774: Require sesskey for all actions in the assignment upgrade tool 2012-05-07 10:51:05 +08:00
Damyon Wiese
a3dbdc2c03 MDL-32772: Change SQL for mod_assign gradingtable to use named query parameters
This makes it consistent with the built in filtering in flexible_table.

Fix additional issue with SQL for grading table when there are no enrolled users

Change SQL for mod_assign grading table to use get_in_or_equal
As Suggested by Andrew Nicols in tracker
2012-05-07 10:45:23 +08:00
Dan Poltawski
dafea445db Merge branch 'MDL-32782' of git://github.com/netspotau/moodle-mod_assign 2012-05-07 10:20:46 +08:00
Dan Poltawski
b766edea0a Merge branch 'MDL-32745-master-1' of git://git.luns.net.uk/moodle 2012-05-07 10:18:06 +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
cc8cc1df80 MDL-32645 fix enrol_database tests 2012-05-06 14:46:14 +02:00
Petr Skoda
411fd747cf MDL-32735 fix multiple E_STRICT feedback issues 2012-05-06 12:02:54 +02:00
Petr Skoda
0209f96485 MDL-32762 fix E_STRICT issue in forum 2012-05-06 10:54:37 +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
dbe14f39c0 MDL-32683 fine tune yui resource caching 2012-05-05 17:25:27 +02:00
Petr Skoda
2c61e7cc4a MDL-32683 fine tune theme style sheet caching 2012-05-05 17:06:58 +02:00
Petr Skoda
8475b9704f MDL-32683 fine tune theme javascript caching 2012-05-05 16:54:06 +02:00
Petr Skoda
71d4c60389 MDL-32683 fine tune theme image caching 2012-05-05 16:53:45 +02:00
Petr Skoda
d5222fae5f MDL-32683 use slashargument urls for yui images 2012-05-05 16:14:48 +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