63618 Commits

Author SHA1 Message Date
Ankit Agarwal
f5c263836d MDL-41558 cache: Identifiers should never be passed as null to cache::make() 2013-09-03 13:37:50 +08:00
Ankit Agarwal
06f6885b27 MDL-41558 cache: Improve performance of cache::make() by using isset instead of array_key_exist() 2013-09-03 13:36:59 +08:00
Dan Poltawski
f3549a51a7 Merge branch 'w36_MDL-41255_m26_changepw' of https://github.com/skodak/moodle 2013-09-03 12:58:27 +08:00
Dan Poltawski
c247756b0c Merge branch 'MDL-41428-master' of git://github.com/FMCorz/moodle 2013-09-03 12:27:26 +08:00
Marina Glancy
30fe1181b5 MDL-41508 Changes in indentation 2013-09-03 14:21:28 +10:00
Dan Poltawski
4ffd70f315 Merge branch 'wip-MDL-41179-master' of git://github.com/marinaglancy/moodle 2013-09-03 11:48:45 +08:00
Marina Glancy
24f824b924 MDL-41517 Do not call fix_course_sortorder unnecessarily
Thanks to Thomas Worthington
2013-09-03 13:45:00 +10:00
Adrian Greeve
146893d62f MDL-41556 - workshop: undefined constant FILE_INTERNAL message fixed. 2013-09-03 11:44:30 +08:00
Dan Poltawski
2793260fc0 MDL-41256 course tests: improve robustness
* Fail if an exception isn't recieved
* Don't allow the possibility of an undefined variable being tested
2013-09-03 11:01:15 +08:00
Dan Poltawski
c6569641e7 Merge branch 'MDL-41256-master' of https://github.com/mackensen/moodle 2013-09-03 10:51:27 +08:00
Dan Poltawski
29db803ac7 Merge branch 'wip-MDL-41317-master' of git://github.com/marinaglancy/moodle 2013-09-03 10:40:28 +08:00
David Monllao
fcc0b5b920 MDL-40566 behat: Update features using the new options 2013-09-03 10:31:57 +08:00
David Monllao
db5f2d3360 MDL-40566 behat: Adding info about the deprecated attr. 2013-09-03 10:29:28 +08:00
David Monllao
17344d4c8f MDL-40566 behat: Moving from behat_command to behat_selectors 2013-09-03 10:28:42 +08:00
David Monllao
ecf5b898e2 MDL-40566 behat: Adding behat_selectors
Class that manages moodle selectors transition
to behat default selectors.
2013-09-03 10:28:41 +08:00
Dan Poltawski
2b1e887561 Merge branch 'MDL-40214_master' of https://github.com/markn86/moodle 2013-09-03 10:06:38 +08:00
Dan Poltawski
98c2189d62 MDL-31890 version bump
(and trailing whitespace fix)
2013-09-03 09:55:08 +08:00
Dan Poltawski
6affe9e695 Merge branch 'wip-MDL-31890-master' of git://github.com/marinaglancy/moodle 2013-09-03 09:53:22 +08:00
Damyon Wiese
8a1b820bc5 Merge branch 'w36_MDL-20045_m26_customlevels' of https://github.com/skodak/moodle 2013-09-03 09:35:16 +08:00
Dan Marsden
cb029f33c6 MDL-28579 SCORM: coding guideline fixes 2013-09-03 09:12:36 +12:00
Matteo Scaramuccia
a1070d3fff MDL-29218 Repository: fixed a typo in the PHPDoc 2013-09-02 23:09:24 +02:00
Matteo Scaramuccia
46d023b77a MDL-29218 Repository: $pname, get rid of all the useless code
More details in the Tracker.
2013-09-02 23:09:22 +02:00
Matteo Scaramuccia
9b64ec4dae MDL-29218 Repository: Hide the repo if repository::plugin_init returns false 2013-09-02 23:09:20 +02:00
Eloy Lafuente (stronk7)
e034d84c48 Merge branch 'MDL-38190-master' of git://github.com/sammarshallou/moodle
Conflicts:
	backup/import.php
	theme/bootstrapbase/style/moodle.css
