51613 Commits

Author SHA1 Message Date
Sun Zhigang
1ab8cd2e1c MDL-29523 filemanager: Fix a hardcode string 2012-02-27 09:35:11 +08:00
Eloy Lafuente (stronk7)
c4a12afaf9 weekly release 2.3dev 2012-02-23 11:38:14 +01:00
Eloy Lafuente (stronk7)
5e6e0a1123 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-02-23 11:34:35 +01:00
Sam Hemelryk
4a3ecbb25e MDL-30988 ajax: Fixed up phpdocs package in ajax scripts 2012-02-23 14:38:52 +13:00
AMOS bot
32556d5d12 Automatically generated installer lang files 2012-02-23 00:31:05 +00:00
Eloy Lafuente (stronk7)
e757f51864 MDL-30997 - group - trailing whitespace + comment alignment fixes 2012-02-22 13:23:11 +01:00
Eloy Lafuente (stronk7)
202c72c997 Merge branch 'wip-MDL-30997-master' of git://github.com/abgreeve/moodle 2012-02-22 13:09:54 +01:00
AMOS bot
22993f3d12 Automatically generated installer lang files 2012-02-22 00:31:10 +00:00
Sam Hemelryk
75e4f98c0d MDL-30987 message: Minor phpdoc fix ups 2012-02-22 11:15:42 +13:00
Sam Hemelryk
a513048a00 Merge branch 'MDL-30987_message_docs2' of git://github.com/andyjdavis/moodle 2012-02-22 10:58:06 +13:00
Sam Hemelryk
2caf3f9bee Merge branch 'MDL-30910' of git://github.com/rwijaya/moodle 2012-02-22 10:22:06 +13:00
Eloy Lafuente (stronk7)
af7ee420f4 Merge branch 'wip-MDL-30830-m23' of git://github.com/samhemelryk/moodle 2012-02-21 21:11:15 +01:00
Eloy Lafuente (stronk7)
25f51decae Merge branch 'm_MDL-25996_making_language_editing_terms_user_friendly' of git://github.com/gerrywastaken/moodle 2012-02-21 10:47:37 +01:00
Rossiani Wijaya
af4de0a2c2 MDL-30910: Lesson Module: fix lesson progress bar for screen readers
AMOS BEGIN
   CPY [progresscompleted, mod_lesson]
