66458 Commits

Author SHA1 Message Date
Rajesh Taneja
623a32e50d MDL-43736 Events: Updated unit test to test context not used in event 2014-01-29 11:39:50 +08:00
Rajesh Taneja
fdc729ea57 MDL-43736 Events: event->contextinstanceid should be used where possible
While restoring event context might not be present (deleted)
So before using context api's check context or use event properties
2014-01-29 11:39:44 +08:00
Andrew Nicols
649c80e6a4 MDL-43885 Javascript: Make the [X] button work like 'No' in relevant dialogues
The [X] button on the dialogue is another form of the 'No' button and
should behave as such. In some dialogues this matters more than others
because the dialogue is destroyed.
2014-01-29 11:16:47 +08:00
Eloy Lafuente (stronk7)
fefcd9abab Merge branch 'MDL-43040' 2014-01-29 01:52:49 +01:00
Eloy Lafuente (stronk7)
994e566256 MDL-43040 Note the deprecation and add some TODOs 2014-01-29 01:40:30 +01:00
Sam Hemelryk
34027f1563 MDL-25500 lock: post integration trivial cleanup
* A couple of misc comment typo's
* Added missing $CFG required global in file_lock_factory::is_available
* Removed unused $CFG global from file_lock_factory::get_lock
* A couple of trivial phpdoc tweaks
* Removed unused $DB global from postgres_lock_factory::get_index_from_key
* Added global namespace \ to exceptions in get_index_from_key (tested and found they didn't resolve)
2014-01-29 13:22:16 +13:00
Sam Hemelryk
453d66b782 Merge branch 'MDL-25500-master-squashed' of git://github.com/damyon/moodle 2014-01-29 13:21:00 +13:00
Tomasz Muras
672ce966c6 MDL-43040 Replace $module with $plugin in all mod/*/version.php
Conflicts:
	mod/quiz/version.php
2014-01-29 00:36:12 +01:00
Sam Hemelryk
07481c9277 Merge branch 'MDL-40909_master' of https://github.com/markn86/moodle 2014-01-29 08:23:51 +13:00
Andrew Nicols
da942d13d2 MDL-43893 Javascript: Remove YUI2 uses in group members management JS 2014-01-29 00:25:38 +08:00
Andrew Nicols
0860dd78f7 MDL-43886 Javascript: Remove dialouges from the DOM upon destroy 2014-01-29 00:02:03 +08:00
Tim Hunt
3aaf535df1 MDL-43892 dbtransfer: Fix missing string. 2014-01-28 15:55:41 +00:00
Michael Milette
ca5849e5dc MDL-42505 - Feedback plugin: Inappropriate use of fieldset tags around form and cancel button
Changes:
* Removed the fieldset HTML tags around the Cancel button at the bottom of the form.
* Removed the fieldset HTML tags around the whole form.
* Added missing fieldset tags around groups of radio buttons and checkboxes.
* Removed unordered list wrapping dropdown lists.
* Removed duplicate label for dropdown lists.

Modified Files:
* mod/feedback/complete.php
* mod/feedback/complete_guest.php
* mod/feedback/item/multichoice/lib.php
* mod/feedback/item/multichoicerated/lib.php

Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>
2014-01-28 09:43:56 -05:00
Ruslan Kabalin
d00951b585 MDL-39617 Add cli backup script for a single course backing up.
Useful for backing up a single course. Accepts parameters:

--courseid=INTEGER        Course ID for backup
--courseshortname=STRING  Course shortname for backup.
--destination=STRING      Path where to store backup file. If not set, the backup
                          will stored within the same course backup area.
2014-01-28 13:40:03 +00:00
Damyon Wiese
d551112566 MDL-25500 Lock: Do not use file locking if $CFG->preventfilelocking is set
(And file_lock_dir is not prefixed with the dataroot).
2014-01-28 20:14:05 +08:00
Eloy Lafuente (stronk7)
51cba7809c Merge branch 'MDL-42928-master' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-01-28 12:22:23 +01:00
Eloy Lafuente (stronk7)
6dcea23522 Merge branch 'w04_MDL-34055_m27_insertrecords' of https://github.com/skodak/moodle 2014-01-28 10:43:51 +01:00
Ankit Agarwal
aa611d661c MDL-43884 database: Fix get_tables() api for external stores 2014-01-28 16:28:57 +08:00
Andrew Nicols
1d98ca14eb MDL-43538 Javascript: Deprecate callback argument to confirm_action
As a precursor to deprecating M.util.show_confirm, this deprecates the
callback argment to the confirm_action class.

This is not currently used anywhere in core, and it's use leads to use of
eval in Javascript.
2014-01-28 13:18:43 +08:00
Mark Nelson
7cbb5070f5 MDL-40909 enrol_imsenterprise: removed 'new' add_to_log call
Here we are replacing the unnecessary code used to create a course with
a call to create_course(), which triggers the event 'course_created'.
Nothing more is needed.
2014-01-27 19:52:55 -08:00
Mark Nelson
f1f4f4fd7b MDL-40909 core_enrol: removed 'enrol' add_to_log calls
Before each of these calls a call to enrol_user() is made, which
triggers the event 'user_enrolment_created'. Nothing more is needed.
2014-01-27 19:52:55 -08:00
Mark Nelson
6324517209 MDL-40909 core_enrol: removed 'unenrol' add_to_log calls
Before each of these calls a call to unenrol_user() is made, which
triggers the event 'user_enrolment_deleted'. Nothing more is needed.
2014-01-27 19:52:55 -08:00
Kevin Wiliarty
1ec8b1c7ea MDL-39942: invite only users who can post to discuss 2014-01-27 22:30:47 -05:00
Mark Nelson
50ac4392f3 MDL-40909 mod_forum: removed duplicated test (duplicated in enrol/meta/tests/plugin_test.php) 2014-01-27 19:11:38 -08:00
Petr Škoda
cc5dba8e54 MDL-34055 add bulk DB->insert_records() method
This patch was inspired by patch by Simon Coggins from Totara.
2014-01-28 10:41:43 +08:00
Andrew Nicols
478d82db06 MDL-42928 JavaScript: Disable lockScroll for small chooserdialogues 2014-01-28 09:49:32 +08:00
Andrew Nicols
73747aea77 MDL-42928 JavaScript: Add LockScroll to all modal dialogues 2014-01-28 09:49:32 +08:00
Andrew Nicols
5ab39a0e97 MDL-42928 JavaScript: Create a module to handle page scroll locking 2014-01-28 09:49:32 +08:00
Eloy Lafuente (stronk7)
56f39760ac Merge branch 'master_MDL-43797' of https://github.com/totara/moodle 2014-01-28 00:43:16 +01:00
David Curry
c8ade8cbdc MDL-43797 lib/db/upgrade.php: Optimise sql for my_pages deletion
Change-Id: Idf300ab07afda3bcefea80e617549f40c710e529
2014-01-28 12:36:04 +13:00
Sam Hemelryk
9123721e4f Merge branch 'MDL-43246' of git://github.com/timhunt/moodle 2014-01-28 12:16:20 +13:00
Eloy Lafuente (stronk7)
9fc25660c5 Merge branch 'MDL-43450_master' of git://github.com/dmonllao/moodle 2014-01-28 00:07:57 +01:00
Eloy Lafuente (stronk7)
bc6a79aee6 Merge branch '43688-27' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-01-27 23:58:18 +01:00
David Curry
a5ab83ac5e MDL-43797 lib/db/upgrade.php: Remove custom pages for deleted users
Change-Id: Ifef563431682a2a5524927f85ca9eba9cbe520ff
2014-01-28 11:55:17 +13:00
Eloy Lafuente (stronk7)
835ef9d84c Merge branch 'MDL-43874' of git://github.com/timhunt/moodle 2014-01-27 23:52:07 +01:00
David Curry
72d1ccffb3 MDL-43797 lib/moodlelib.php: Remove custom homepages on user deletion
Change-Id: Ibaf6f0a9dc29d00b97a32111d1cf5063ebed1888
2014-01-28 11:41:20 +13:00
Eloy Lafuente (stronk7)
2c8b15c50d Merge branch 'MDL-43757_master' of git://github.com/dmonllao/moodle 2014-01-27 21:20:39 +01:00
Sam Hemelryk
c77d28e5b2 Merge branch 'wip-MDL-43643-master' of git://github.com/marinaglancy/moodle 2014-01-28 08:40:45 +13:00
Eloy Lafuente (stronk7)
b598c48179 Merge branch 'wip-mdl-43765' of https://github.com/rajeshtaneja/moodle 2014-01-27 19:23:09 +01:00
Eloy Lafuente (stronk7)
705718fb7c Merge branch 'wip-mdl-43766' of https://github.com/rajeshtaneja/moodle 2014-01-27 19:19:31 +01:00
Eloy Lafuente (stronk7)
c88dba093e Merge branch 'MDL-43773-master' of https://github.com/lucisgit/moodle 2014-01-27 17:18:56 +01:00
Eloy Lafuente (stronk7)
8fce57c001 Merge branch 'MDL-43581' of git://github.com/timhunt/moodle 2014-01-27 17:03:25 +01:00
Tim Hunt
e101ec9fd7 MDL-43874 quiz, teacher comments should respect display options.
Whether the comments on manually graded questions were visible to
students should have been controlled by the 'Specific feedback' Review
option in the quiz settings. However, the quiz was not setting
$displayoptions->manualcomment, so it did not work.
2014-01-27 12:01:32 +00:00
James Pratt
df9ddae686 MDL-41757 quiz statistics : limit subq and variant stat rows
and print min, median and max.
2014-01-27 18:04:08 +07:00
Eloy Lafuente (stronk7)
9be395ee99 Merge branch 'wip-MDL-43800-master' of git://github.com/marinaglancy/moodle 2014-01-27 12:02:28 +01:00
James Pratt
4f7516f6e8 MDL-41756 (3) quiz statistics : test variant stats 2014-01-27 18:00:04 +07:00
James Pratt
1239d28776 MDL-41756 (2) quiz statistics : break down question stats by variant 2014-01-27 18:00:04 +07:00
James Pratt
aa05ae5da3 MDL-41756 (1) quiz statistics : use new method increment_progress
to cut down on clutter before adding new break down by variant stuff
2014-01-27 17:56:16 +07:00
James Pratt
eb50c6e198 MDL-43027 core progress : new method keeps track of progress internally 2014-01-27 17:51:09 +07:00
James Pratt
ef81a7c30e MDL-41754 (3) quiz statistics : need to escape core_php_time_limit
after MDL-42084 was merged into upstream, introducing
core_php_time_limit, this branch that moved a reference to
core_php_time_limit to a new namespace was broken.
2014-01-27 17:45:50 +07:00