0e79c3ee74
MDL-38035 Activity settings: Support multilang names for custom user fields
2013-03-12 15:39:38 +00:00
db0175400b
MDL-38378 Take rid of harcoded db prefix and bump.
2013-03-08 00:24:55 +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
d6d470ae15
Revert "MDL-38055 block_courseoverview: fixed formatting of course fullname"
...
This reverts commit 6013e16b25498ee7d44b
2013-03-07 10:29:47 +08: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
3d6fb349eb
MDL-32975 navigation: fixed error when viewing my with no enrolments
2013-03-06 14:35:30 +13: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
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
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
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
26431c6f94
Merge branch 'MDL-38170-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE
2013-03-04 16:26:07 +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
4ea25c227c
Merge branch 'MDL-38168-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE
2013-03-04 13:35:00 +13:00
75822af579
MDL-37507 repositories: improved formatting of external resources
2013-03-04 13:28:36 +13:00
53c66110a8
MDL-36901: Remove system paths from exceptions
...
Replaces any server paths, like dataroot, with a token
in exception messages and debug info.
2013-03-04 00:16:58 +01:00
850d33e658
MDL-38170 SimplePie: Cannot read https feeds through proxy
2013-03-01 10:33:24 +00:00
498ee7d44b
MDL-38055 navigation: fixed ampersand use within titles
...
Conflicts:
lib/navigationlib.php
2013-03-01 10:09:47 +13:00
49f853bfcb
MDL-36215 navigation: fixed blog URL within courses using groups
2013-03-01 10:08:38 +13:00
5defa8f05e
MDL-33013 navigation: fixed expansion limit issue hiding nodes
2013-03-01 10:08:15 +13:00
fad56ea4be
MDL-36380 stats: Issue with DST and monthly statistics
2013-02-28 13:56:45 +08:00
4c4ea10c3f
MDL-36380 stats: No more duplicated entries when viewing monthly stats
2013-02-28 13:56:45 +08:00
2d931ca93b
MDL-30669 - blocks: Added a warning when deleting blocks that have multiple displays set.
...
Also added a fix to the function course_page_type_list(). It was making a call to
get_context_info_array() which will generate an error if $currentcontext is not set.
2013-02-26 09:49:52 +01:00
382b3d7596
MDL-37792 Conditions: Fix upgrade step in previous patch
2013-02-26 10:56:11 +08:00
db0c7b4e7b
Merge branch 'MDL-37792-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_STABLE
2013-02-26 10:54:48 +08:00
1a44518a64
MDL-37792 Conditions: Interests condition offered but not implemented
2013-02-25 13:25:17 +00:00
c49adb8e18
MDL-38091 fixed bug with SQL query on Oracle
2013-02-23 12:22:21 +11:00
aee5f1f4d8
MDL-38168 Filelib: Curl class does not honour proxybypass option
2013-02-22 14:20:04 +00:00
b1703e2951
Revert "MDL-36380 stats: No more duplicated entries when viewing monthly stats"
...
This reverts commit 33b5464e96
2013-02-20 17:04:52 +08:00
349a6fde37
Merge branch 'MDL-35622-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
2013-02-20 14:27:52 +08:00
2225d0cfe6
MDL-37329 Navigation: Enrolled courses in category should be added only.
2013-02-20 12:41:21 +08:00
16296b4a84
MDL-35622 files: Fixed typo in galleryitem extension
2013-02-20 12:23:56 +08:00
d432ff9e99
MDL-37329 Navigation: Navigation node My Courses will only show enrolled courses
2013-02-20 08:58:02 +08:00
950fead105
Merge branch 'wip-MDL-38075-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE
2013-02-20 00:07:47 +01:00
fc511c8e48
Merge branch 'wip-MDL-38000-m24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE
2013-02-19 13:47:23 +08:00
9d0c759ed1
Merge branch 'MDL-36380-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
2013-02-18 14:18:36 +08:00
bc11a70203
Merge branch 'MDL-37939-m24' of https://github.com/andrewnicols/moodle into MOODLE_24_STABLE
...
Conflicts:
lib/db/upgrade.php
version.php
2013-02-18 12:47:32 +08:00
a2f6f882c4
Merge branch 'MDL-35622-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
...
Conflicts:
lib/db/upgrade.php
version.php
2013-02-18 11:33:00 +08:00
2ad68b8c95
MDL-38000 css: fixed handling of CSS files by outputlib.
2013-02-18 08:34:01 +13:00
a2b5f389de
MDL-37683 cache: siteidentifier is now included in the keys
...
Conflicts:
lib/db/upgrade.php
lib/moodlelib.php
version.php
2013-02-18 08:30:29 +13:00
fd6d738db4
MDL-38075 csslib: fixed coding error when working with an array of styles
2013-02-18 08:22:08 +13:00
41d397e68b
MDL-37939 Course: Correct broken sequence data
2013-02-15 21:10:13 +00:00
33b5464e96
MDL-36380 stats: No more duplicated entries when viewing monthly stats
2013-02-15 15:03:37 +08:00
6cf9f04cd6
Merge branch 'MDL-37952_24' of git://github.com/stronk7/moodle into MOODLE_24_STABLE
2013-02-12 09:46:08 +08:00
d3a2b63143
Merge branch 'MDL-37943_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
2013-02-12 01:21:06 +01:00
017382e6d3
Merge branch 'MDL-37896_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
2013-02-12 01:14:24 +01:00
0eab91dcce
MDL-37919 Let PHPUnit display the content of $a even if the error string is not found
2013-02-12 01:08:22 +01:00
8b2034bc7b
Merge branch 'MDL-37797_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE
2013-02-11 13:58:47 +08:00
sam marshall