AMOS END
2012-02-21 12:31:35 +08:00
Andrew Davis
6fbd60ef57 MDL-30987 message: updated phpdocs for /lib/messagelib.php and /message 2012-02-21 10:57:55 +07:00
Adrian Greeve
4d8e241742 MDL-30997 - group - update of the api block documentation. 2012-02-21 11:17:27 +08:00
Sam Hemelryk
44e59a587c Merge branch 'MDL-30249' of git://github.com/mouneyrac/moodle 2012-02-21 14:55:56 +13:00
Sam Hemelryk
aad1a1f7ce MDL-31158 enrol_manual: Fixed whitespace 2012-02-21 14:46:04 +13:00
Sam Hemelryk
4ddd465a2a Merge branch 'MDL-31158_grade_recovery' of git://github.com/andyjdavis/moodle 2012-02-21 14:44:50 +13:00
Eloy Lafuente (stronk7)
8c4988cd3b Merge branch 'MDL-31561' of git://github.com/kiklop74/moodle 2012-02-21 02:30:14 +01:00
Eloy Lafuente (stronk7)
a96fb50192 Merge branch 'MDL-31562' of git://github.com/kiklop74/moodle 2012-02-21 02:28:14 +01:00
Andrew Davis
de80da61e8 MDL-31158 grade: altered the help string for recovergradesdefault 2012-02-21 08:27:09 +07:00
Eloy Lafuente (stronk7)
f4319f8531 Merge branch 'wip-mdl-25432' of git://github.com/rajeshtaneja/moodle 2012-02-21 02:10:10 +01:00
Eloy Lafuente (stronk7)
c3ca963d81 Merge branch 'MDL-30698_multiple_emails' of git://github.com/andyjdavis/moodle 2012-02-21 01:43:53 +01:00
AMOS bot
ae5ed89004 Automatically generated installer lang files 2012-02-21 00:31:12 +00:00
Sam Hemelryk
58b7d48f9a MDL-30974 forms: Last minute phpdoc fixes 2012-02-21 12:39:35 +13:00
Sam Hemelryk
ceaad88222 Merge branch 'wip-mdl-30974' of git://github.com/rajeshtaneja/moodle 2012-02-21 12:07:30 +13:00
Sam Hemelryk
56588dfbee MDL-30988 Fixed phpdocs during integration review 2012-02-21 12:01:00 +13:00
Sam Hemelryk
26aca872ca Merge branch 'm_MDL-30988_adding_preference_api_phpdocs' of git://github.com/gerrywastaken/moodle 2012-02-21 11:59:48 +13:00
Sam Hemelryk
e6e4fe4f43 Merge branch 'MDL-29402-master' of https://github.com/mackensen/moodle 2012-02-21 10:44:00 +13:00
Sam Hemelryk
da3ec93275 Merged branch 'MDL-31014-master-4' of git://git.luns.net.uk/moodle.git with conflict resolution 2012-02-21 10:33:00 +13:00
Eloy Lafuente (stronk7)
6ff5994b49 Merge branch 'MDL-19421-master-3' of git://git.luns.net.uk/moodle 2012-02-20 17:11:22 +01:00
Andrew Robert Nicols
ab48e73159 MDL-19421 Correct lesson dependency mapping on restore 2012-02-20 14:56:02 +00:00
Eloy Lafuente (stronk7)
9cd8e48ca6 Merge branch 'MDL-31345_master' of git://github.com/lazydaisy/moodle 2012-02-20 15:34:31 +01:00
Andrew Robert Nicols
bca2b1c157 MDL-31014 Allow for selection of a different displayformat when approving glossary entries 2012-02-20 12:28:52 +00:00
Eloy Lafuente (stronk7)
d03a130455 Merge branch 'wip-MDL-25299-m23' of git://github.com/samhemelryk/moodle 2012-02-20 12:58:54 +01:00
Eloy Lafuente (stronk7)
11ce79b05d MDL-30999 whitespace fix 2012-02-20 12:17:33 +01:00
Eloy Lafuente (stronk7)
a4d7604977 MDL-30999 grade phpdocs - change some inline @see by correct @link 2012-02-20 12:09:50 +01:00
Eloy Lafuente (stronk7)
2a5fa9e64a Merge branch 'MDL-30999_grade_phpdocs' of git://github.com/andyjdavis/moodle 2012-02-20 12:02:18 +01:00
Eloy Lafuente (stronk7)
a0fbb0a270 Merge branch 'wip-MDL-30979-m23' of git://github.com/samhemelryk/moodle 2012-02-20 11:38:20 +01:00
Eloy Lafuente (stronk7)
47e5997851 MDL-30977 page phpdocs: 2 minor fixes in 2 functions 2012-02-20 11:28:08 +01:00
Eloy Lafuente (stronk7)
7dca125be4 Merge branch 'wip-MDL-30977-m23' of git://github.com/samhemelryk/moodle 2012-02-20 11:25:01 +01:00
Eloy Lafuente (stronk7)
ad360e66ae Merge branch 'MDL-30972_final' of git://github.com/nebgor/moodle 2012-02-20 11:20:21 +01:00
Sam Hemelryk
e76eba8111 Merge branch 'wip-mdl-29967' of git://github.com/rajeshtaneja/moodle 2012-02-20 18:20:37 +13:00
Sam Hemelryk
5f5ee19125 MDL-29254 Fixed whitespace 2012-02-20 18:08:33 +13:00
Sam Hemelryk
fcd6bdd4fa Merged MDL-29254 with conflict resolution 2012-02-20 18:07:13 +13:00
Sam Hemelryk
c2627cf429 Merge branch 'MDL-31483_master' of git://github.com/lazydaisy/moodle 2012-02-20 17:34:58 +13:00
Sam Hemelryk
5128ef6b45 Merge branch 'wip-MDL-30780-master' of git://github.com/marinaglancy/moodle 2012-02-20 17:29:47 +13:00
Sam Hemelryk
8e1b1b270b Merge branch 'wip-MDL-31627-master' of git://github.com/marinaglancy/moodle 2012-02-20 17:25:48 +13:00
Sam Hemelryk
b91c364ef3 Merge branch 'm_MDL-31388_fix_enrol_LDAP_typo' of git://github.com/gerrywastaken/moodle 2012-02-20 17:13:36 +13:00