Commit graph

50769 commits

Author SHA1 Message Date
Sam Hemelryk
0669a9e9ae Merge branch 'MDL-29942' of git://github.com/mouneyrac/moodle 2011-12-12 15:12:42 +13:00
Charles Fulton
b92ac8c079 MDL-30482 create new capability for viewing glossary entries 2011-12-12 09:59:41 +08:00
Sam Hemelryk
273e24ffa4 Merge branch 'MDL-28180' of git://github.com/stronk7/moodle 2011-12-12 14:54:35 +13:00
Sam Hemelryk
d35fc666d6 Merge branch 'MDL-30198-master' of git://github.com/ankitagarwal/moodle 2011-12-12 13:54:48 +13:00
Sam Hemelryk
ffdbcf3998 Merge branch 'MDL-29195-master-1' of git://git.luns.net.uk/moodle 2011-12-12 13:50:42 +13:00
Eloy Lafuente (stronk7)
4d856332e4 MDL-28180 backup - on restore always prevent completion_aggr_methd dupes
This covers the last case where dupes could be happening in the
completion_aggr_methd table: Restoring one complete course into
an existing one, adding information. Now we always check if the
aggr_method exists before inserting it.
2011-12-12 00:31:44 +01:00
Eloy Lafuente (stronk7)
43cf3165f1 MDL-28180 backup - take rid of dupes in course_completion_aggr_methd
Conflicts:

	version.php
