Commit graph

11099 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
20405d1b44 Merge branch 'w50_MDL-30625_m23_adminorder' of git://github.com/skodak/moodle 2011-12-09 00:11:01 +01:00
Petr Skoda
bb6ccfa53d MDL-30625 full support for main admin 2011-12-07 11:18:10 +01:00
adrian@moodle.com
aa30d3e8ce MDL-30336 - login - Added a setting in security that allows auto complete to be set to off in password fields. 2011-12-06 15:50:26 +08:00
Tim Hunt
0030db53d8 MDL-30558 question bank, missing string with obscure permissions.
AMOS BEGIN
 MOV [selectcategoryabove,mod_quiz],[selectcategoryabove,question]
AMOS END
2011-12-02 14:52:01 +00:00
Aparup Banerjee
9be14d29e4 Merge branch 'wip-MDL-30386-master' of git://github.com/phalacee/moodle 2011-12-01 11:54:25 +08:00
Jason Fowler
c000545dee MDL-30386 - Blog - Adding RSS Feed link to the User blogs 2011-12-01 09:07:21 +08:00
Jerome Mouneyrac
f25aee3251 MDL-30459 better error message when file already exist 2011-11-30 15:15:59 +08:00
Jerome Mouneyrac
07cc3d11e2 MDL-28646 add missing authentication web service checks. Merge download/upload script checks in the same lib functions. Make the download scrit return json error message. Add missing webservice lang. Minor unit test doc improvement. 2011-11-29 11:18:36 +08:00
Dongsheng Cai
ec0d6ea2a9 MDL-28646 Web service: core_course_get_contents()
1. Implement core_course_get_contents web service
2. Implement callbacks in folder, resource, page and url modules
3. Implement download script for web service
2011-11-28 16:22:38 +08:00
Eloy Lafuente (stronk7)
0620787a17 Merge branch 'w47_MDL-27233_m22_restoreenrol' of git://github.com/skodak/moodle 2011-11-24 23:44:24 +01:00
Petr Skoda
73d000f389 MDL-27233 allow adding of default role to restorers 2011-11-23 18:38:27 +01:00
Petr Skoda
d53e3298c0 MDL-27233 add new options to keep enrols and groups purging existing course in restore 2011-11-23 18:38:27 +01:00
Sam Hemelryk
b674092416 Merge branch 'dev_MDL-29476_ws_participants_master' of git://github.com/dongsheng/moodle 2011-11-23 16:52:08 +13:00
Aparup Banerjee
d2b5a2caf5 Merge branch 'wip-MDL-20627-master' of git://github.com/abgreeve/moodle 2011-11-23 11:12:03 +08:00
Eloy Lafuente (stronk7)
689461f4d8 Merge branch 'MDL-30259-master' of git://github.com/sammarshallou/moodle 2011-11-23 02:00:53 +01:00
Eloy Lafuente (stronk7)
7242b051ac Merge branch 'MDL-30402-install-string' of git://github.com/mudrd8mz/moodle 2011-11-23 01:07:44 +01:00
David Mudrak
6e17567624 MDL-30402 Removing hard-coded English string from the CLI installer 2011-11-22 10:02:42 +01:00
Sam Hemelryk
b28de4b412 Merge branch 'MDL-28629' of git://github.com/mouneyrac/moodle 2011-11-22 18:26:35 +13:00
adrian@moodle.com
e94113a859 MDL-20627 user - Fixed viewing permission of email when sending group messages. 2011-11-18 11:41:11 +08:00
Dongsheng Cai
ad7612f597 MDL-29476 web service improvements
1. moodle_enrol_get_users_courses should return number of participants,
2. moodle_user_get_users_by_courseid should limit the fields to be returned
2011-11-16 12:02:24 +08:00
Jerome Mouneyrac
af03513f93 MDL-30268 add 'Can download files' field to service 2011-11-16 11:51:03 +08:00
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
Rod Norfor
ad6fbb6074 MDL-30259 TinyMCE: Add spellchecker language options 2011-11-14 16:26:31 +00: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
Jerome Mouneyrac
07a90ec313 MDL-28629 more checks during web service authentication 2011-11-11 15:07:18 +08: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