75337 Commits

Author SHA1 Message Date
Dan Poltawski
23e1a54f57 Merge branch 'MDL-51305_master_too_many_gradeitem_fetches' of https://github.com/colin-umn/moodle 2015-09-28 16:25:54 +01:00
Dan Poltawski
51e0adf664 MDL-48947 version: bump 2015-09-28 15:45:11 +01:00
Dan Poltawski
ebadc15c1f Merge branch 'MDL-48947_v3' of https://github.com/Syxton/moodle 2015-09-28 15:06:21 +01:00
Dan Poltawski
5a068364cb Merge branch 'mdl46710-master' of https://github.com/tlock/moodle 2015-09-28 14:56:52 +01:00
Dan Poltawski
411dea9523 Merge branch 'MDL-51390_master' of https://github.com/totara/openbadges 2015-09-28 13:27:12 +01:00
Dan Poltawski
1b7caf12dc Merge branch 'MDL-51312_master' of git://github.com/markn86/moodle 2015-09-28 11:51:36 +01:00
Dan Poltawski
233ab7ee47 Merge branch 'MDL-51498_regrade_perf' of https://github.com/moodlerooms/moodle 2015-09-28 11:09:12 +01:00
Dan Poltawski
158cc03737 Merge branch 'MDL-50109-master-blogsort' of https://github.com/mudrd8mz/moodle 2015-09-28 10:44:47 +01:00
Yuliya Bozhko
4d0ebdebc5 MDL-51390 badges: Switch backpack URL to use HTTPS
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2015-09-28 10:37:03 +01:00
Dan Poltawski
52f4e19bbd Merge branch 'MDL-49482-master' of https://github.com/blckct/moodle 2015-09-28 10:31:48 +01:00
Eloy Lafuente (stronk7)
a9ed308f74 Merge branch 'wip-mdl-51555' of https://github.com/rajeshtaneja/moodle 2015-09-25 11:31:14 +02:00
rajesh Taneja
0f2aad5908 MDL-51555 behat: Increase question preview window
As question preview window is small, chrome driver
fails to select drag and drop element
2015-09-25 16:53:14 +08:00
rajesh Taneja
8d892b1d40 MDL-51555 behat: Added @_switch_window tag
DND question types use switch window and the tag
was not added, so it was failing for phantomjs
Added tag to avoid phantomjs failures
2015-09-25 11:53:03 +08:00
Mark Nelson
6fff51d675 MDL-51312 core_message: added unit test for the message_deleted event 2015-09-24 15:13:42 -07:00
Mark Nelson
b5e617e245 MDL-51312 core: added message_deleted event 2015-09-24 15:13:42 -07:00
Tim Lock
86b314c7b0 MDL-46710 mod_lti: fix logging and completion tracking in new windows 2015-09-25 06:27:18 +09:30
Eloy Lafuente (stronk7)
ec3aa5be7d MDL-49482 sqlsrv: Implement support of Offset/Fetch in SQL Server 2012+ 2015-09-24 20:07:51 +02:00
Jakub Kania
918187a062 MDL-49482 mssql: Implement support of Offset/Fetch in SQL Server 2012+. 2015-09-24 20:07:51 +02:00
Eloy Lafuente (stronk7)
fd57d685c7 weekly release 3.0dev 2015-09-24 16:06:53 +02:00
Eloy Lafuente (stronk7)
caac3c50a1 NOBUG: Fixed file access permissions 2015-09-24 16:06:53 +02:00
rajesh Taneja
4cfaf27c08 MDL-49973 behat: Fixed string change from Continue to Delete 2015-09-24 15:38:20 +02:00
Eloy Lafuente (stronk7)
02be8a0427 Merge branch 'MDL-50207-master' of git://github.com/lameze/moodle 2015-09-24 15:38:19 +02:00
Eloy Lafuente (stronk7)
e99b197e97 MDL-51371 course: fix core_course_get_course_module assertion
A recent bugfix before integration left this failing. They are 22.
2015-09-24 15:38:18 +02:00
Eloy Lafuente (stronk7)
f95452b84f Merge branch 'MDL-51371-master' of git://github.com/jleyva/moodle 2015-09-24 15:38:14 +02:00
Eloy Lafuente (stronk7)
46e92173fd Merge branch 'wip-MDL-51259-master' of git://github.com/abgreeve/moodle 2015-09-24 15:37:12 +02:00
Andrew Nicols
dcfae879e9 MDL-51172 core: Adjust WS help strings 2015-09-24 15:37:12 +02:00
Andrew Nicols
fff882dd8a Merge branch 'MDL-51182' of https://github.com/danielneis/moodle 2015-09-24 15:37:11 +02:00
Juan Leyva
c515849937 MDL-51371 course: New Web Service core_course_get_course_module 2015-09-23 15:32:15 +02:00
Andrew Nicols
32cc0de4f3 MDL-50349 mod_scorm: Bump version for new WS 2015-09-23 13:40:29 +08:00
Andrew Nicols
d26b770814 Merge branch 'MDL-50332_master-form-fix' of git://github.com/dmonllao/moodle 2015-09-23 11:50:29 +08:00
Andrew Nicols
3678dd00c2 Merge branch 'MDL-51222-master-fix' of https://github.com/andrewnicols/moodle 2015-09-23 11:43:15 +08:00
Andrew Nicols
57884502bc MDL-51222 Javascript: Reapply YUI config after adding modules 2015-09-23 10:49:59 +08:00
David Monllao
012d14e892 MDL-50332 enrol_self: Setting form url for guests
Credit to Andrew Nicols.
2015-09-23 09:52:04 +08:00
Andrew Nicols
b8ceed62d2 Merge branch 'MDL-51423-master-cliout' of git://github.com/mudrd8mz/moodle 2015-09-23 09:42:29 +08:00
Andrew Nicols
be09ca85ef MDL-50664 mod_data: Fix for unit test failure 2015-09-23 09:27:30 +08:00
Mark Nielsen
5f6e2fc9d3 MDL-51498 core_grades: Prevent unnecessary grade record fetching
All of these changes make use of already
fetched grade data.  Without these changes,
the gradebook regrade process does not scale
well with very large courses because it fetches
many grade records, one at a time.
2015-09-22 12:04:28 -07:00
Eloy Lafuente (stronk7)
201a26bbaa Merge branch 'MDL-47494' of git://github.com/timhunt/moodle
Note: Fixed some minor grunt and EOF whitespace issues while merging.
2015-09-22 18:38:27 +02:00
Dan Poltawski
5c7c9ea99a Merge branch 'MDL-51107-master' of git://github.com/FMCorz/moodle 2015-09-22 15:11:10 +01:00
Frederic Massart
61ce548a71 MDL-51107 navigationlib: Plugins can extend navigation category settings 2015-09-22 21:58:50 +08:00
Dan Poltawski
b7a87899c5 Merge branch 'MDL-50541-master' of git://github.com/jleyva/moodle 2015-09-22 14:37:22 +01:00
Dan Poltawski
f43194ab36 Merge branch 'MDL-50349-master' of git://github.com/jleyva/moodle 2015-09-22 13:17:03 +01:00
Dan Poltawski
df44776afd Merge branch 'MDL-50536-master' of git://github.com/jleyva/moodle 2015-09-22 12:55:46 +01:00
Dan Poltawski
79eb3afa9b Merge branch 'MDL-50132-master' of git://github.com/jleyva/moodle 2015-09-22 12:46:39 +01:00
Dan Poltawski
abd3fdc977 Merge branch 'wip-MDL-51108-master' of git://github.com/abgreeve/moodle 2015-09-22 11:48:49 +01:00
Dan Poltawski
0730ddc2ad Merge branch 'MDL-50664-master' of git://github.com/ryanwyllie/moodle 2015-09-22 10:39:33 +01:00
Dan Poltawski
11a83dbb1e Merge branch 'MDL-49973-master' of git://github.com/cameron1729/moodle 2015-09-22 09:44:44 +01:00
Dan Poltawski
2e3b61fc4a MDL-50917 navigation: fix incorrect @since 2015-09-22 09:36:06 +01:00
Dan Poltawski
b3e959497e Merge branch 'wip-MDL-50917-master' of git://github.com/abgreeve/moodle 2015-09-22 09:15:57 +01:00
Dan Poltawski
16d08d465b Merge branch 'MDL-51412_qtype_index' of git://github.com/davosmith/moodle 2015-09-22 09:00:00 +01:00
Damyon Wiese
4e8afd56d5 MDL-51222 javascript: Merge all the YUI instances
We previously had a global Y (simpleyui) and a separate Y created
to put Y in scope for all our modules. This meant that we had 2
separate sandboxes for YUI, which means that modules are duplicated,
and events do not fire across YUI instances.

This change merges the 2 instances, so any code refering to Y will
get the same instance of YUI (amd code, yui modules, static init code etc).

Thanks to Andrew Nicols!
2015-09-22 15:56:40 +08:00