2011-12-12 00:31:29 +01:00
Eloy Lafuente (stronk7)
184acafab6 MDL-28180 backup - set excluded activities for any non-course operation 2011-12-12 00:30:58 +01:00
Petr Skoda
433150f6cf MDL-30687 use course defaults when template not set in ldap enrol 2011-12-11 11:06:29 +01:00
Petr Skoda
9f38ba6860 MDL-29117 use default course settings when template not set in db enrol 2011-12-11 10:57:44 +01:00
Dan Marsden
a12b1d751d MDL-28728 SCORM - only show delete button if data exists for this user in this scorm 2011-12-11 19:10:28 +13:00
Dan Marsden
d32e353e35 MDL-28728 SCORM - add capability to allow users to delete own attempts - given to no-one by default. 2011-12-11 19:10:28 +13:00
Dan Marsden
b47316cded MDL-29325 imsenterprise enrolment - allow more flexible naming of courses - thanks to Adam Barbary for patch 2011-12-11 19:07:23 +13:00
Petr Skoda
14074ef7c6 MDL-30292 rework trailing whitespace test
Now compatible with zlib compression.
2011-12-10 20:33:51 +01:00
Petr Skoda
a0b15989e7 MDL-30364 fix user report regressions 2011-12-10 20:18:44 +01:00
Petr Skoda
a1dd2a54e3 MDL-30415 prevent yui2 rollups in debug mode 2011-12-10 19:11:58 +01:00
Petr Skoda
0c79e389f8 MDL-30502 remove bogus role name param
Credit goes to Michael J Litzkow.
2011-12-10 18:34:08 +01:00
Petr Skoda
adf0fc0e42 MDL-30621 prevent warnings when creating temp and cache dirs 2011-12-10 17:35:22 +01:00
Petr Skoda
cb664c3a0d MDL-30659 fix use of yui filters 2011-12-10 13:46:15 +01:00
Petr Skoda
7edf3f7e82 MDL-30659 fix phpdocs problems 2011-12-10 13:16:18 +01:00
Petr Skoda
dbd7282ca3 DML-30588 do not require enrollment after switching of roles 2011-12-10 12:44:32 +01:00
Petr Skoda
0126413171 MDL-30610 dev versions should not satisfy version requirements 2011-12-09 21:50:58 +01:00
Petr Skoda
9676c7399b MDL-30610 new environment requirements for 2.3 2011-12-09 21:50:58 +01:00
Petr Skoda
33dca15616 MDL-30613 use standard https checks 2011-12-09 21:28:04 +01:00
Tim Hunt
0019a9b7aa MDL-30592 question_bank: make files in qtext work in the question list. 2011-12-09 19:23:53 +00:00
Tim Hunt
fdb5bc03f5 MDL-30592 quiz statistics, ensure images in the question text appear. 2011-12-09 19:23:46 +00:00
Tim Hunt
8c03be8c71 MDL-30592 moodlelib: new helper component_callback
I chose to be slighly inconsistent with plugin_callback in order to make a nicer API.
2011-12-09 19:23:36 +00:00
Tim Hunt
3f11d7f923 MDL-30677 quiz: fix attempt counts when a student is in several groups. 2011-12-09 18:46:47 +00:00
Valeriy Streltsov
56565037dd MDL-30562 qtypes: extra_answer_fields & questionid_column_name public
Will let us make more of qtype backup and restore work automatically.
2011-12-09 18:38:38 +00:00
Tim Hunt
af4e440888 MDL-30559 conditional availability: missing validation of grade rules. 2011-12-09 18:38:02 +00:00
Tim Hunt
8a058b758c MDL-30532 qeupgradehelper has broken links to quizzes. 2011-12-09 18:37:27 +00:00
Tim Hunt
bea2086c95 MDL-30498 user name can overlap user report icon. 2011-12-09 18:36:56 +00:00
Tim Hunt
e4977ba5c6 MDL-27183 quiz reports: don't show data to users not in any group
if the quiz is set to separate groups, and the user does not have access all groups.
2011-12-09 18:04:22 +00:00
Tim Hunt
9d0ac0ffbb MDL-27143 question bank: questions not saved when deleting a category.
Based on a fix by Nikhil Gupta.
2011-12-09 18:03:52 +00:00
sam marshall
7728860ae5 MDL-30655 Blocks: Moving block to top of list can cause (harmless) PHP warnings 2011-12-09 17:45:23 +00:00
Eloy Lafuente (stronk7)
f89a83b87b weekly release 2.3dev (on-sync version 22_STABLE) 2011-12-09 16:25:08 +01:00
Eloy Lafuente (stronk7)
fef739423a Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-12-09 16:09:10 +01:00
Tim Hunt
511b4cf82c MDL-30660 javascript-static: another yui3/ticket/2531561 work-around. 2011-12-09 12:40:57 +01:00
Eloy Lafuente (stronk7)
d6b380a364 Merge branch 'w50_MDL-30625_m23_adminorder' of git://github.com/skodak/moodle 2011-12-09 10:57:18 +01:00
Aparup Banerjee
675e402a55 MDL-30542 simple string improvement. 2011-12-09 17:14:30 +08:00
Petr Skoda
b8d13becf9 MDL-30625 fail gracefully when admins not defined 2011-12-09 09:04:43 +01:00
Mitsuhiro
ac4e8c3387 MDL-30198 Glossary Changing string during imports 2011-12-09 10:01:33 +05:30
Jerome Mouneyrac
f1f31c1d06 MDL-30140 alternative way to select user when adding a token. When more than 500 users we display a text box instead of a select box 2011-12-09 11:57:28 +08:00
Aparup Banerjee
70a7b8e1cd Merge branch 'w50_MDL-27364_m23_recaptchahttps' of git://github.com/skodak/moodle 2011-12-09 11:07:20 +08:00
Aparup Banerjee
29459d8e15 Merge branch 'MDL-30558' of git://github.com/timhunt/moodle 2011-12-09 10:46:23 +08:00
Aparup Banerjee
4000fce1a3 Merge branch 'master_MDL-26974' of git://github.com/danmarsden/moodle 2011-12-09 10:19:22 +08:00
Aparup Banerjee
ce78f1d6f5 Merge branch 'master_MDL-30579' of git://github.com/mayankgupta/moodle 2011-12-09 10:13:22 +08:00
Tim Hunt
554de0d73a MDL-27314 quiz reports: fix JS confirmation before deleting attempts. 2011-12-09 02:33:47 +01:00
Eloy Lafuente (stronk7)
08416e72e3 MDL-30604 Added 2 missing messages andd deleting an incorrect one 2011-12-09 02:01:02 +01:00
Aparup Banerjee
46f2a9366a MDL-30604 Added upgrade lines to upgrade.php(s) 2011-12-09 01:28:59 +01:00