48642 Commits

Author SHA1 Message Date
Sam Hemelryk
5f65d37cd2 Merged branch 'master_MDL-26482' of git://github.com/danmarsden/moodle.git 2011-07-19 00:25:13 +10:00
Petr Skoda
0a0b535e27 MDL-28348 fix spelling and some whitespace issues 2011-07-17 20:39:20 +02:00
Petr Skoda
c2f53f015b MDL-28348 fix fatal error caused by unenrolling of incorrect enrol instance 2011-07-17 20:37:02 +02:00
Petr Skoda
fc7cd35c81 MDL-28348 prevent circular references in meta handler for enrolments 2011-07-17 20:36:12 +02:00
Petr Skoda
5b2904c8f8 MDL-28348 fix meta sync when unassigning roles 2011-07-17 20:35:15 +02:00
Petr Skoda
656749c18a MDL-28363 make dimmed selectors more specific to prevent overriding from other themes 2011-07-16 21:03:06 +02:00
Petr Skoda
78fcdb5fdb MDL-28345 make sure input parameters do not contain invalid utf-8 chars 2011-07-15 15:00:49 +02:00
Petr Skoda
d20f655d59 MDL-28350 prevent bogus role assignment via externallib 2011-07-15 12:23:34 +02:00
Petr Skoda
df83301630 MDL-27804 allow changing of only auth in csv user uploads 2011-07-15 11:07:33 +02:00
David Mudrak
94f630e33f MDL-28325 Enrolment: added help to the duration, start date and end date setting
The patch also fixes one typo in enrol_manual detected while working on
this.
2011-07-15 08:59:55 +02:00
Ankit Kumar Agarwal
4942a84bd6 MDL-27523 Fixing get_string issues 2011-07-15 09:27:02 +12:00
Petr Skoda
43c5c08cf7 MDL-28313 fix incorrect enrol database settings upgrade 2011-07-14 22:31:40 +02:00
Petr Skoda
5c754932e7 MDL-28344 new option to prevent clickjacking via frame embedding 2011-07-14 22:01:23 +02:00
Petr Skoda
b9b639b30e MDL-28344 remove unused CFG->framename 2011-07-14 22:00:41 +02:00
Petr Skoda
595646d15b MDL-28344 remove the unused $CFG->framename 2011-07-14 21:40:50 +02:00
Petr Skoda
2d16dad0e1 MDL-23344 new option to autofocus username or password on the login form
Nearly everybody else does this login page autofocus. Once we switch to HMTL 5 we should use the new autofocus input option. I believe the admin setting should be enabled by default but it would not be possible to get it through the reviews.
2011-07-14 15:58:01 +02:00
Petr Skoda
dfe42f0a15 MDL-28253 use unique name for new manager role 2011-07-14 13:38:36 +02:00
Marina Glancy
77bf97e300 MDL-27756 Improving move_course() performance 2011-07-14 11:00:09 +08:00
Rajesh Taneja
3a70ccb8ac MDL-27837 enrol - Fixed checkboxes for multiple self enrolment 2011-07-14 09:55:13 +08:00
Marina Glancy
4173ef4a04 MDL-25125 fix YUI bug with overriding styles 2011-07-14 09:40:00 +08:00
AMOS bot
955a47b358 Automatically generated installer lang files 2011-07-14 00:55:15 +00:00
Dan Marsden
99da7a9523 MDL-26482 SCORM add option to disable TOC completely - thanks to Clark Burns for some help! 2011-07-14 11:06:49 +12:00
Dan Marsden
7b6f5c8d1e MDL-28300 SCORM Fix check for SCORM 2004 thanks to Silvia Bastos for report/patch 2011-07-14 11:01:16 +12:00
Ankit Kumar Agarwal
219f919c24 MDL-27523 Small Fixes 2011-07-14 10:57:29 +12:00
Ankit Kumar Agarwal
f8f34f823d MDL-27523 Minor Edits 2011-07-14 10:57:29 +12:00
Dan Marsden
5e3014df9e MDL-27523 tidy up links to download files, shift logic for set_page to allow mode to be set correctly 2011-07-14 10:57:29 +12:00
Dan Marsden
b2614417a5 MDL-27523 SCORM move plugin links to tabs page and only show if more than one plugin is installed, move delete attempts code into plugin as it may not be supported in all plugins, general tidy up - good work Ankit! 2011-07-14 10:57:29 +12:00
Ankit Kumar Agarwal
62b82cbcff MDL27522 First version Push
modified:   mod/scorm/report.php
	new file:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports-remove users report to seperate files for better re-use

	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports validated reportuser.php

	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM REPORT - updating reportuser.php to use MUST_EXIST parameter

	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports- Cleaning of codes
	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports- update formating

	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports removed unwanted codes from reportuser.php

	modified:   mod/scorm/reportuser.php

