Dan Poltawski [Tue, 3 May 2016 08:08:00 +0000 (09:08 +0100)]
MDL-54008 tests: clarify comment in tz test
Dan Poltawski [Tue, 3 May 2016 07:56:58 +0000 (08:56 +0100)]
Merge branch 'MDL-54008_master-normalise' of git://github.com/dmonllao/moodle
Andrew Nicols [Tue, 3 May 2016 06:26:50 +0000 (14:26 +0800)]
Merge branch 'MDL-53982-master' of https://github.com/FMCorz/moodle
David Monllao [Tue, 3 May 2016 05:59:29 +0000 (13:59 +0800)]
MDL-54008 tz: Unexisting tz with decimals fallback to rounded down integer
David Monllao [Tue, 3 May 2016 05:02:15 +0000 (13:02 +0800)]
Merge branch 'wip-MDL-53402-master' of git://github.com/abgreeve/moodle
Adrian Greeve [Tue, 3 May 2016 04:48:00 +0000 (12:48 +0800)]
MDL-53402 mod_data: Added custom validation code for data fields.
Added custom validation to radiobutton, menu, and checkbox.
David Monllao [Tue, 3 May 2016 02:28:33 +0000 (10:28 +0800)]
Merge branch 'MDL-53899-master-pluginperm' of git://github.com/mudrd8mz/moodle
David Monllao [Tue, 3 May 2016 01:57:40 +0000 (09:57 +0800)]
Merge branch 'MDL-51142-master' of git://github.com/damyon/moodle
David Monllao [Tue, 3 May 2016 01:54:59 +0000 (09:54 +0800)]
Merge branch 'MDL-53925-master' of https://github.com/StudiUM/moodle
Andrew Nicols [Tue, 3 May 2016 01:41:30 +0000 (09:41 +0800)]
Merge branch 'wip-mdl-54000-fix' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Tue, 3 May 2016 01:18:29 +0000 (09:18 +0800)]
MDL-54000 webservices: removed core_user_get_users_by_id
core_user_get_users_by_id is deprecated, hence
removed it from the list of mobile web services
Andrew Nicols [Tue, 3 May 2016 00:57:53 +0000 (08:57 +0800)]
Merge branch 'wip-mdl-54000' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 2 May 2016 16:06:26 +0000 (17:06 +0100)]
Merge branch 'wip-MDL-53402-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 2 May 2016 15:56:56 +0000 (16:56 +0100)]
Merge branch 'MDL-54019_master' of git://github.com/markn86/moodle
Serge Gauthier [Mon, 2 May 2016 13:44:55 +0000 (09:44 -0400)]
MDL-53925 competency: Plan and template descriptions are not displayed
Mark Nelson [Mon, 2 May 2016 10:09:39 +0000 (18:09 +0800)]
MDL-54019 core_behat: fixed typo
Dan Poltawski [Mon, 2 May 2016 09:17:12 +0000 (10:17 +0100)]
Merge branch 'wip_MDL-53033_master' of git://github.com/gjb2048/moodle
Dan Poltawski [Mon, 2 May 2016 09:16:27 +0000 (10:16 +0100)]
Merge branch 'MDL-53904-master' of git://github.com/marinaglancy/moodle
Frederic Massart [Mon, 2 May 2016 08:52:21 +0000 (16:52 +0800)]
MDL-53982 competency: Javascript error due to string injection
Dan Poltawski [Mon, 2 May 2016 08:52:16 +0000 (09:52 +0100)]
Merge branch 'MDL-54008_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Mon, 2 May 2016 08:41:10 +0000 (16:41 +0800)]
MDL-51142 assign: Fix for group assignments with NEW status
Clement Smith [Mon, 15 Feb 2016 13:28:04 +0000 (07:28 -0600)]
MDL-51142 mod/assign: Fix erroneous submission status display
This prevents display of submission time/date when the assignment
submission record is in a new state. It also keeps the display of
overdue assignments identical for those students who have viewed
the assignment yet not submitted, for those students who have
not viewed the assignment, and for those students who have not
viewed the assignment yet the instructor has accessed the grading
page.
David Monllao [Mon, 2 May 2016 08:17:48 +0000 (16:17 +0800)]
Merge branch 'wip-MDL-53601-master' of git://github.com/abgreeve/moodle
Adrian Greeve [Thu, 7 Apr 2016 05:29:35 +0000 (13:29 +0800)]
MDL-53601 mod_assign: Behat test for group feedback.
Adrian Greeve [Mon, 2 May 2016 07:45:32 +0000 (15:45 +0800)]
MDL-53601 mod_assign: Feedback files are sent to all group members.
David Monllao [Mon, 2 May 2016 07:53:57 +0000 (15:53 +0800)]
Merge branch 'MDL-53901-master' of git://github.com/damyon/moodle
David Monllao [Mon, 2 May 2016 07:38:11 +0000 (15:38 +0800)]
Merge branch 'MDL-53635-master' of git://github.com/jleyva/moodle
Juan Leyva [Mon, 25 Apr 2016 09:32:39 +0000 (11:32 +0200)]
MDL-53635 message_airnotifier: Remove tags from notifications
David Monllao [Mon, 2 May 2016 04:37:32 +0000 (12:37 +0800)]
MDL-54008 timezone: Updating references to Caracas tz.
I've removed Caracas direct references because it would fail on
some systems, it would depend on how updated is the olson version
PHP is using.
David Monllao [Mon, 2 May 2016 06:20:11 +0000 (14:20 +0800)]
Merge branch 'MDL-54006-master' of git://github.com/lameze/moodle
Rajesh Taneja [Mon, 2 May 2016 04:44:53 +0000 (12:44 +0800)]
MDL-54000 mod_assign: core_user_get_users_by_field be accessible by ajax
To display user information on new assignment UI
core_user_get_users_by_field should be accessible
by ajax
Andrew Nicols [Mon, 2 May 2016 05:43:59 +0000 (13:43 +0800)]
Merge branch 'MDL-53920_master' of git://github.com/markn86/moodle
Adrian Greeve [Fri, 1 Apr 2016 05:50:53 +0000 (13:50 +0800)]
MDL-53402 mod_data: Behat test for entering zero in required fields.
Adrian Greeve [Thu, 31 Mar 2016 07:26:21 +0000 (15:26 +0800)]
MDL-53402 mod_data: Required fields can contain 0.
The number and text field would not accept 0 as a
valid response.
Andrew Nicols [Mon, 2 May 2016 05:18:55 +0000 (13:18 +0800)]
Merge branch 'MDL-53836-master' of git://github.com/ryanwyllie/moodle
Andrew Nicols [Mon, 2 May 2016 05:04:20 +0000 (13:04 +0800)]
Merge branch 'MDL-53982-master' of git://github.com/FMCorz/moodle
Frederic Massart [Mon, 2 May 2016 04:57:03 +0000 (12:57 +0800)]
MDL-53982 competency: Javascript error due to string injection
Mark Nelson [Fri, 29 Apr 2016 10:22:11 +0000 (18:22 +0800)]
MDL-53920 cohort: notify competencies on cohort deletion
Simey Lameze [Mon, 2 May 2016 03:45:59 +0000 (11:45 +0800)]
MDL-54006 tool_uploaduser: check validation result before display warning
Skylar Kelty [Fri, 15 Apr 2016 15:53:39 +0000 (16:53 +0100)]
MDL-53836 mod_assign: Don't escape theme's larrow/rarrow
Damyon Wiese [Mon, 2 May 2016 02:52:02 +0000 (10:52 +0800)]
MDL-53901 login: Redirect to https if loginhttps is enabled
This just prevents a double redirect.
David Monllao [Mon, 2 May 2016 02:51:59 +0000 (10:51 +0800)]
Merge branch 'MDL-53996-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 2 May 2016 02:46:50 +0000 (10:46 +0800)]
Merge branch 'MDL-53980-master-enfix' of git://github.com/mudrd8mz/moodle
David Monllao [Mon, 2 May 2016 02:22:25 +0000 (10:22 +0800)]
Merge branch 'MDL-53877-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 2 May 2016 02:15:26 +0000 (10:15 +0800)]
Merge branch 'MDL-53967-master' of https://github.com/sk-unikent/moodle
David Monllao [Mon, 2 May 2016 02:04:36 +0000 (10:04 +0800)]
Merge branch 'MDL-53994' of git://github.com/stronk7/moodle
Serge Gauthier [Fri, 29 Apr 2016 15:32:07 +0000 (11:32 -0400)]
MDL-53877 competency: Help and better validation text for evidence URL
David Monllao [Mon, 2 May 2016 02:00:29 +0000 (10:00 +0800)]
Merge branch 'MDL-53917-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 2 May 2016 01:54:52 +0000 (09:54 +0800)]
Merge branch 'MDL-53918-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Mon, 2 May 2016 01:34:17 +0000 (09:34 +0800)]
MDL-53996 block_lp: Check user login before fetching block contents
Eloy Lafuente (stronk7) [Sat, 30 Apr 2016 07:39:16 +0000 (09:39 +0200)]
Merge branch 'MDL-53955-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Sat, 30 Apr 2016 05:28:18 +0000 (07:28 +0200)]
MDL-53994 block_feedback: Add missing include
Also, a little scenario has been added to have the behavior
covered and prevent this to happen again.
Dan Poltawski [Fri, 29 Apr 2016 11:27:28 +0000 (12:27 +0100)]
on-demand release 3.1dev+
Dan Poltawski [Fri, 29 Apr 2016 11:27:27 +0000 (12:27 +0100)]
NOBUG: Fixed file access permissions
David Monllao [Fri, 29 Apr 2016 08:34:20 +0000 (16:34 +0800)]
Merge branch 'MDL-53937-master' of git://github.com/FMCorz/moodle
Frederic Massart [Fri, 29 Apr 2016 05:50:06 +0000 (13:50 +0800)]
MDL-53937 core_competency: False negative with duedate on plan reopen
Dan Poltawski [Fri, 29 Apr 2016 08:30:31 +0000 (09:30 +0100)]
MDL-52154 lti: fix string errors
Thanks to Helen
David Monllao [Fri, 29 Apr 2016 04:29:18 +0000 (12:29 +0800)]
Merge branch 'MDL-53943-master' of git://github.com/junpataleta/moodle
Conflicts:
admin/tool/cohortroles/settings.php
Dan Poltawski [Thu, 28 Apr 2016 13:29:39 +0000 (14:29 +0100)]
Merge branch 'MDL-53879-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 28 Apr 2016 11:37:41 +0000 (12:37 +0100)]
Merge branch 'MDL-53716-master' of git://github.com/FMCorz/moodle
Jun Pataleta [Thu, 28 Apr 2016 04:09:09 +0000 (12:09 +0800)]
MDL-53494 tool_lp: Set correct competency and user ID attributes
Sets the correct competency and user ID data attributes for the list of
user competencies in the plan.
Eloy Lafuente (stronk7) [Thu, 28 Apr 2016 11:08:42 +0000 (13:08 +0200)]
Merge branch 'wip-MDL-53638-fix' of https://github.com/marinaglancy/moodle
David Monllao [Thu, 28 Apr 2016 09:29:31 +0000 (17:29 +0800)]
MDL-49414 externallib: Cleaning tabs
Marina Glancy [Thu, 28 Apr 2016 08:42:22 +0000 (16:42 +0800)]
MDL-53638 mod_feedback: fix to responsetime in non-anon answer
David Monllao [Thu, 28 Apr 2016 09:16:16 +0000 (17:16 +0800)]
MDL-49414 user: Fixing unmanaged conflict
Andrew Nicols [Thu, 28 Apr 2016 07:26:00 +0000 (15:26 +0800)]
Merge branch 'MDL-37753-feedback-name' of https://github.com/brendanheywood/moodle
David Monllao [Thu, 28 Apr 2016 08:58:17 +0000 (16:58 +0800)]
Merge branch 'MDL-49414-master' of git://github.com/cameron1729/moodle
Brendan Heywood [Thu, 28 Apr 2016 03:05:26 +0000 (13:05 +1000)]
MDL-37753 mod_feedback: Use activity name for export filename
Andrew Nicols [Thu, 28 Apr 2016 07:17:29 +0000 (15:17 +0800)]
Merge branch 'MDL-53973-tablelib-worksheet-name' of https://github.com/brendanheywood/moodle
Brendan Heywood [Thu, 28 Apr 2016 04:34:33 +0000 (14:34 +1000)]
MDL-37753 dataformat: Only set worksheet name where implemented
Brendan Heywood [Thu, 28 Apr 2016 03:01:27 +0000 (13:01 +1000)]
MDL-53973 tablelib: Fixed bug with worksheetname being ignored
Andrew Nicols [Thu, 28 Apr 2016 06:39:33 +0000 (14:39 +0800)]
MDL-53858 quiz accessibility: Correct aria-labelledby attribute
Andrew Nicols [Thu, 28 Apr 2016 06:13:27 +0000 (14:13 +0800)]
Merge branch 'MDL-53858' of git://github.com/timhunt/moodle
David Monllao [Thu, 28 Apr 2016 05:37:00 +0000 (13:37 +0800)]
Merge branch 'MDL-52035_master' of git://github.com/markn86/moodle
Mark Nelson [Thu, 28 Apr 2016 05:20:58 +0000 (13:20 +0800)]
MDL-52035 enrol_lti: added fix for oracle
Also added another unit test for \enrol_lti\helper::count_lti_tools();
David Monllao [Thu, 28 Apr 2016 05:16:47 +0000 (13:16 +0800)]
Merge branch 'MDL-53791-master-fix' of git://github.com/andrewnicols/moodle
Andrew Nicols [Thu, 28 Apr 2016 04:28:45 +0000 (12:28 +0800)]
MDL-53791 mod_wiki: Bump version for new WS
Eloy Lafuente (stronk7) [Wed, 27 Apr 2016 21:31:29 +0000 (23:31 +0200)]
MDL-53638 mod_feedback: rebuild css
David Monllao [Thu, 28 Apr 2016 03:53:31 +0000 (11:53 +0800)]
Merge branch 'MDL-53921-master' of git://github.com/ryanwyllie/moodle
Eloy Lafuente (stronk7) [Wed, 27 Apr 2016 21:10:56 +0000 (23:10 +0200)]
MDL-51603 flexitable: Document the deletion of get_download_menu()
Eloy Lafuente (stronk7) [Wed, 27 Apr 2016 12:24:59 +0000 (14:24 +0200)]
Merge branch 'wip-MDL-53638-master' of https://github.com/marinaglancy/moodle
Eric Merrill [Wed, 27 Apr 2016 13:37:40 +0000 (09:37 -0400)]
MDL-53758 search: Fix unittest error
Dan Poltawski [Wed, 27 Apr 2016 12:45:19 +0000 (13:45 +0100)]
Merge branch 'MDL-52154-master-wip2' of https://github.com/xow/moodle
Dan Poltawski [Wed, 27 Apr 2016 09:55:06 +0000 (10:55 +0100)]
Merge branch 'MDL-53915-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Wed, 27 Apr 2016 09:07:03 +0000 (10:07 +0100)]
Merge branch 'MDL-53919_master' of git://github.com/markn86/moodle
Skylar Kelty [Fri, 29 Apr 2016 11:14:34 +0000 (12:14 +0100)]
MDL-53967 caching: Ensure getAllKeys returns a valid array
Jun Pataleta [Fri, 22 Apr 2016 05:03:53 +0000 (13:03 +0800)]
MDL-53918 tool_cohortroles: Assign role on non-empty user and cohort IDs
Jun Pataleta [Fri, 22 Apr 2016 06:27:22 +0000 (14:27 +0800)]
MDL-53917 tool_lp: Show course competency notice appropriately
Show course competency notice only if the user has a
moodle/competency:competencygrade capability.
David Mudrák [Thu, 28 Apr 2016 16:39:59 +0000 (18:39 +0200)]
MDL-53980 lang: Fix the reworded strings in Behat tests
Helen Foster [Thu, 28 Apr 2016 16:32:03 +0000 (18:32 +0200)]
MDL-53980 lang: Merge English strings from the en_fix language pack
Frederic Massart [Thu, 28 Apr 2016 04:02:12 +0000 (12:02 +0800)]
MDL-53716 competency: Do not restore competencies when disabled
Frederic Massart [Mon, 11 Apr 2016 06:59:37 +0000 (14:59 +0800)]
MDL-53716 competency: Backup and restore course competency user data
Jun Pataleta [Thu, 28 Apr 2016 08:41:38 +0000 (16:41 +0800)]
MDL-53943 tool_cohortroles: Require 'moodle/cohort:view' capability
tool_cohortroles not just needs the 'moodle/role:manage' capability,
but the 'moodle/cohort:view' capability as well since the cohorts
selector field will not work without it.
Frederic Massart [Tue, 26 Apr 2016 08:00:31 +0000 (16:00 +0800)]
MDL-53879 competency: Remove limit on framework depth
Jun Pataleta [Thu, 28 Apr 2016 06:56:55 +0000 (14:56 +0800)]
MDL-53955 tool_lp: Remove the use of chained steps in tool_lp
Ryan Wyllie [Wed, 27 Apr 2016 01:48:48 +0000 (01:48 +0000)]
MDL-53921 gradingform: Destroy frequently used comment dialog on hide
Jun Pataleta [Wed, 27 Apr 2016 05:11:44 +0000 (13:11 +0800)]
MDL-53494 tool_lp: Fix dialogue display when plan is completed
Marina Glancy [Fri, 22 Apr 2016 02:49:00 +0000 (10:49 +0800)]
MDL-53638 mod_feedback: corrections during rebase:
1. make query in upgrade cross-DB
2. rebase on top of MDL-51603
Marina Glancy [Fri, 15 Apr 2016 13:32:09 +0000 (21:32 +0800)]
MDL-53638 mod_feedback: JS confirmation of deleting item
Marina Glancy [Fri, 15 Apr 2016 13:01:15 +0000 (21:01 +0800)]
MDL-53638 mod_feedback: JS confirmation on delete entry and template