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
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 12:46:14 +0000 (14:46 +0200)]
MDL-32645 fix enrol_database tests
Petr Skoda [Sun, 6 May 2012 10:02:54 +0000 (12:02 +0200)]
MDL-32735 fix multiple E_STRICT feedback issues
Petr Skoda [Sun, 6 May 2012 08:54:37 +0000 (10:54 +0200)]
MDL-32762 fix E_STRICT issue in forum
Petr Skoda [Sat, 5 May 2012 16:23:51 +0000 (18:23 +0200)]
MDL-32683 minor css related refactoring
Petr Skoda [Sat, 5 May 2012 16:16:50 +0000 (18:16 +0200)]
MDL-32683 improve and standardise JS serving
Petr Skoda [Sat, 5 May 2012 15:25:27 +0000 (17:25 +0200)]
MDL-32683 fine tune yui resource caching
Petr Skoda [Sat, 5 May 2012 15:06:58 +0000 (17:06 +0200)]
MDL-32683 fine tune theme style sheet caching
Petr Skoda [Sat, 5 May 2012 14:54:06 +0000 (16:54 +0200)]
MDL-32683 fine tune theme javascript caching
Petr Skoda [Sat, 5 May 2012 14:40:33 +0000 (16:40 +0200)]
MDL-32683 fine tune theme image caching
Petr Skoda [Sat, 5 May 2012 14:14:48 +0000 (16:14 +0200)]
MDL-32683 use slashargument urls for yui images
Petr Skoda [Sat, 5 May 2012 13:59:43 +0000 (15:59 +0200)]
MDL-32683 use slashargument urls for yui combo loader
Petr Skoda [Sat, 5 May 2012 13:31:27 +0000 (15:31 +0200)]
MDL-32683 use slashargument urls for theme javascript files
Petr Skoda [Sat, 5 May 2012 13:25:20 +0000 (15:25 +0200)]
MDL-32683 use slashargument urls for theme style sheets
Petr Skoda [Sat, 5 May 2012 12:45:26 +0000 (14:45 +0200)]
MDL-32683 use slashargument urls for theme images
Petr Skoda [Sat, 5 May 2012 11:43:57 +0000 (13:43 +0200)]
MDL-32683 explicitly allow more caching of static content
Petr Skoda [Sat, 5 May 2012 08:55:57 +0000 (10:55 +0200)]
MDL-31617 add course sortorder index to improve perf
Petr Skoda [Sat, 5 May 2012 08:45:39 +0000 (10:45 +0200)]
MDL-32719 fix old enrol UI E_STRICT issue
Dan Poltawski [Sat, 5 May 2012 02:22:59 +0000 (10:22 +0800)]
MDL-32777 format_topics/weeks: section-summary CSS
Ensure there isn't list-style like bullets
Tim Hunt [Fri, 4 May 2012 16:41:25 +0000 (17:41 +0100)]
MDL-31854 quiz grades report: move total grade closer to names.
Tim Hunt [Fri, 4 May 2012 14:17:23 +0000 (15:17 +0100)]
MDL-32430 quiz calendar events: fix pluginfile URLs in the description.
Tim Hunt [Fri, 4 May 2012 11:40:21 +0000 (12:40 +0100)]
MDL-32788 quiz: clean up codechecker issues before the 2.3 release.
Eloy Lafuente (stronk7) [Fri, 4 May 2012 11:10:40 +0000 (13:10 +0200)]
weekly release 2.3dev
Eloy Lafuente (stronk7) [Fri, 4 May 2012 11:06:42 +0000 (13:06 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Fri, 4 May 2012 10:44:10 +0000 (12:44 +0200)]
MDL-32786 E_STRICT: fix warning when creating a new service.
Dan Marsden [Fri, 4 May 2012 08:05:29 +0000 (20:05 +1200)]
MDL-31731 gradeing form: Fix module name
Dan Marsden [Fri, 4 May 2012 07:26:16 +0000 (19:26 +1200)]
MDL-31731 Advanced Grading: Marking Guide - prevent negative scores when marking users
Damyon Wiese [Fri, 4 May 2012 08:01:41 +0000 (16:01 +0800)]
MDL-32782: Remove unused source file from assignment upgrade tool (lib.php)
Eloy Lafuente (stronk7) [Fri, 4 May 2012 08:01:07 +0000 (10:01 +0200)]
Merge branch 'MDL-32754' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Fri, 4 May 2012 06:02:39 +0000 (14:02 +0800)]
MDL-31731 gradeing form: Fix hardcoded module name
Andrew Robert Nicols [Thu, 3 May 2012 14:02:10 +0000 (15:02 +0100)]
MDL-32508 Add error when trying to access an unknown course section
Sam Hemelryk [Fri, 4 May 2012 05:13:36 +0000 (17:13 +1200)]
MDL-32508 Trivial whitespace cleanup
Damyon Wiese [Fri, 4 May 2012 04:05:58 +0000 (12:05 +0800)]
MDL-32754: Add missing string for assign:addinstance capability
AMOS BEGIN
CPY [assignment:addinstance,mod_assignment],[assign:addinstance,mod_assign]
AMOS END
Dan Poltawski [Fri, 4 May 2012 03:00:53 +0000 (11:00 +0800)]
MDL-32508 backup: coursedisplay now included in backup
Andrew Robert Nicols [Thu, 3 May 2012 11:38:31 +0000 (12:38 +0100)]
MDL-32508 Close the topic/week ul before showing the add section link
Dan Poltawski [Thu, 3 May 2012 11:09:02 +0000 (19:09 +0800)]
MDL-32508 course formats: make renderer methods protected
The renderer isn't a public API yet, its just reducing code duplication
and tidying things up. So not making the methods public for other plugins
to abuse. We hope to solve this properly in 2.4
Dan Poltawski [Thu, 3 May 2012 11:04:46 +0000 (19:04 +0800)]
MDL-32508 course_formats: change format_renderer_base to format_section_renderer_base
Make it clear that this isn't a golden supported API
Dan Poltawski [Thu, 3 May 2012 11:00:40 +0000 (19:00 +0800)]
MDL-32505 course_formats: introduce upgrade.txt
Dan Poltawski [Thu, 3 May 2012 10:43:26 +0000 (18:43 +0800)]
MDL-32508 course_format: fix up some minor style issues
Noticed whilst reviewing again
Dan Poltawski [Thu, 3 May 2012 10:30:18 +0000 (18:30 +0800)]
MDL-32508 Remove debuggign warning about callback_format_get_section_url
It is not the time to deprecate this callback as we may be doing
major changes in 2.4 so removing the warning about it.
Dan Poltawski [Thu, 3 May 2012 10:13:46 +0000 (18:13 +0800)]
MDL-32505 lib/tests: fix unit test using removed table
Dan Poltawski [Mon, 30 Apr 2012 07:05:02 +0000 (15:05 +0800)]
MDL-32505/MDL-32508 course: fix section_links block
Now course_display has gone
Dan Poltawski [Mon, 30 Apr 2012 03:46:15 +0000 (11:46 +0800)]
MDL-32508 navigation: show empty sections
Dan Poltawski [Mon, 30 Apr 2012 04:16:55 +0000 (12:16 +0800)]
MDL-32508 course/format: Display general section above title
Dan Poltawski [Mon, 30 Apr 2012 04:15:11 +0000 (12:15 +0800)]
MDL-32508 course/format: Hide 'format outline' titles
It is now hidden for for accessibility only
Dan Poltawski [Mon, 30 Apr 2012 04:14:15 +0000 (12:14 +0800)]
MDL-32508 course/format: Only display topic number in topic format
Dan Poltawski [Mon, 30 Apr 2012 03:23:37 +0000 (11:23 +0800)]
MDL-32508 course: turn editting on/off stays on current page
Rather than always going to the index page, we can edit on section page
Dan Poltawski [Mon, 21 Nov 2011 15:11:35 +0000 (15:11 +0000)]
MDL-32508 course: Add basic 'add a section' button at the bottom of the course page
With thanks to LUNS who provided this code from when I did it working
there.
Dan Poltawski [Fri, 27 Apr 2012 05:11:35 +0000 (13:11 +0800)]
MDL-32508 course/formats: Respect single page course display mode
Topics and weeks have been converted to use a shared renderer to output
their content.
Note, I started with good intentions but this renderer has mixed
paradgims due to fast and cheap winning out on the trinity.
AMOS BEGIN
MOV [currenttopic,access],[currentsection,format_topics]
MOV [currentweek,access],[currentsection,format_weeks]
AMOS END