MDL-27522 Scorm Reports - optimising codes

	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 Scorm Reports-Formating report.php
	modified:   mod/scorm/report.php

MDL-27522 Scorm Reporting - removing unsed variables

	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reporting - Renaming reportuser.php to userreport.php
	new file:   mod/scorm/userreport.php

MDL-27522 SCORM Reporting - deleting old reportuser.php

	deleted:    mod/scorm/reportuser.php

MDL-27522 Scorm Reporting - updated version number

MDL-27522 Scorm Reporting - Discarding version changes

MDL-27523 Scorm Reporting - Basic reporting plugin
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - Database Table structure pushed
	new file:   mod/scorm/db/subplugins.php

MDL-27523 Scorm Reporting - Plugin container codes
	modified:   mod/scorm/report.php
	modified:   mod/scorm/tabs.php

MDL-27523 Scorm Reporting - Capability update
	modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - commenting files
	modified:   mod/scorm/report/basic/db/install.php
	modified:   mod/scorm/report/basic/lang/en/scorm_basic.php
	modified:   mod/scorm/report/basic/version.php

MDL-27523 Scorm Reporting - Formating codes
	modified:   mod/scorm/report/basic/db/install.php
	modified:   mod/scorm/report/basic/report.php
	modified:   mod/scorm/report/basic/version.php
	modified:   mod/scorm/report/default.php
	modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - fixing small bugs
	modified:   mod/scorm/report/basic/report.php

MDL-27523 Scorm Reporting - added databse upgrade code to scorm/db/upgrade.php

MDL-27523 Scorm Reporting - small optimisations

MDL-27523 SCorm Reporting - Removing Mod.php

MDL-27523 Scorm Reporting - Minor Fixes

	new file:   mod/scorm/db/subplugins.php
	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	new file:   mod/scorm/report/basic/db/install.php
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/basic/version.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php
	modified:   mod/scorm/tabs.php
	modified:   mod/scorm/userreport.php

	modified:   mod/scorm/db/install.xml
	new file:   mod/scorm/db/subplugins.php
	modified:   mod/scorm/db/upgrade.php
	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	new file:   mod/scorm/report/basic/db/install.php
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/basic/version.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php
	modified:   mod/scorm/tabs.php
	modified:   mod/scorm/userreport.php
	modified:   mod/scorm/version.php

MDL-27523 Scorm Reporting - Removing Database Refereneces

MDL-27523 Scorm Reporting - Updating structure to remove DB usage
	modified:   mod/scorm/db/upgrade.php
	modified:   mod/scorm/report.php
	modified:   mod/scorm/report/basic/report.php
	modified:   mod/scorm/report/default.php
	modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - Minor fixes

MDL-27523 Scorm Reporting - Formating codes

MDL-27523 Scorm Reporting - Foramting Codes
	modified:   mod/scorm/report/basic/lang/en/scorm_basic.php
	modified:   mod/scorm/report/basic/report.php
	modified:   mod/scorm/report/default.php
	modified:   mod/scorm/report/reportlib.php

	new file:   mod/scorm/db/subplugins.php
	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/basic/version.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php
	modified:   mod/scorm/tabs.php
	modified:   mod/scorm/userreport.php
	modified:   mod/scorm/version.php
