Commit graph

55562 commits

Author SHA1 Message Date
Dan Poltawski
6d2cd4368a Merge branch 'MDL-34468-master' of git://github.com/ankitagarwal/moodle 2012-07-24 17:53:50 +08:00
Dan Poltawski
effe1c20c0 Merge branch 'MDL-34458-master-integration' of git://github.com/FMCorz/moodle 2012-07-24 17:24:15 +08:00
Dan Poltawski
18d3e39072 Merge branch 'MDL-34461-master-integration' of git://github.com/FMCorz/moodle 2012-07-24 17:08:13 +08:00
Ankit Agarwal
a3fc4b3ad6 MDL-34468 scorm: Replace all instances of get_context_instance() with respective context_XXXX in mod/scorm 2012-07-24 17:08:05 +08:00
Ankit Agarwal
c492a78ee2 MDL-34468 quiz: Replace all instances of get_context_instance() with respective context_XXXX class in mod/quiz 2012-07-24 17:08:05 +08:00
Ankit Agarwal
1c9691160b MDL-34468 survey: Replace all instances of get_context_instance() with respective context_XXXX class in mod/survey 2012-07-24 17:07:57 +08:00
Frederic Massart
21c08c63ca MDL-34458 Librairies: Replaced deprecated get_context_instance() 2012-07-24 16:58:17 +08:00
Aparup Banerjee
821fbfe4f5 Merge branch 'wip-mdl-31294' of git://github.com/rajeshtaneja/moodle 2012-07-24 16:57:58 +08:00
Dan Poltawski
5237103a99 Merge branch 'MDL-34456-master-integration' of git://github.com/FMCorz/moodle 2012-07-24 16:53:45 +08:00
Aparup Banerjee
90310b1b4f MDL-26969 assignment : clarified phpdoc and fixed whitespace. 2012-07-24 16:40:05 +08:00
Aparup Banerjee
c5e518d521 Merge branch 'MDL-26969' of git://github.com/rwijaya/moodle 2012-07-24 16:39:59 +08:00
Dan Poltawski
4074f6d090 Merge branch 'MDL-34459-master' of git://github.com/ankitagarwal/moodle 2012-07-24 16:35:01 +08:00
Ankit Agarwal
4658aec5eb MDL-34459 course: Changing strictness of context call in get_category_or_system_context() to keep it consistent with past usages 2012-07-24 16:20:35 +08:00
Ankit Agarwal
1f364c87e3 MDL-34459 course: changing strictness of context calls as needed 2012-07-24 16:20:35 +08:00
Ankit Agarwal
9a5e297b4c MDL-34470 course: Replace all instances of get_context_instance() with context_xxx::instance() in course/ 2012-07-24 16:19:01 +08:00
Dan Poltawski
4ea5885e87 Merge branch 'wip-MDL-34463-master' of git://github.com/abgreeve/moodle 2012-07-24 16:16:45 +08:00
Dan Poltawski
0cbeea2b96 Merge branch 'MDL-34455-master-integration' of git://github.com/FMCorz/moodle 2012-07-24 16:01:00 +08:00
Dan Poltawski
226c5493ac Merge branch 'MDL-34484' of git://github.com/timhunt/moodle 2012-07-24 15:40:18 +08:00
Dan Poltawski
abdf2b675b MDL-34462 cohort: remove uncessary MUST_EXIST params
(its now the default)
2012-07-24 15:23:07 +08:00
Dan Poltawski
e0bbad5bf9 Merge branch 'MDL-34462-master-integration' of git://github.com/FMCorz/moodle 2012-07-24 15:16:39 +08:00
Rajesh Taneja
c277b502ab MDL-31294 Forms Library: Removed deprecated functions from forms library 2012-07-24 15:09:39 +08:00
Dan Poltawski
7bc0f808d3 Merge branch 'wip-MDL-34457-master' of git://github.com/abgreeve/moodle 2012-07-24 15:04:53 +08:00
Dan Poltawski
c14ecacfd5 Merge branch 'MDL-34470-master' of git://github.com/ankitagarwal/moodle 2012-07-24 14:51:14 +08:00
Dan Poltawski
b7db7803bc Merge branch 'w30_MDL-34299_m24_html5' of git://github.com/skodak/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2012-07-24 14:07:26 +08:00
Adrian Greeve
d40604724b MDL-34463 - lib - Alteration of the get_context_instance function to utilize the new function context_XXXX::instance(). 2012-07-24 14:04:40 +08:00
Dan Poltawski
1011757205 Merge branch 'w30_MDL-34129_m24_enrolinfo' of git://github.com/skodak/moodle 2012-07-24 13:41:35 +08:00
Dan Poltawski
5082d87c03 Merge branch 'wip-mdl-32940' of git://github.com/rajeshtaneja/moodle 2012-07-24 13:39:59 +08:00
Aparup Banerjee
acb88dbed3 Merge branch 'wip-mdl-32942' of git://github.com/rajeshtaneja/moodle 2012-07-24 12:14:17 +08:00
Adrian Greeve
41b3836067 MDL-33061 - lib - Replacement of get_context_instance with the new function call (group 3) 2012-07-24 09:52:41 +08:00
Frederic Massart
fe2fdd11e4 MDL-34456 Librairies: Replaced deprecated get_context_instance() 2012-07-24 09:49:47 +08:00
AMOS bot
f2b52ff157 Automatically generated installer lang files 2012-07-24 00:31:47 +00:00
Sam Hemelryk
b016e23594 Merge branch 'MDL-34352-master-2' of git://git.luns.net.uk/moodle 2012-07-24 11:21:16 +12:00
Kanika Goyal
67ba9007b7 MDL-32227: Plagiarism API - add support for plagiarism api to workshop module 2012-07-24 01:52:54 +05:30
Petr Škoda
434f54044e MDL-34475 add default value to xmldb_field hash calculation 2012-07-23 21:34:44 +02:00
Andrew Robert Nicols
0a2fb91003 MDL-34352 Convert chooserdialogue IDs to classes 2012-07-23 15:35:42 +01:00
Tim Hunt
564fcb3bee MDL-34484 unit tests: stop phpunit using testcase names as class names 2012-07-23 11:08:37 +01:00
Frederic Massart
55bcef2954 MDL-34461 Librairies: Replaced deprecated get_context_instance() 2012-07-23 17:42:05 +08:00
Aparup Banerjee
f36b0ba502 Merge branch 'wip-MDL-34285-m24' of git://github.com/samhemelryk/moodle 2012-07-23 17:22:14 +08:00
Rajesh Taneja
61cca0b7fc MDL-32940 libraries: Replaced deprecated PARAM_NUMBER with PARAM_FLOAT 2012-07-23 17:21:05 +08:00
Aparup Banerjee
88b907fdac MDL-34449 phpdoc typo correction 2012-07-23 16:39:25 +08:00
Aparup Banerjee
ad1097c2d6 Merge branch 'w30_MDL-34449_m24_layoutmaddness' of git://github.com/skodak/moodle 2012-07-23 16:27:15 +08:00
Frederic Massart
6ca657a772 MDL-34462 Librairies: Replaced deprecated get_context_instance() 2012-07-23 16:22:36 +08:00
Aparup Banerjee
c1cf921653 Merge branch 'MDL-29271-master' of git://github.com/FMCorz/moodle 2012-07-23 16:09:44 +08:00
Aparup Banerjee
249996281a Merge branch 'MDL-34400-master' of git://github.com/FMCorz/moodle 2012-07-23 15:32:32 +08:00
Ankit Agarwal
0bbe041b77 MDL-34470 workshop: Replace all instances of get_context_instance() with context_xxx::instance() in mod/workshop 2012-07-23 15:10:07 +08:00
Ankit Agarwal
1df2362669 MDL-34470 wiki: Replace all instances of get_context_instance() with context_xxx::instance() in mod/wiki 2012-07-23 15:10:07 +08:00
Ankit Agarwal
6fd7b70f4b MDL-34470 url: Replace all instances of get_context_instance() with context_xxx::instance() in mod/url 2012-07-23 15:10:07 +08:00
Dan Poltawski
147dc9dafd Merge branch 'wip-MDL-34286-m24' of git://github.com/samhemelryk/moodle 2012-07-23 15:00:26 +08:00
Dan Poltawski
4f22bcbc41 Merge branch 'MDL-34066' of git://github.com/timhunt/moodle 2012-07-23 14:54:46 +08:00
Frederic Massart
bf006d2c15 MDL-34455 Libraries: Replaced deprecated get_context_instance() 2012-07-23 14:33:02 +08:00