2013-09-02 16:56:50 +02:00
Damyon Wiese
0d416e9c0b MDL-39992 assign: Sort grading actions in alphabetical order 2013-09-02 22:23:03 +08:00
Damyon Wiese
8fd00a2471 MDL-40631: Prevent students from submitting empty assignments. 2013-09-02 21:59:15 +08:00
Dan Poltawski
ee0be46957 Merge branch '41214-26' of git://github.com/samhemelryk/moodle
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
2013-09-02 17:32:08 +08:00
Dan Poltawski
56b9e0b565 Merge branch 'MDL-41149-master' of git://github.com/damyon/moodle 2013-09-02 17:25:27 +08:00
Michael Aherne
91dbb24442 MDL-41254 backup Raise time and memory limit in precheck. 2013-09-02 10:22:40 +01:00
Dan Poltawski
53d9e41bb9 Merge branch 'MDL-41402_master-fix-langstr' of git://github.com/dmonllao/moodle 2013-09-02 17:22:14 +08:00
David Monllao
1a780189c6 MDL-41402 tool_generator: Changing plugin name according to the new feature 2013-09-02 17:04:04 +08:00
Dan Poltawski
b0b85f70d8 MDL-41402 tool_generator: increment version 2013-09-02 16:32:58 +08:00
Dan Poltawski
013b0e9b79 MDL-41402 tool_generator: fix whitespace 2013-09-02 16:28:27 +08:00
Dan Poltawski
f1b10b36ea Merge branch 'MDL-41402_master' of git://github.com/dmonllao/moodle 2013-09-02 16:27:46 +08:00
David Monllao
338bf2e07b MDL-41402 tool_generator: Adding maketestsite script
Uses maketestcourse.php to set up
a test site.
2013-09-02 16:25:35 +08:00
David Monllao
8cac8d3e95 MDL-41402 tool_generator: Refactoring backend class
Moving it to course_backend keeping generic
methods and attributes in backend class.

AMOS BEGIN
 MOV [size_0,tool_generator],[coursesize_0,tool_generator]
 MOV [size_1,tool_generator],[coursesize_1,tool_generator]
 MOV [size_2,tool_generator],[coursesize_2,tool_generator]
 MOV [size_3,tool_generator],[coursesize_3,tool_generator]
 MOV [size_4,tool_generator],[coursesize_4,tool_generator]
 MOV [size_5,tool_generator],[coursesize_5,tool_generator]
AMOS END
2013-09-02 16:25:33 +08:00
Dan Poltawski
4abcb5c5e2 Merge branch 'MDL-41399_master-remove_test' of git://github.com/dmonllao/moodle 2013-09-02 16:21:48 +08:00
Rajesh Taneja
bb78e249cd MDL-39961 Events: Replace Legacy events - User
This change includes:
* Added user_updated event, replacing old event
* Added user_created event, replacing old event
* Added user_deleted event, replacing old event
* Added user_loggedout event, replacing old event
* Added user_enrolment_created event, replacing old event
* Added user_enrolment_deleted event, replacing old event
* Added user_enrolment_updated event, replacing old event
2013-09-02 16:10:05 +08:00
David Monllao
e25be3b1dc MDL-41399 tool_generator: Removing unit test
Removing dodgy database reset in the
middle of a test as sequences reset
is not allowed.
2013-09-02 15:55:18 +08:00
Damyon Wiese
80032fea02 Merge branch 'wip-MDL-41231-master' of git://github.com/abgreeve/moodle 2013-09-02 15:26:26 +08:00
Dan Poltawski
6b25e62f48 Merge branch 'MDL-35925-master' of git://github.com/phalacee/moodle
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
2013-09-02 15:23:05 +08:00
Damyon Wiese
c932a4db7c Merge branch 'MDL-41259_master' of https://github.com/nitzo/moodle 2013-09-02 15:02:12 +08:00
Damyon Wiese
fb692af13b Merge branch 'MDL-41516-m' of git://github.com/andrewnicols/moodle 2013-09-02 14:56:49 +08:00
Dan Poltawski
5972292444 Merge branch 'MDL-36093-master' of github.com:StudiUM/moodle 2013-09-02 14:10:28 +08:00
Dan Poltawski
7cefa10220 MDL-40676 tests: fix null byte test. 2013-09-02 13:58:53 +08:00
Yuliya Bozhko
737a352ff8 MDL-40712 badges: Display recipient information 2013-09-02 13:43:51 +08:00
Yuliya Bozhko
2d3c0faef1 MDL-40924 badges: Add caching to external badges 2013-09-02 13:40:41 +08:00
Andrew Davis
974beea10a MDL-40735 mod_lesson: fixed up a header and stripped out hardcoded formatting 2013-09-02 12:38:20 +07:00
Andrew Davis
66e2b9f8c2 MDL-38856 reposition activity group control and fixed titles in chat, database and forum 2013-09-02 11:49:39 +07:00
Petr Škoda
bff1d60c05 MDL-40676 ignore null bytes 2013-09-02 12:25:02 +08:00