2011-07-14 10:57:29 +12:00
Sam Hemelryk
ecb8829273 weekly release 2.2dev 2011-07-13 20:21:48 +08:00
Sam Hemelryk
59c8535226 Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-07-13 20:06:16 +08:00
Sam Hemelryk
4d4e6d6bfc Revert "MDL-23344 fix login form focus"
This reverts commit 70b02b12d39fec290439ee38daabc26de4cf450f.
2011-07-13 20:02:58 +08:00
David Mudrak
c8ea2c4572 MDL-28298 workshop: do not use a constant without explicit inclusion of the library
Instead of including whole formslib just to get the constant defined, I
decided to hard-code the value and put the reference to the comment so
that eventual grep would spot it. Of course that is is not nice at all
but it's lesser of two evils imho.
2011-07-13 10:28:28 +02:00
Sam Hemelryk
2027c10ec4 MDL-28184 navigation: Tidied up handling of coursenode when adding course essentials 2011-07-13 14:58:57 +08:00
Sam Hemelryk
962360fa21 MDL-27771 filter-text: Fixed typo contninue 2011-07-13 14:52:44 +08:00
Chris Follin
84b2b9aa77 MDL-27305 forum: Added missing item to forum_get_view_actions 2011-07-13 14:22:18 +08:00
Sam Hemelryk
b874637025 MDL-25870 enrol-manual: Fixed pagination of AJAX search results for users when changing search 2011-07-13 14:02:30 +08:00
Sam Hemelryk
f50243edef MDL-28137 unit tests: Fixed up problem with block manager tests when running unit tests after turning editing on 2011-07-13 13:44:45 +08:00
Sam Hemelryk
112c7f05b5 MDL-28205 RSS: Fixed up notice and set better pagelayout type on manage feeds page 2011-07-13 10:32:38 +08:00
Sam Hemelryk
c103eba85f MDL-27696 datalib Fixed up misused params in get_logs_usercourse 2011-07-13 10:30:35 +08:00
Sam Hemelryk
c4afcf84d9 MDL-28040 navigation: Fixed up error with navigation when dealing with categories that have a lower sort order than the parent. 2011-07-13 09:58:42 +08:00
Eloy Lafuente (stronk7)
e62a947eec Merge branch 'MDL-28221-resource-conversion' of git://github.com/mudrd8mz/moodle 2011-07-12 16:57:54 +02:00
Eloy Lafuente (stronk7)
dd8f2538b6 Merge branch 'master_MDL-28017' of git://github.com/danmarsden/moodle
Conflicts:
	mod/scorm/version.php
2011-07-12 16:28:36 +02:00
Eloy Lafuente (stronk7)
d703e3816f MDL-28210 messaging: all includes but config.php must use $CFG-based abosolute paths 2011-07-12 12:17:34 +02:00
Eloy Lafuente (stronk7)
8654b65619 Merge branch 'MDL-28210_messaging_constants2' of git://github.com/andyjdavis/moodle 2011-07-12 12:16:16 +02:00
Andrew Davis (andyjdavis)
6366fdcc6c MDL-28210 messaging: Fixed requires problems in /message/discussion.php 2011-07-12 10:46:59 +08:00
AMOS bot
84a4374683 Automatically generated installer lang files 2011-07-12 00:55:19 +00:00
Dan Marsden
59cdcb9770 MDL-28017 - SCORM unset old config var 2011-07-12 09:46:23 +12:00
David Mudrak
47f5964381 MDL-28221 Legacy resource URL pointing to the course itself are migrated as File module
This patch replays the logic of resource_20_migrate() function. If a
file is referred via URL to the course files of the course being
backed up, then such a resource is converted to the File module
(mod/resource) rather than URL module.
2011-07-11 23:30:28 +02:00
David Mudrak
498c722d0f MDL-28221 resource: improved file not found handling
When the referenced file is not found, do not rely on the record in
resource_old as the resource can be actually restored from a 1.9 backup.
2011-07-11 23:30:28 +02:00
David Mudrak
c6c9a3bcdb MDL-28221 resource: fixed a typo in variable names 2011-07-11 23:30:28 +02:00