66319 Commits

Author SHA1 Message Date
Gordon Bateson
1b17f2b0db MDL-40410 remove ampersands required for PHP strict standards lib/tablelib.php 2014-02-04 10:06:07 +13:00
Sam Hemelryk
7c8c6aa76b Merge branch 'wip-mdl-40911' of https://github.com/rajeshtaneja/moodle 2014-02-04 09:53:16 +13:00
Sam Hemelryk
b2ca12e904 Merge branch 'MDL-43884-master' of git://github.com/ankitagarwal/moodle 2014-02-04 09:11:27 +13:00
Sam Hemelryk
3f5827459e MDL-39617 backup: language improvements to cli/backup.php 2014-02-04 09:04:01 +13:00
Sam Hemelryk
6bdf77c191 Merge branch 'MDL-39617-master' of https://github.com/lucisgit/moodle 2014-02-04 08:41:37 +13:00
Sam Hemelryk
6958c718cc Merge branch 'wip-MDL-39942-master' of https://github.com/kwiliarty/moodle 2014-02-04 08:28:56 +13:00
Eloy Lafuente (stronk7)
4f31798dfc Merge branch 'master_MDL-37714' of git://github.com/greg-or/moodle 2014-02-03 17:58:30 +01:00
Marina Glancy
8621a0ece5 Merge branch 'MDL-41647' of git://github.com/apsdehal/moodle 2014-02-03 17:34:20 +08:00
Marina Glancy
3ef6324aaa Merge branch 'MDL-43805-master' of git://github.com/damyon/moodle 2014-02-03 16:09:09 +08:00
Marina Glancy
c8e346f799 Merge branch 'w05_MDL-43905_m27_loginevents' of git://github.com/skodak/moodle 2014-02-03 15:17:18 +08:00
Marina Glancy
dc4bed906f Merge branch 'MDL-43593-master' of git://github.com/damyon/moodle 2014-02-03 15:06:11 +08:00
Marina Glancy
367465085b Merge branch 'MDL-43951_master' of git://github.com/dmonllao/moodle 2014-02-03 14:53:45 +08:00
David Monllao
405cdd0441 MDL-43951 behat: Fixing random failure
NodeElement->hasAttribute() (JS enabled) queries selenium
about whether it has any attribute or not, if due to an
AJAX request the field node changed selenium can not access
that node and throws an exception.
2014-02-03 13:59:12 +08:00
Marina Glancy
1b066c06c6 Merge branch 'MDL-43440-master' of git://github.com/mr-russ/moodle 2014-02-03 13:42:23 +08:00
apsdehal
23f9ff903f MDL-41647 WebServices: Changed notification CSS class 2014-02-02 15:20:21 +05:30
Tim Hunt
e06bb5f800 MDL-43926 Unit tests shouldn't assume only one category on install 2014-01-31 13:31:17 +00:00
Marina Glancy
183515da23 weekly release 2.7dev 2014-01-31 14:11:12 +08:00
Marina Glancy
56ae2ba99b Merge branch 'install_master' of git://git.moodle.org/moodle-install 2014-01-31 14:11:11 +08:00
Petr Škoda
54b1e0409c MDL-43905 fix update of user login times
There needs to be only one event during user login.
The timemodified field is not supposed to be updated during login.
2014-01-31 10:08:01 +08:00
Gregory Faller
20c9f4a133 MDL-37714: Correctly identify frequently used comments during restore 2014-01-31 10:26:11 +10:30
Andrew Nicols
8cf30a371a MDL-42928 Filepicker: Disable behat tests run by phantom
There seems to be a bug relating to overflow: hidden on the body tag in
some cases which is only showing for dialogues which belong to the
filepicker.

Disabling these for the moment as this issue may be related to MDL-43712
which is a work in progress.
2014-01-30 17:13:32 +08:00
Rajesh Taneja
140118e3e8 MDL-40911 events: replaced add_to_log with events for login failed 2014-01-30 12:12:02 +08:00
Damyon Wiese
11ab6207e8 MDL-43805 assign: Behat test for quickgrading bug 2014-01-29 20:29:41 +08:00
Damyon Wiese
a6fd2e2cf1 MDL-43805 Assign: Quickgrading wipes out grades for hidden columns.
Grr.. quickgrading will always be a hack.
2014-01-29 20:29:35 +08:00
David Monllao
7e3f5e79d0 MDL-43450 behat: Checking the ->behat_* vars contents before showing the steps list 2014-01-29 14:28:37 +08:00
Marina Glancy
7c4044a54f Merge branch 'MDL-25500-master-fix1' of git://github.com/damyon/moodle 2014-01-29 12:01:33 +08:00
Damyon Wiese
37b2c56569 MDL-25500 Lock: Unit tests have found that MySQL locks are broken
Removing the MySQL lock factory, the only safe way to use this MySQL API
would be to open a new DB connection for every lock. Record locking is a decent
fallback.
2014-01-29 11:52:51 +08:00
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
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
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
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