11005 Commits

Author SHA1 Message Date
David Mudrak
794cea253c MDL-29108 Fixing a typo
Spotted by Sam during the review (23)
2011-11-11 12:17:01 +01:00
David Mudrak
d6d341d09b Merge remote branch 'origin/master' into rubric
Conflicts:
	lib/db/upgrade.php
	version.php
2011-11-02 23:17:08 +01:00
David Mudrak
967d346f72 MDL-29794 It is now possible to re-use a form without sharing it as a template
The patch also improves displaying tags-like status information next to
the grading form titles.
2011-11-02 21:57:24 +01:00
Marina Glancy
0e2a1d755a MDL-29482: error message is displayed to graders if grading form is unavailable 2011-11-02 11:12:02 +08:00
Marina Glancy
3599b113a6 MDL-29482, MDL-29794, MDL-30037: supporting form status in rubriceditor and forms sharing; fixed bug with grade calculation 2011-11-02 10:45:32 +08:00
Marina Glancy
2ae7faf128 MDL-29482: added validation to rubric editor and the 'work in progress' status 2011-11-02 09:12:58 +08:00
David Mudrak
bb17ac1e32 MDL-29920 Gradebook grader report now supports grade analysis link
When grade analysis link is enabled, an icon is displayed next to each
grade of a module that supports grade.php file. The parameters needed to
identify the particular user and grade are passed to the grade.php
script.
2011-11-01 20:53:48 +01:00
David Mudrak
49a537b356 MDL-29482 The rubric editor is now able to save the status of the form definition 2011-11-01 18:04:31 +01:00
David Mudrak
3f3ee7114e MDL-29794 Do not offer re-sharing of unmodified forms
The patch introduces a new field 'timecopied' that holds the timestamp
of when the given form was cloned last time. Using this field, we can
decide whether the form can be actually re-shared or not.

Note that the logic just hides the icon. It is meant as a usability
feature, not any real protection from sharing.
2011-11-01 16:10:12 +01:00
David Mudrak
86e9ccfd92 MDL-29794 Shared grading form templates can be deleted now
There is a new capability to manage all shared templates. Without this
capability, the user is allowed to delete just templates they previously
shared.

In the future, an option to edit the template directly might be added.
At the moment, the workaround is to pick the template into a temporary
assignment, edit it there and re-save it as a new template.
2011-11-01 14:05:11 +01:00
Sam Hemelryk
6ab6630b87 Merge branch 'MDL-29164' of git://github.com/timhunt/moodle 2011-11-01 16:47:16 +13:00
David Mudrak
20836db999 MDL-29794 Initial support for re-using a shared grading form
The patch introduces a new script templates.php that allows to search
for a previously shared form (template) and re-use it.

The patch also modifies the preview rendering of grading forms. Now
plugins are responsible for rendering the form itselft, without any
headers, descriptions etc (we need to embed the form preview into
various places so the caller looks after the frame).
2011-11-01 03:16:54 +01:00
Tim Hunt
a49e92a4e9 MDL-29164 question import, missing lang string.
AMOS BEGIN
 MOV [noquestionsinfile,mod_quiz],[noquestionsinfile,question]
AMOS END
2011-10-31 15:35:07 +00:00
Petr Skoda
f68cef22b9 MDL-29923 remove all traces of experimental global search
Hopefully it will be replaced by something fully functional soon, see http://moodle.org/mod/forum/discuss.php?d=189023
2011-10-28 10:20:00 +02:00
David Mudrak
18dd4a69d0 Merge remote branch 'origin/master' into rubric
Conflicts:
	lib/db/upgrade.php
2011-10-27 21:58:45 +02:00
Petr Skoda
f433088d5a MDL-29474 fix regressions in CLI install 2011-10-27 13:55:41 +02:00
Eloy Lafuente (stronk7)
10dd4995da Merge branch 'MDL-29474' of git://github.com/timhunt/moodle 2011-10-26 10:33:37 +02:00
Aparup Banerjee
a0b10b271f Merge branch 'MDL-29854_b' of git://github.com/timhunt/moodle 2011-10-26 11:23:09 +08:00
Sam Hemelryk
462a064cf0 Merge branch 'MDL-29716' of git://github.com/mouneyrac/moodle 2011-10-26 10:21:35 +13:00
Tim Hunt
bed495578f MDL-29854 questions: display better message and more useful continue
when an error occurs in the middle of processing responeses.
2011-10-25 14:49:57 +01:00
Jerome Mouneyrac
5b9735b949 MDL-29716 Make token more flexible to support third party client - also fix issue with some code not matching the way the server authenticate/authorize token, missing iprestriction/validuntil for restricted users (there are iprestriction/validiuntil on token and on restricted user). Also add missing check when the user is not listed in the authorised list. 2011-10-25 11:17:18 +08:00
Eloy Lafuente (stronk7)
dc83f5b006 Merge branch 'w42_MDL-28627_m22_kses' of git://github.com/skodak/moodle 2011-10-25 01:42:48 +02:00
Sam Hemelryk
2d94084463 Merge branch 'MDL-29825' of git://github.com/mouneyrac/moodle 2011-10-25 11:46:51 +13:00
David Mudrak
01609c9ad9 Merge remote branch 'origin/master' into rubric
Conflicts:
	lib/db/upgrade.php
	version.php
