Eloy Lafuente (stronk7) 4efcfaa3ae Merge branch 'w13_MDL-37742_m25_dirtyoracle' of git://github.com/skodak/moodle ...

Conflicts:
	lib/upgrade.txt

2013-03-26 23:04:48 +01:00

..

tests

MDL-35465 add more sql escaping tests for cohort_get_cohorts()

2012-09-16 22:32:33 +02:00

assign.php

MDL-36283 use accesscontext when assigning cohort members

2012-11-10 20:43:35 +01:00

edit_form.php

MDL-38147 deprecated make_categories_list(), change usage to coursecat

2013-03-25 13:20:46 +11:00

edit.php

MDL-35465 improve cohorts coding style

2012-09-16 21:38:28 +02:00

index.php

MDL-36554 Admin settings: make tables class consistent throughout admin settings

2013-01-14 10:10:54 +08:00

lib.php

Merge branch 'w13_MDL-37742_m25_dirtyoracle' of git://github.com/skodak/moodle

2013-03-26 23:04:48 +01:00

locallib.php

MDL-36395: Converted hard-coded MAX_USER_PER_PAGE to config setting

2013-03-12 17:14:53 +08:00