Commit graph

52977 commits

Author SHA1 Message Date
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
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
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
Tim Hunt
9e83f3d11d MDL-32788 quiz: clean up codechecker issues before the 2.3 release. 2012-05-04 15:12:23 +01:00
Eloy Lafuente (stronk7)
e16e2300c5 weekly release 2.3dev 2012-05-04 13:10:40 +02:00
Eloy Lafuente (stronk7)
f8e293008d Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-05-04 13:06:42 +02:00
Dan Marsden
abf0c875bb MDL-31731 gradeing form: Fix module name 2012-05-04 16:20:58 +08:00
Dan Marsden
cfc73aa790 MDL-31731 Advanced Grading: Marking Guide - prevent negative scores when marking users 2012-05-04 16:20:50 +08:00
Damyon Wiese
01e5ce8781 MDL-32782: Remove unused source file from assignment upgrade tool (lib.php) 2012-05-04 16:01:41 +08:00
Eloy Lafuente (stronk7)
bea7f96c87 Merge branch 'MDL-32754' of git://github.com/netspotau/moodle-mod_assign 2012-05-04 10:01:07 +02:00
Dan Poltawski
9fdbd69e22 MDL-31731 gradeing form: Fix hardcoded module name 2012-05-04 14:02:39 +08:00
Andrew Robert Nicols
0c053c5368 MDL-32508 Add error when trying to access an unknown course section 2012-05-04 13:41:59 +08:00
Sam Hemelryk
3df72f8ce7 MDL-32508 Trivial whitespace cleanup 2012-05-04 17:13:36 +12:00
Damyon Wiese
b843e2b747 MDL-32754: Add missing string for assign:addinstance capability
AMOS BEGIN
    CPY [assignment:addinstance,mod_assignment],[assign:addinstance,mod_assign]
AMOS END
2012-05-04 12:05:58 +08:00
Dan Poltawski
637bc17400 MDL-32508 backup: coursedisplay now included in backup 2012-05-04 11:00:53 +08:00
Andrew Robert Nicols
575826c730 MDL-32508 Close the topic/week ul before showing the add section link 2012-05-04 10:53:06 +08:00
Dan Poltawski
cbf449972f 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
2012-05-04 10:53:06 +08:00
Dan Poltawski
a8f02a3462 MDL-32508 course_formats: change format_renderer_base to format_section_renderer_base
Make it clear that this isn't a golden supported API
2012-05-04 10:53:05 +08:00
Dan Poltawski
2db66a9319 MDL-32505 course_formats: introduce upgrade.txt 2012-05-04 10:53:05 +08:00
Dan Poltawski
96e1285162 MDL-32508 course_format: fix up some minor style issues
Noticed whilst reviewing again
2012-05-04 10:53:05 +08:00
Dan Poltawski
10cdacfecb 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.
2012-05-04 10:53:04 +08:00
Dan Poltawski
2c3d986894 MDL-32505 lib/tests: fix unit test using removed table 2012-05-04 10:53:04 +08:00
Dan Poltawski
3246428b95 MDL-32505/MDL-32508 course: fix section_links block
Now course_display has gone
2012-05-04 10:53:03 +08:00
Dan Poltawski
fe221dd583 MDL-32508 navigation: show empty sections 2012-05-04 10:53:03 +08:00
Dan Poltawski
243b7003e3 MDL-32508 course/format: Display general section above title 2012-05-04 10:53:03 +08:00
Dan Poltawski
803e36e105 MDL-32508 course/format: Hide 'format outline' titles
It is now hidden for for accessibility only
2012-05-04 10:53:02 +08:00
Dan Poltawski
a830d86673 MDL-32508 course/format: Only display topic number in topic format 2012-05-04 10:53:02 +08:00
Dan Poltawski
d628215d49 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
2012-05-04 10:53:01 +08:00
Dan Poltawski
1abf12532d 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.
2012-05-04 10:53:01 +08:00
Dan Poltawski
1804b7c1bc 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
2012-05-04 10:53:01 +08:00
Dan Poltawski
143d743743 MDL-32508 course: make_editting_buttons now takes optionally returns to section 2012-05-04 10:53:00 +08:00
Dan Poltawski
838d013bb2 MDL-32508 course/mod.php: Use $sectionreturn param
This param is now used so that users are returned to the
page they started at
2012-05-04 10:53:00 +08:00
Dan Poltawski
a5a38c9473 MDL-32508 course/editsection: add a sectionreturn param
This is used so that when editing on a section page you
are returned to the section in question.
2012-05-04 10:53:00 +08:00
Dan Poltawski
d9e1326536 MDL-32508 course: deprecate get_section_url format callback 2012-05-04 10:52:59 +08:00