2011-10-24 22:13:01 +02:00
Aparup Banerjee
ef0aa7ba5c MDL-29527 RSS : improved language string. 2011-10-24 15:50:58 +08:00
Aparup Banerjee
9809413bba Merge branch 'MDL-29527' of git://git.luns.net.uk/moodle 2011-10-24 15:37:14 +08:00
Petr Skoda
73b309e6a3 MDL-28627 remove buggy and obsolete KSES cleaning 2011-10-22 09:25:06 +02:00
Jerome Mouneyrac
729ca37388 MDL-29825 better debug info when a ws client user misses a protocol capability 2011-10-21 15:11:38 +08:00
Tim Hunt
faadd32696 MDL-29474 prevent install/upgrade if plugin dependancies not met. 2011-10-20 11:13:41 +01:00
Tim Hunt
36ca62cab7 MDL-29474 display the dependancy information on the upgrade screen. 2011-10-20 11:13:33 +01:00
Dan Poltawski
636b4f9d2c MDL-29527 - RSS: Add a description to the reset keys page
Thanks to Alexander Bias for the suggestion
2011-10-19 13:48:25 +01:00
David Mudrak
671ec8f50e Form definitions can be removed now 2011-10-19 13:25:47 +02:00
David Mudrak
fde3380443 Saving a form as a public template
There is a new API method get_definition_copy() that is expected to
return the definition structure as if the form was written from scratch
via the editor. Such a prepared structure is passed to
a controller's update_definition() method in the new target area.

The same mechanism will be used for copying definitions from a shared
area to a normal gradable area.
2011-10-19 01:17:43 +02:00
David Mudrak
553af5fd6a New capability to share and publish a form as a template 2011-10-18 14:55:25 +02:00
David Mudrak
6832a10264 Initial support for the grading management screen
The user is sent to the new grade/grading/manage.php screen when an
advanced grading method is set in the activity mod form or via the
settings block.

The screen is supposed to (1) let the user change the currently active
grading method, (2) open the editor for the selected method, (3) create
new form from a template (4) display a preview of the form.
2011-10-18 01:05:07 +02:00
Ruslan Kabalin
543009cba4 MDL-29695 cohorts: Add pagination and search to cohorts adminstartion page 2011-10-18 10:54:59 +13:00
Eloy Lafuente (stronk7)
a598a8d4b1 Merge branch 'MDL-29719-master' of git://github.com/sammarshallou/moodle 2011-10-17 12:05:05 +02:00
sam marshall
7fb4699266 MDL-29719 Option to display course shortname alongside fullname on course lists 2011-10-17 10:50:59 +01:00
Sam Hemelryk
d97505d2a3 Merge branch 'MDL-27242-master' of git://github.com/sammarshallou/moodle 2011-10-17 17:28:32 +13:00
Sam Hemelryk
92fe97f922 Merged branch 'MDL-29277' of git://github.com/mouneyrac/moodle.git with improvements 2011-10-17 13:18:30 +13:00
David Mudrak
8168299d7e Improved integration into the settings block 2011-10-16 19:40:47 +02:00
David Mudrak
7ece4a0798 Merge branch 'rubric' of github.com:mudrd8mz/moodle into rubric 2011-10-13 22:45:30 +02:00
David Mudrak
20c207ab21 Merge branch 'master' into rubric
Conflicts:
	lib/db/upgrade.php
2011-10-13 22:42:47 +02:00
sam marshall
2e98ae02ec MDL-29768 debugstringids option did not do anything 2011-10-13 12:57:55 +01:00
sam marshall
6282381d05 MDL-27242 Conditional availability dates should support time as well as day
Change also adds minor feature to date-time selector so you can specify the time it uses as default when the value is 0 (disabled).

Credit: This feature was developed collaboratively by Charles Fulton, Neill Magill, and me.
2011-10-13 10:23:23 +01:00
Marina Glancy
6798c63e20 Added form element grading and integrated it with grading_controller 2011-10-12 15:01:53 +08:00
Aparup Banerjee
fc09870e0e Merge branch 'wip-MDL-27058-master' of git://github.com/samhemelryk/moodle.git (solved conflict) 2011-10-11 13:37:34 +08:00
Andrew Robert Nicols
83cd9b163a MDL-20306 Add course_category idnumber field 2011-10-10 23:54:30 +02:00
Sam Hemelryk
356a6de351 MDL-27058 navigation: Added a setting to control whether user forum links are added 2011-10-10 10:57:02 +13:00
David Mudrak
21d37aa623 MDL-29479 The draft of embedding the UI widgets into the page
The patch makes more sense when reviewed together with the parallel work
on gradingform_random (see MDL-29631) where the developed API is
actually tested.
2011-10-08 00:59:01 +02:00