Dan Poltawski [Wed, 9 May 2012 02:28:48 +0000 (10:28 +0800)]
Merge branch 'w19_MDL-32733_m23_authorizemessage' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 9 May 2012 02:22:48 +0000 (10:22 +0800)]
Merge branch 'w19_MDL-32775_m23_searchpix' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 9 May 2012 02:17:50 +0000 (10:17 +0800)]
Merge branch 'w19_MDL-32793_m23_iplookup' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 8 May 2012 23:50:17 +0000 (11:50 +1200)]
Merge branch 'wip-MDL-31147-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 8 May 2012 23:49:33 +0000 (11:49 +1200)]
Merge branch 'wip-MDL-31948-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 8 May 2012 23:49:23 +0000 (11:49 +1200)]
Merge branch 'wip-MDL-31950-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 8 May 2012 23:49:14 +0000 (11:49 +1200)]
Merge branch 'wip-MDL-31952-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 8 May 2012 23:48:35 +0000 (11:48 +1200)]
Merge branch 'wip-MDL-31953-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 8 May 2012 23:47:00 +0000 (11:47 +1200)]
Merge branch 'MDL-32164-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 8 May 2012 23:43:27 +0000 (11:43 +1200)]
Merge branch 'MDL-31940-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 8 May 2012 23:39:02 +0000 (11:39 +1200)]
Merge branch 'MDL-31943-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 8 May 2012 23:37:29 +0000 (11:37 +1200)]
Merge branch 'MDL-31945-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 8 May 2012 23:35:38 +0000 (11:35 +1200)]
Merge branch 'MDL-31946-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 8 May 2012 23:31:58 +0000 (11:31 +1200)]
Merge branch 'MDL-18095-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 8 May 2012 23:17:39 +0000 (11:17 +1200)]
Merge branch 'w19_MDL-32178_m23_dbenrolignore' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 8 May 2012 23:01:31 +0000 (11:01 +1200)]
Merge branch 'w19_MDL-32807_m23_navref' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 8 May 2012 22:55:17 +0000 (10:55 +1200)]
MDL-32654 course-toolbox: Fixed up JS issue caused by incorrect selector
Sam Hemelryk [Tue, 8 May 2012 22:41:58 +0000 (10:41 +1200)]
Merge branch 'w19_MDL-32849_m23_urlrewriting' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 8 May 2012 22:27:46 +0000 (10:27 +1200)]
Merge branch 'w19_MDL-32846_m23_syncyui2' of git://github.com/skodak/moodle
Petr Skoda [Sat, 5 May 2012 09:20:10 +0000 (11:20 +0200)]
MDL-32793 use geoLookup for IP address lookup by default
Sam Hemelryk [Tue, 8 May 2012 21:32:01 +0000 (09:32 +1200)]
Merge branch 'MDL-32654-master-2' of git://git.luns.net.uk/moodle
Conflicts:
course/yui/toolboxes/toolboxes.js
Sam Hemelryk [Tue, 8 May 2012 21:14:20 +0000 (09:14 +1200)]
Merge branch 'MDL-32771-2' of git://github.com/danpoltawski/moodle
Petr Skoda [Tue, 8 May 2012 17:13:53 +0000 (19:13 +0200)]
MDL-32849 add support for url rewriting in min_get_slash_argument() and combo loader
This helps especially IIS servers using ^([^\?]+?\.php)(\/.+)$ rewrite rule.
Dan Poltawski [Tue, 8 May 2012 13:10:49 +0000 (21:10 +0800)]
Merge branch 'w19_MDL-32683_m23_publiccache' of git://github.com/skodak/moodle
Petr Skoda [Tue, 8 May 2012 12:44:34 +0000 (14:44 +0200)]
MDL-32846 do not forget to create dir for bogus image file placeholders
Petr Skoda [Tue, 8 May 2012 12:31:23 +0000 (14:31 +0200)]
MDL-32683 fix sloppy copy/pasting from yui_combo
Petr Skoda [Tue, 8 May 2012 12:16:48 +0000 (14:16 +0200)]
MDL-32846 force async loading of all YUI2 modules
Ruslan Kabalin [Thu, 8 Mar 2012 10:19:20 +0000 (10:19 +0000)]
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.
Dan Poltawski [Tue, 8 May 2012 09:46:39 +0000 (17:46 +0800)]
Merge branch 'w19_MDL-32825_m23_caches' of git://github.com/skodak/moodle
Andrew Robert Nicols [Tue, 8 May 2012 09:25:58 +0000 (10:25 +0100)]
MDL-32683 M.util.image_url shouldn't require the component
Andrew Robert Nicols [Thu, 26 Apr 2012 09:43:25 +0000 (10:43 +0100)]
MDL-32654 Improve course javascript status spinner
Frederic Massart [Tue, 8 May 2012 05:53:51 +0000 (13:53 +0800)]
MDL-32718 Fixed typo in column name
Ankit Agarwal [Tue, 8 May 2012 07:04:53 +0000 (15:04 +0800)]
MDL-31940 data: Removing deprecated function data_get_participants
Dan Poltawski [Mon, 7 May 2012 10:49:10 +0000 (18:49 +0800)]
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'
Ankit Agarwal [Tue, 8 May 2012 06:59:23 +0000 (14:59 +0800)]
MDL-31940 assignment: Removing deprecated function assignment_get_participants
Jason Fowler [Tue, 8 May 2012 06:58:02 +0000 (14:58 +0800)]
MDL-31948 - IMC-CP - Removing the deprecated imscp_get_participants function
Jason Fowler [Tue, 8 May 2012 06:53:54 +0000 (14:53 +0800)]
MDL-31950 - Label - Removing the deprecated label_get_participants function
Ankit Agarwal [Tue, 8 May 2012 06:49:40 +0000 (14:49 +0800)]
MDL-31946 forum: Removing deprecated function folder_get_participants
Ankit Agarwal [Tue, 8 May 2012 06:44:47 +0000 (14:44 +0800)]
MDL-31945 folder: Removing deprecated function folder_get_participants
Jason Fowler [Tue, 8 May 2012 06:40:53 +0000 (14:40 +0800)]
MDL-31952 - Resource - Removing the deprecated page_get_participants function
Jason Fowler [Tue, 8 May 2012 06:37:43 +0000 (14:37 +0800)]
MDL-31953 - Resource - Removing the deprecated resource_get_participants function
Jason Fowler [Tue, 8 May 2012 06:33:42 +0000 (14:33 +0800)]
MDL-31947 - Glossary - Removing the deprecated glossary_get_participants function
Sam Hemelryk [Tue, 8 May 2012 06:12:28 +0000 (18:12 +1200)]
Merge branch 'MDL-32509' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 8 May 2012 06:07:07 +0000 (18:07 +1200)]
Merge branch 'MDL-32670' of git://github.com/rlorenzo/moodle
Sam Hemelryk [Tue, 8 May 2012 05:49:44 +0000 (17:49 +1200)]
Merge branch 'MDL-32777' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 8 May 2012 05:42:03 +0000 (17:42 +1200)]
Merge branch 'MDL-31671-master2' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 8 May 2012 04:40:33 +0000 (12:40 +0800)]
Merge branch 'w19_MDL-31691_m23_cohortidnumber' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 8 May 2012 04:35:49 +0000 (12:35 +0800)]
Merge branch 'MDL-32718-sql-typo' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 8 May 2012 04:33:45 +0000 (12:33 +0800)]
Merge branch 'MDL-31854' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 8 May 2012 04:22:30 +0000 (12:22 +0800)]
Merge branch 'master-MDL-30598' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 8 May 2012 03:24:43 +0000 (11:24 +0800)]
Merge branch 'MDL-32768-CLEAN' of git://github.com/netspotau/moodle-mod_assign
Damyon Wiese [Tue, 8 May 2012 03:02:25 +0000 (11:02 +0800)]
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.
Sam Hemelryk [Mon, 7 May 2012 23:14:12 +0000 (11:14 +1200)]
Merge branch 'MDL-32681-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 7 May 2012 23:05:53 +0000 (11:05 +1200)]
Merge branch 'MDL-32743-master-2' of git://git.luns.net.uk/moodle
Petr Skoda [Mon, 7 May 2012 15:35:09 +0000 (17:35 +0200)]
MDL-32825 try to improve atomicity of cache file operations in themes and javascript
Dan Poltawski [Mon, 7 May 2012 11:17:40 +0000 (19:17 +0800)]
Merge branch 'w19_MDL-32683_m23_publiccache' of git://github.com/skodak/moodle
Petr Skoda [Mon, 7 May 2012 11:05:42 +0000 (13:05 +0200)]
MDL-32683 assert $CFG->slasharguments is enabled in new installs
Thanks Dan Poltawski for spotting it.
Petr Skoda [Mon, 7 May 2012 10:49:26 +0000 (12:49 +0200)]
MDL-32683 fix outdated tests
Dan Poltawski [Mon, 7 May 2012 09:55:31 +0000 (17:55 +0800)]
Merge branch 'w19_MDL-32683_m23_publiccache' of git://github.com/skodak/moodle
Dan Marsden [Mon, 7 May 2012 08:51:43 +0000 (20:51 +1200)]
MDL-30598 SCORM fix a few coding guideline issues, tidy up phpdocs
David Mudrak [Mon, 7 May 2012 08:02:41 +0000 (10:02 +0200)]
MDL-32718 fixing an SQL typo in workshop_get_recent_mod_activity()
Dan Poltawski [Mon, 7 May 2012 07:32:24 +0000 (15:32 +0800)]
Merge branch 'MDL-18335' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 7 May 2012 07:27:51 +0000 (15:27 +0800)]
Merge branch 'w19_MDL-32762_m23_forumstrict' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 7 May 2012 07:08:21 +0000 (15:08 +0800)]
Merge branch 'w19_MDL-32735_m23_feedbackstrict' of git://github.com/skodak/moodle
Ankit Agarwal [Tue, 1 May 2012 02:58:00 +0000 (10:58 +0800)]
MDL-31671 calendar: update_event hook should be triggered when updating event
Ankit Agarwal [Fri, 27 Apr 2012 08:33:26 +0000 (16:33 +0800)]
MDL-31671 calendar: Fixing error when trying to delete parent of a repeated event series
Dan Poltawski [Mon, 7 May 2012 06:39:43 +0000 (14:39 +0800)]
Revert "MDL-32379: Fix memory leak in session_set_user"
This reverts commit
22dc32042a92f1ed521afaf4352cd931c20b11ea.
This integrator didn't properly read the diff, sorry.
Dan Poltawski [Mon, 7 May 2012 05:17:07 +0000 (13:17 +0800)]
Merge branch 'MDL-32781' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Mon, 7 May 2012 05:03:50 +0000 (13:03 +0800)]
Merge branch 'MDL-32684' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 7 May 2012 04:58:40 +0000 (12:58 +0800)]
Merge branch 'w19_MDL-32719_m23_enrolstrict' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 7 May 2012 04:51:20 +0000 (12:51 +0800)]
Merge branch 'w19_MDL-31617_m23_coursesortorder' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 7 May 2012 04:48:18 +0000 (12:48 +0800)]
Merge branch 'MDL-32430' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 7 May 2012 04:44:19 +0000 (12:44 +0800)]
Merge branch 'MDL-32786' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 7 May 2012 04:37:09 +0000 (12:37 +0800)]
Merge branch 'MDL-32768-CLEAN' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Mon, 7 May 2012 04:34:06 +0000 (12:34 +0800)]
Merge branch 'MDL-32772-CLEAN' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Mon, 7 May 2012 04:28:34 +0000 (12:28 +0800)]
Merge branch 'MDL-32774-CLEAN' of git://github.com/netspotau/moodle-mod_assign
Damyon Wiese [Mon, 7 May 2012 04:15:08 +0000 (12:15 +0800)]
MDL-32781: assignfeedback_comments plugin not loading previous comments
Was setting the wrong field names in the form.
Dan Poltawski [Mon, 7 May 2012 04:05:43 +0000 (12:05 +0800)]
Merge branch 'MDL-32698_questionengine_typos' of git://github.com/davosmith/moodle
Dan Poltawski [Mon, 7 May 2012 03:35:26 +0000 (11:35 +0800)]
Merge branch 'wip-MDL-32267-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 7 May 2012 03:29:01 +0000 (11:29 +0800)]
Merge branch 'mdl32379_23' of git://github.com/tlevi/moodle
Dan Poltawski [Mon, 7 May 2012 03:16:22 +0000 (11:16 +0800)]
Merge branch 'MDL-32788' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 7 May 2012 03:07:28 +0000 (11:07 +0800)]
Merge branch 'MDL-32009-master-3' of git://git.luns.net.uk/moodle
Damyon Wiese [Fri, 4 May 2012 04:56:54 +0000 (12:56 +0800)]
MDL-32768: mod_assign - Change plugin constants to use correct prefix for component
Damyon Wiese [Fri, 4 May 2012 06:36:06 +0000 (14:36 +0800)]
MDL-32774: Require sesskey for all actions in the assignment upgrade tool
Damyon Wiese [Fri, 4 May 2012 05:38:52 +0000 (13:38 +0800)]
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
Christopher Tombleson [Mon, 7 May 2012 02:32:47 +0000 (14:32 +1200)]
MDL-30598 SCORM api.php moved to loaddatamodel.php
Merged api.php into loaddatamodel.php. Changed all references to api.php
to point at loaddatamodel.php
Dan Poltawski [Mon, 7 May 2012 02:20:46 +0000 (10:20 +0800)]
Merge branch 'MDL-32782' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Mon, 7 May 2012 02:18:06 +0000 (10:18 +0800)]
Merge branch 'MDL-32745-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 7 May 2012 00:57:42 +0000 (12:57 +1200)]
MDL-28967 navigation: PHPdoc and coding style cleanup
Sam Hemelryk [Wed, 18 Apr 2012 22:27:53 +0000 (10:27 +1200)]
MDL-28967 navigation: courses branch is only shown if all courses are loaded or you're not enrolled in any course
Sam Hemelryk [Fri, 30 Mar 2012 00:32:05 +0000 (13:32 +1300)]
MDL-28967 navigation: Removed buggy caching of course loading information
Sam Hemelryk [Fri, 30 Mar 2012 00:27:12 +0000 (13:27 +1300)]
MDL-28967 navigation: Fixed up AJAX loading of categories
Sam Hemelryk [Wed, 28 Mar 2012 23:29:40 +0000 (12:29 +1300)]
MDL-28967 navigation: Optimised load_all_categories to load preload contexts to greatly reduce database queries
Sam Hemelryk [Mon, 5 Dec 2011 23:04:51 +0000 (12:04 +1300)]
MDL-28967 navigation: Fixed up front page generation when showing categories and no enrolled courses
Sam Hemelryk [Tue, 15 Nov 2011 04:12:06 +0000 (17:12 +1300)]
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
Petr Skoda [Sun, 6 May 2012 19:37:57 +0000 (21:37 +0200)]
MDL-31691 treat cohort idnumbers as plain text
Petr Skoda [Sun, 6 May 2012 13:51:25 +0000 (15:51 +0200)]
MDL-32178 ignore duplicates in enroL_database external course table
Petr Skoda [Sun, 6 May 2012 12:46:14 +0000 (14:46 +0200)]
MDL-32645 fix enrol_database tests
Petr Skoda [Sun, 6 May 2012 11:31:55 +0000 (13:31 +0200)]
MDL-32807 remove PHP4 object reference coding style
Petr Skoda [Sun, 6 May 2012 10:07:48 +0000 (12:07 +0200)]
MDL-32735 add missing message provider info for unmaintained enrol_authorize