0e79c3ee74
MDL-38035 Activity settings: Support multilang names for custom user fields
2013-03-12 15:39:38 +00:00
5c8860f735
Moodle release 2.4.2
2013-03-08 20:02:48 +01:00
db0175400b
MDL-38378 Take rid of harcoded db prefix and bump.
2013-03-08 00:24:55 +01:00
5dd43226a0
weekly release 2.4.1+
2013-03-07 16:23:57 +01:00
20cb544cdd
Merge branch 'install_24_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_24_STABLE
2013-03-07 16:16:40 +01:00
5ac03639ca
MDL-38345 Prevent undefined CFG leading to DB error.
...
It seems that MDL-32975, no matter a version bump
was done, leads to the $CFG->navsortmycoursessort
setting undefined sometimes. And that ends with an error
visiting the /my page. This just ensures a safe default
if the setting is undefined/empty.
2013-03-07 10:23:46 +01:00
67c858414a
MDL-37852 repository: Admins can't access user instances settings
2013-03-07 16:37:05 +08:00
e1be68f296
MDL-37852 repository: Prevent user from deleting a site-wide instance
2013-03-07 14:35:31 +08:00
ebfdc35f2a
MDL-37411 Note Module: additional patch to fixed undefined property for stable branches
2013-03-07 11:09:05 +08:00
d6d470ae15
Revert "MDL-38055 block_courseoverview: fixed formatting of course fullname"
...
This reverts commit 6013e16b25498ee7d44b
2013-03-07 10:29:47 +08:00
f73c7d410b
Merge branch 'MDL-38173-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
2013-03-06 17:55:19 +01:00
f4b9cea5fc
Merge branch 'MDL-38352-en_fix_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE
2013-03-06 17:28:19 +01:00
4d25fc3208
MDL-38173 Course: Fix DB from regression when adding a (new) course module to a section.
2013-03-06 23:58:36 +08:00
3658d00c2b
MDL-38352 Merge English strings from the en_fix language pack
2013-03-06 16:55:00 +01:00
fdbb450f5f
MDL-38311 question manual grading: comment fixes.
2013-03-06 10:37:16 +01:00
3d6fb349eb
MDL-32975 navigation: fixed error when viewing my with no enrolments
2013-03-06 14:35:30 +13:00
3cc745a16c
Automatically generated installer lang files
2013-03-06 00:36:56 +00:00
ef01018a00
Merge branch 'MDL-38311_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
2013-03-06 01:24:11 +01:00
bc144ebbe0
MDL-37411 Notes: unset courseid and userid when updating the note to prevent accidental changes. Thank you Sam Hemelryk for suggesting an alternative solution.
...
Conflicts:
notes/edit.php
2013-03-06 09:39:41 +13:00
add7b5a250
Merge branch 'MDL-38119_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
2013-03-05 16:45:42 +01:00
1707b741b6
MDL-38311 questions: manual grading API should accept commentformat
...
Comment format (FORMAT_...) was correctly being processed when the
manual grading happened as the result of a form submission. It was only
when done using the question_usage or question_attempt API method that
there was no way to specify the format. (Although I think the only place
this API as used was in the unit tests.)
Note that question_attempt::manual_grade API had to change, but I don't
think that is a real API change. Calling code should be using
question_usage::question_attempt, which is backwards compatible.
Note that now, if you don't pass format, then no error is generated, but
a developer debugging message is generated.
2013-03-05 11:56:12 +00:00
57b0cfaaf1
Merge branch 'wip-MDL-34775-stable24' of git://github.com/phalacee/moodle into MOODLE_24_STABLE
2013-03-05 17:03:44 +08:00
2498509cfd
MDL-37852 repository: Prevent undesired access to repositories settings
2013-03-05 09:56:19 +01:00
fa1a43c43e
Merge branch 'MDL-38282_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
2013-03-05 16:14:26 +08:00
099b7986a5
Merge branch 'MDL-38279_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
2013-03-05 15:36:15 +08:00
c694545650
MDL-37935: Cache - fix spelling mistake in language string
2013-03-05 13:07:33 +08:00
c23f9efc64
Merge branch 'wip-MDL-37935-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE
2013-03-05 13:07:19 +08:00
a05b00c686
Merge branch 'MDL-30481_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE
2013-03-05 12:56:14 +08:00
469025580f
Merge branch 'wip-MDL-38055-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE
2013-03-05 11:41:11 +08:00
eecdec4d5b
MDL-34284 library: Import ZF2012-01 security patch for Zend
2013-03-05 10:32:16 +08:00
af27002b54
Merge branch 'wip-MDL-37901_M24' of git://github.com/gjb2048/moodle into MOODLE_24_STABLE
2013-03-05 15:22:57 +13:00
29f07d932a
Merge branch 'wip-MDL-36215-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE
2013-03-05 01:28:03 +01:00
00d4e02598
MDL-32975 mini-bump to get navsortmycoursessort defined.
2013-03-04 23:47:10 +01:00
032b80ea4b
Merge branch 'wip-MDL-32975-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE
2013-03-04 23:47:10 +01:00
7581032c96
MDL-32975 navigation: Added option to select how my courses are sorted
2013-03-05 09:46:36 +13:00
b0aca71569
Merge branch 'MDL-38101-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE
2013-03-05 09:29:49 +13:00
083b0a54aa
Merge branch 'MDL-37522-published-attachment_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE
2013-03-04 20:47:02 +01:00
6c2dec31f5
Merge branch 'wip-MDL-33013-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE
2013-03-04 20:18:37 +01:00
4856fb65b2
Merge branch 'MDL-36380-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
2013-03-04 18:00:03 +01:00
bbdbe0a490
Merge branch 'wip-MDL-37983-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE
2013-03-04 16:43:00 +01:00
26431c6f94
Merge branch 'MDL-38170-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE
2013-03-04 16:26:07 +01:00
892ee7ee56
Merge branch 'MDL-35350_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE
2013-03-04 16:12:54 +13:00
fb2ac5029c
Merge branch 'MDL-35127-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE
2013-03-04 16:07:59 +13:00
653c7d4a27
Merge branch 'wip-MDL-38205-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE
2013-03-04 03:01:21 +01:00
6153c8040d
MDL-36426 repository: Prevent login_as() users to access
2013-03-04 02:38:32 +01:00
b158bcce98
Merge branch 'MDL-37625-m24' of https://github.com/jfilip/moodle into MOODLE_24_STABLE
2013-03-04 14:18:33 +13:00
6a218739e4
Merge branch 'MDL-36128-moodle24' of https://github.com/StudiUM/moodle into MOODLE_24_STABLE
2013-03-04 13:59:40 +13:00
92e5923857
MDL-37681 repository_webdav: improved form handling when configuring an instance
2013-03-04 13:55:47 +13:00
a608b0e670
MDL-37338 Calendar: User will not see calendar subscription, which he/she can't edit
...
Signed-off-by: Rajesh Taneja <rajesh@moodle.com >
2013-03-04 01:51:09 +01:00
4ea25c227c
Merge branch 'MDL-38168-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE
2013-03-04 13:35:00 +13:00
sam marshall