Marina Glancy
367465085b
Merge branch 'MDL-43951_master' of git://github.com/dmonllao/moodle
2014-02-03 14:53:45 +08:00
Ankit Agarwal
6b21643236
MDL-43804 themes: Update css not to use r0 and r1 identifiers for table rows
2014-02-03 14:29:39 +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
Andrew Nicols
a964ead06d
MDL-43911 Behat: Save dumps of the page content to disk on scenario failure
2014-02-02 20:34:10 +08:00
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
e20497827d
MDL-41384 upgrade: make sure to re-read $SITE from DB when course table is altered
2014-01-31 16:56:30 +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
Rajesh Taneja
140118e3e8
MDL-40911 events: replaced add_to_log with events for login failed
2014-01-30 12:12:02 +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
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
Sam Hemelryk
07481c9277
Merge branch 'MDL-40909_master' of https://github.com/markn86/moodle
2014-01-29 08:23:51 +13: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
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
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
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
Eloy Lafuente (stronk7)
9fc25660c5
Merge branch 'MDL-43450_master' of git://github.com/dmonllao/moodle
2014-01-28 00:07:57 +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
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
Eloy Lafuente (stronk7)
8fce57c001
Merge branch 'MDL-43581' of git://github.com/timhunt/moodle
2014-01-27 17:03:25 +01: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
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
James Pratt
8da6fc9d57
MDL-41754 (2) quiz statistics : using Sam's new progress classes
2014-01-27 17:45:50 +07:00
James Pratt
809fdb83b1
MDL-41754 (1) Progress tracking : moved from backup and restore to core
2014-01-27 17:45:50 +07:00
Tim Hunt
391edc51f9
MDL-43581 additionalhtmlfooter should be added to every page
...
Not just pages with a visible footer.
2014-01-27 10:24:43 +00:00
Damyon Wiese
9843e5ece5
MDL-25500 lock: New locking framework.
...
This locking system is designed to be used everywhere requiring
locking in Moodle. Each use of the locking system can be configured
to use a different type of locking (or the same type with a different
configuration).
The first supported lock types are memcache, memcached, file (flock),
db (specific handlers for pg, mysql and mariadb).
2014-01-27 10:04:18 +08:00
Sam Hemelryk
068ffec81b
Merge branch 'w04_MDL-43761_m27_sqlinstall' of https://github.com/skodak/moodle
2014-01-27 14:30:57 +13:00
Eloy Lafuente (stronk7)
f4068d757f
Merge branch 'MDL-43758_master' of git://github.com/dmonllao/moodle
2014-01-27 01:18:05 +01:00
Sam Hemelryk
9299144461
Merge branch 'w04_MDL-43746_m27_courselogin' of https://github.com/skodak/moodle
2014-01-27 11:32:08 +13:00