11026 Commits

Author SHA1 Message Date
Mark Nielsen
91e6ca6e71 MDL-29956: Implement export of Quiz activity (r16977, r17032) 2011-11-14 21:25:08 +01:00
Mark Nielsen
42dffc6feb MDL-29956: Implement common cartridge export (r16882) 2011-11-14 21:25:08 +01:00
Sam Hemelryk
1ae9aa2b8f Merged MDL-29108 Advanced grading 2011-11-14 22:01:05 +13:00
Eloy Lafuente (stronk7)
da2e3c12db Merge branch 'MDL-30026' of git://github.com/stronk7/moodle 2011-11-13 19:35:13 +01:00
David Mudrak
794cea253c MDL-29108 Fixing a typo
Spotted by Sam during the review (23)
2011-11-11 12:17:01 +01:00
Eloy Lafuente (stronk7)
8ac9d33f49 Merge branch 'MDL-26647-master' of git://github.com/sammarshallou/moodle
Conflicts:
	lib/db/upgrade.php
	report/completion/index.php
	report/progress/index.php
	version.php
2011-11-11 03:37:55 +01:00
Eloy Lafuente (stronk7)
47c6991a8e Merge branch 'MDL-29945' of git://github.com/timhunt/moodle 2011-11-10 21:47:22 +01:00
Tim Hunt
828788f03b MDL-29945 plugin management: don't show Uninstall links for required plugins. 2011-11-10 19:11:24 +00:00
Sam Hemelryk
e3dfd1a1d9 Merged branch 'w44_MDL-29030_m22_reports' of git://github.com/skodak/moodle.git with conflict resolution 2011-11-10 10:15:50 +13:00
Eloy Lafuente (stronk7)
3fa5cb0bea Merge branch 'MDL-27542b' of git://github.com/rwijaya/moodle 2011-11-09 15:55:07 +01:00
Aparup Banerjee
024f0f7374 Merge branch 'MDL-29977-mnet-masquerade' of git://github.com/mudrd8mz/moodle 2011-11-09 13:40:24 +08:00
Rajesh Taneja
687f512d88 MDL-27790 Backup: Added warning message to let user know that temporary course will be created for restoration process 2011-11-08 11:37:48 +08:00
Rossiani Wijaya
d52777b486 MDL-27542 calendar export: fixed the following:
1. changing auth token to use user id instead of username
2. add fall back checking for old url
3. remove yui functionality to generate calendar url
4. add missing variable
5. fixed usercontext instance
2011-11-07 17:07:00 +08:00
Petr Skoda
2b0e3941e9 MDL-30026 improve session lock acquire timeouts and other minor cleanup
This is partially based on original patch by Tony Levi.
2011-11-06 17:52:15 +01:00
Petr Skoda
4f6bba205d MDL-29030 add report management UI 2011-11-06 12:51:48 +01:00
Petr Skoda
bb41c281e9 MDL-29030 add pagetype names 2011-11-06 12:31:17 +01:00
Petr Skoda
ba50bd3d63 MDL-29030 fix remaining report linking hacks
Please note all plugin references from core should use callbacks, it is not ok to use capabilities or links to plugins because they may not be present in customised installs.
2011-11-06 12:22:50 +01:00
Petr Skoda
8a8f29c2f5 MDL-29030 new loglive report plugin
AMOS BEGIN
 CPY [log:viewlive,coursereport_log,[loglive:view,report_loglive]
 MOV [livelogs,core],[livelogs,report_loglive]
 CPY [loglive,coursereport_log],[pluginname,report_loglive]
AMOS END
2011-11-06 12:22:49 +01:00
Petr Skoda
275cbac71a MDL-29030 migrate outline report to new type
AMOS BEGIN
 MOV [outline:view,coursereport_outline],[outline:view,report_outline]
 MOV [pluginpagetype,coursereport_outline],[pluginpagetype,report_outline]
 MOV [pluginname,coursereport_outline],[pluginname,report_outline]
AMOS END
2011-11-06 12:22:47 +01:00
sam marshall
e4aec5bed3 MDL-26647 (6) Support showuseridentity on grader report, quiz report, SCORM report 2011-11-04 13:57:17 +00:00
sam marshall
5c60a847f5 MDL-26647 (1) 'extrauserselectorfields' -> 'showuseridentity', add capability
This change:
- Renames the existing setting 'extrauserselectorfields' to 'showuseridentity'
  in preparation for using it in more places. (Upgrade change, new version.)
- Adds a new capability moodle/site:viewuseridentity, now required in order
  to see the extra fields; if you don't have the capability, you don't see them
- Slightly improves the display of extra fields in user selector list; it used
  to be like 'sam marshall, 01234567, email@address' and is now
  'sam marshall [01234567, email@address]' ie the fields are in square
  brackets
- Turns feature on for the group selector - the feature was enabled for other
  user selectors but not for the group selector. Tim did the disable code, he
  thinks this may be to do with more people having access to group selector -
  probably not a problem now it is controlled by capability.
2011-11-04 13:57:08 +00:00
David Mudrak
10df8657c1 MDL-29977 MNet does not allow to start a remote session when masquerading as another user 2011-11-04 10:02:19 +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