Dan Poltawski b1a6c9dc52 Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle ...

Conflicts:
	login/change_password.php

2013-10-28 15:37:05 +08:00

..

activitynames

MDL-41192 course: Can not write to the read-only properties of cm_info

2013-09-10 14:11:30 +10:00

algebra

MDL-39434 Bump all versions near 2.5 release

2013-05-01 18:03:29 +02:00

censor

MDL-42243 fix filter settings regression and support standard settings.php

2013-10-12 13:38:34 +02:00

data

MDL-40463 libraries: Deprecate get_courseid_from_context()

2013-07-11 15:54:36 +08:00

emailprotect

MDL-39434 Bump all versions near 2.5 release

2013-05-01 18:03:29 +02:00

emoticon

MDL-42243 fix filter settings regression and support standard settings.php

2013-10-12 13:38:34 +02:00

glossary

MDL-42477 filter_glossary: Alert was not showing

2013-10-24 09:11:15 +08:00

mediaplugin

MDL-39753 Add 2.5.0 upgrade line

2013-05-20 15:33:19 +02:00

multilang

MDL-42243 fix filter settings regression and support standard settings.php

2013-10-12 13:38:34 +02:00

tex

MDL-42148 new overview of 3rd party libraries

2013-10-16 14:48:29 +08:00

tidy

MDL-39434 Bump all versions near 2.5 release

2013-05-01 18:03:29 +02:00

urltolink

MDL-42243 fix filter settings regression and support standard settings.php

2013-10-12 13:38:34 +02:00

index.html

…

local_settings_form.php

MDL-29401 fix previous regression

2011-09-26 23:21:39 +02:00

manage.php

MDL-41811 simplify the admin tree detection logic and fix navigation in multiple areas

2013-10-21 14:17:55 +08:00

upgrade.txt

MDL-42243 fix filter settings regression and support standard settings.php

2013-10-12 13:38:34 +02:00