52952 Commits

Author SHA1 Message Date
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
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
Dan Poltawski
f755868314 MDL-32508 course formats: Remove key callback
This was used by course formats but now there is a standardised
'section' param
2012-05-04 10:52:59 +08:00
Dan Poltawski
5218b9bb7d MDL-32508 course: Introduce course_get_url() 2012-05-04 10:52:58 +08:00
Dan Poltawski
45774bddf7 MDL-32508 course: Switch to 'section' URL param
This is a course format independent url param and replaces weekly/topic specific params.
By using a standardised param we are able to use this url consistenly across the codebase
and reduce the risk of param collision
2012-05-04 10:52:58 +08:00
Dan Poltawski
e3c171e19b MDL-32508 course/view.php: action cleanup
After doing actions redirect back to the 'real url' in order to
prevent problems with caching/bookmarking bad urls
2012-05-04 10:52:58 +08:00
Dan Poltawski
599a52fec7 MDL-32508 course/view.php: moderise with MUST_EXIST 2012-05-04 10:52:57 +08:00
Dan Poltawski
3fe600aacf MDL-32505 course formats: zooming feature be gone! 2012-05-04 10:52:57 +08:00
Dan Poltawski
b9bcdb54da MDL-32505 course: drop course_display table and settings 2012-05-04 10:52:56 +08:00
Dan Poltawski
1156d38d94 MDL-32504 course: Add coursedisplay setting to course table
This will replace the course_display database table
2012-05-04 10:49:52 +08:00
Dan Poltawski
4d6206ce67 MDL-32628 lib/filelib.php: Set user profile image expires to 1 year
This is to reduce the performance impact of user profile images
requests. Pictures are now referenced by a revision counter so
any changes in picture will not be badly cached any longer.
2012-05-04 09:36:11 +08:00
Dan Poltawski
0dda790c05 Merge branch 'w18_MDL-32628_m23_avatarperf2' of git://github.com/skodak/moodle
Conflicts:
    lib/db/upgrade.php
	version.php
2012-05-04 09:28:41 +08:00
Dan Poltawski
313cdd4fe4 Merge branch 'MDL-32757' of git://github.com/timhunt/moodle 2012-05-04 07:30:45 +08:00
Dan Poltawski
fcbd37e38a Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle 2012-05-04 07:28:29 +08:00
Dan Marsden
6c20925827 MDL-31731 Advanced Grading: Marking Guide display scale warning for higher max grade as well as lower. 2012-05-04 09:33:30 +12:00
Dan Marsden
b4b1d49044 MDL-31731 Advanced Grading: Marking Guide: fix bug with check to display warning about discrepency between module maxgrade and number of marks in Marking Guide. 2012-05-04 09:12:29 +12:00
Tim Hunt
070511062a MDL-32757 / MDL-3030 quiz: SQL typo breaks quiz editing. 2012-05-03 19:45:18 +01:00
Dan Poltawski
e50de8764b Merge branch 'MDL-32738' of git://github.com/timhunt/moodle 2012-05-04 01:09:53 +08:00
Tim Hunt
f59f85717e MDL-32738 quiz overdue handling cron: appease MySQL.
Thanks to sam marshall for giving my the idea of using a subquery to
make the SQL work on all DBs.
2012-05-03 18:07:59 +01:00
Dan Poltawski
59e430718a Merge branch 'MDL-32740' of git://github.com/timhunt/moodle 2012-05-04 00:58:00 +08:00
Eloy Lafuente (stronk7)
97101a0397 Merge branch 'MDL-32693' of git://github.com/danpoltawski/moodle 2012-05-03 18:22:05 +02:00
Petr Skoda
3690955e65 MDL-32680 import latest TinyMCE 3.5 2012-05-03 15:49:23 +02:00
Dan Poltawski
f1e8e6adce Merge branch 'MDL-32739' of git://github.com/timhunt/moodle 2012-05-03 21:23:19 +08:00