John Okely
2a5bb939c2
MDL-52821 lti: Change tool_consumer_instance_description to site fullname
...
And change tool_consumer_instance_name to site shortname
2016-03-16 12:04:09 +08:00
Eloy Lafuente (stronk7)
3edc162611
Merge branch 'MDL-53354-master' of git://github.com/merrill-oakland/moodle
2016-03-16 01:09:45 +01:00
Andrew Nicols
c7f04791f3
MDL-52386 auth_ldap: Typo fix for suspended user
2016-03-16 08:03:05 +08:00
Andrew Nicols
baa536188b
Merge branch 'MDL-52386-master' of git://github.com/cameron1729/moodle
2016-03-16 07:50:10 +08:00
Eloy Lafuente (stronk7)
987226c090
Merge branch 'MDL-53139' of https://github.com/dg711/moodle
2016-03-16 00:12:18 +01:00
Eloy Lafuente (stronk7)
1e60d7e482
Merge branch 'MDL-53430-master' of git://github.com/merrill-oakland/moodle
2016-03-16 00:03:31 +01:00
Eloy Lafuente (stronk7)
1d57167f15
Merge branch 'mdl-53133-master' of git://github.com/deraadt/moodle
2016-03-15 23:52:19 +01:00
Dan Poltawski
4539892cda
MDL-53149 mod_data: update backup and webservices for timemodified
...
Amended to add support for standard restore apply_date_offset().
2016-03-15 23:41:55 +01:00
Dan Poltawski
b174e9efa6
MDL-53149 mod_data: add timemodified field to db schema
2016-03-15 23:31:32 +01:00
Eloy Lafuente (stronk7)
e44c0acf01
Merge branch 'MDL-53323' of https://github.com/mr-russ/moodle
2016-03-15 19:43:26 +01:00
Andrew Nicols
37f9c6a2d6
Merge branch 'MDL-53301_master' of git://github.com/dmonllao/moodle
2016-03-15 15:50:15 +08:00
David Monllao
8ea783f315
Merge branch 'MDL-53057-master' of git://github.com/FMCorz/moodle
2016-03-15 15:19:01 +08:00
David Monllao
016208776f
Merge branch 'MDL-53179' of https://github.com/andrewhancox/moodle
2016-03-15 15:07:46 +08:00
David Monllao
858ad11363
MDL-48680 scorm: Marking cmielement_submitted as abstract
2016-03-15 15:01:57 +08:00
David Monllao
e022b79164
Merge branch 'm31_MDL-48680_Add_Score_Status_Events' of https://github.com/scara/moodle
2016-03-15 14:56:50 +08:00
Andrew Nicols
d89095cd3d
Merge branch 'MDL-53234-support-email' of https://github.com/brendanheywood/moodle
2016-03-15 13:43:22 +08:00
Andrew Nicols
295ab83d2e
Merge branch 'MDL-53351-master-lti-notice' of git://github.com/mudrd8mz/moodle
2016-03-15 12:48:06 +08:00
Andrew Nicols
e77a15875c
Merge branch 'MDL_52574_master' of https://github.com/alexandru-elisei/moodle
2016-03-15 12:23:52 +08:00
Andrew Nicols
ab5c48b0d5
Merge branch 'MDL-53279_master' of git://github.com/dmonllao/moodle
2016-03-15 12:19:22 +08:00
Adrian Greeve
5cb5d459c9
MDL-53279 grades: Additional comments
...
In the hopes that other people will understand this code.
2016-03-15 12:18:31 +08:00
David Monllao
f32e6ffc00
MDL-53279 grades: Recalculate only required items
...
Skip grade categories and calculated grade items that do not depend
on .
2016-03-15 12:18:23 +08:00
Andrew Nicols
97a3b6d23d
Merge branch 'MDL-48838_master' of git://github.com/dmonllao/moodle
2016-03-15 12:06:48 +08:00
David Monllao
03bd6c21ad
Merge branch 'MDL-52934-master' of git://github.com/FMCorz/moodle
2016-03-15 08:58:33 +08:00
Frederic Massart
bbd7f7f73a
MDL-52934 repository_boxnet: Deprecate v1 to v2 migration tool
2016-03-14 16:56:11 +08:00
David Monllao
01f8945b81
Merge branch 'wip-mdl-46891-fix' of https://github.com/rajeshtaneja/moodle
2016-03-14 14:35:00 +08:00
Rajesh Taneja
af7cadbb4d
MDL-46891 behat: Increment counter
2016-03-14 14:24:36 +08:00
David Monllao
c854ce6eb7
Merge branch 'MDL-53102-messageid' of https://github.com/brendanheywood/moodle
2016-03-14 14:17:41 +08:00
David Monllao
f8aaf45d30
Merge branch 'MDL-51986-master' of git://github.com/dpalou/moodle
2016-03-14 13:59:21 +08:00
Andrew Nicols
459ad3d35d
Merge branch 'MDL-53252_master' of git://github.com/dmonllao/moodle
2016-03-14 13:35:32 +08:00
David Monllao
8e9cafbee7
Merge branch 'MDL-53304' of git://github.com/timhunt/moodle
2016-03-14 13:26:12 +08:00
David Monllao
28774c9263
MDL-48838 grades: New grade_categories cache
2016-03-14 11:20:35 +08:00
Brendan Heywood
344178035d
MDL-53102 tests: corrected phpdocs in email diversion tests
...
(Introduced by previous patch MDL-52818)
2016-03-14 14:20:10 +11:00
Brendan Heywood
54dceeed88
MDL-53102 email: Ensure all emails generate consistent Message-ID URLs
2016-03-14 14:20:10 +11:00
Andrew Nicols
2e2e4caa7e
Merge branch 'MDL-51887-master' of git://github.com/dpalou/moodle
2016-03-14 11:17:40 +08:00
Andrew Nicols
bac8a365fa
Merge branch 'MDL-52821-master' of https://github.com/xow/moodle
2016-03-14 10:58:25 +08:00
David Monllao
edeafdd0e7
MDL-53252 grades: Skip user regrading if only feedback changes
2016-03-14 08:18:28 +08:00
David Monllao
488366bed8
MDL-53301 grades: Update gradeitems aggregationcoef2 only when required
2016-03-14 08:08:39 +08:00
Matteo Scaramuccia
f5bc19c877
MDL-48680 mod_scorm: Added new events: {scoreraw,status}_submitted.
...
Thanks to Ben Johnson and Josh Willcock for their contribution to this
patch.
2016-03-13 09:58:51 +01:00
Dani Palou
9a4c52221e
MDL-51986 wiki: Add tests for mod_wiki_get_page_contents
2016-03-11 14:09:36 +01:00
Dani Palou
5d94e34322
MDL-51986 wiki: New WS mod_wiki_get_page_contents
2016-03-11 14:09:36 +01:00
Dani Palou
ed4fb2bf7e
MDL-51887 wiki: Add tests for mod_wiki_get_subwiki_pages
2016-03-11 13:35:30 +01:00
Dani Palou
96abf9af07
MDL-51887 wiki: New WS mod_wiki_get_subwiki_pages
2016-03-11 13:35:30 +01:00
Alexandru Elisei
b6d1286414
MDL-52574 accesslib: Prevent get_role_users() fail in certain cases
...
The function get_role_users() requires the caller to include the $sort fields in
the $fields argument. On PostgreSQL this will cause the function to fail when
the default $sort fields aren't part of the requested fields. The behavior of
the function is augmented to add the $sort fields to $fields if they are not
already present.
2016-03-11 13:10:01 +02:00
dg711
92cec53b47
MDL-53139 admin: case diff issue with email
2016-03-11 16:27:34 +05:30
Cameron Ball
6141dcfe67
MDL-52386 auth_ldap: Add support for disabled accounts
2016-03-11 16:48:18 +08:00
Eloy Lafuente (stronk7)
cfc621df29
Merge branch 'wip-mdl-46891' of https://github.com/rajeshtaneja/moodle
2016-03-11 03:57:03 +01:00
Rajesh Taneja
e11c21452b
MDL-46891 behat: Point to moodle-behat-extension
2016-03-11 10:51:17 +08:00
Rajesh Taneja
c4c2cd59eb
MDL-46891 behat: Improved exit status of parallel run
...
Exit status should contain pass/fail information
of each run it is executing. Every bit of status
will have information of pass/fail status of parallel
process
2016-03-11 10:51:17 +08:00
Rajesh Taneja
0e1c34e51a
MDL-46891 behat: Added support for $CFG->behat_profiles
...
This config will be supported to avoid broken configuration
in future. As this is limited, we need will still use
->behat_config to set config values which can't be set by
behat_profiles
2016-03-11 10:51:17 +08:00
Rajesh Taneja
e01012e96d
MDL-46891 behat: Driver specific fixes.
...
1. Browserkit doesn't handle [] in name
2. Grades are not visible in viewport and might fail
with few drivers, increasing size of window to ensure
grades are visible and can be modified.
3. Click edit first to see grade link
4. Expand fields before setting value
5. Updated xpath, as crawler update it.
6. Hover fails to show icon
2016-03-11 10:51:16 +08:00