Eloy Lafuente (stronk7) 1333c05ebe Merge branch 's11_MDL-27936_send_message_master' of github.com:dongsheng/moodle ...

Conflicts:
	lib/db/services.php
	version.php

2011-06-29 20:00:49 +02:00

..

output

…

bell.wav

…

defaultoutputs.php

…

discussion.php

…

edit.php

messaging: MDL-26960 Check correct users permissions

2011-06-09 15:18:43 +01:00

externallib.php

MDL-27936, send_message webservice should respect contact settings, improve readability, rename it to moodle_message_send_instantmessages

2011-06-29 11:26:16 +08:00

index.php

…

lib.php

MDL-27829 blocks: altered the algorithm used to find plugin page types

2011-06-27 12:27:41 +08:00

module.js

…

renderer.php

…

search_advanced.html

…

search.html

…

send_form.php

…

settings.html

…