Dan Poltawski [Tue, 7 Apr 2015 19:26:15 +0000 (20:26 +0100)]
Merge branch 'MDL-49730-master-workshop-width' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 7 Apr 2015 19:25:28 +0000 (20:25 +0100)]
Merge branch 'MDL-49347-master' of git://github.com/jleyva/moodle
Conflicts:
lib/db/services.php
version.php
Juan Leyva [Thu, 2 Apr 2015 14:34:21 +0000 (16:34 +0200)]
MDL-49347 rating: Unit tests for core_rating_get_item_ratings
Juan Leyva [Wed, 1 Apr 2015 19:45:52 +0000 (21:45 +0200)]
MDL-49347 rating: Several fixes and code clean up
- Use correct return values types
- Fix the warnings declaration
- Fix the pluginfile URL
Eloy Lafuente (stronk7) [Tue, 7 Apr 2015 17:13:56 +0000 (19:13 +0200)]
Merge branch 'MDL-48159' of https://github.com/andrewhancox/moodle
Dan Poltawski [Tue, 7 Apr 2015 15:44:41 +0000 (16:44 +0100)]
Merge branch 'MDL-49500-master' of git://github.com/jleyva/moodle
Conflicts:
lib/db/services.php
version.php
Eloy Lafuente (stronk7) [Tue, 7 Apr 2015 15:29:15 +0000 (17:29 +0200)]
Merge branch 'MDL-49499-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 7 Apr 2015 15:24:20 +0000 (16:24 +0100)]
Merge branch 'master_MDL-49638' of git://github.com/icefresh89/moodle
Dan Poltawski [Tue, 7 Apr 2015 15:13:46 +0000 (16:13 +0100)]
Merge branch 'MDL-49747-task-error-improvement' of https://github.com/brendanheywood/moodle
Dan Poltawski [Tue, 7 Apr 2015 14:40:06 +0000 (15:40 +0100)]
Merge branch 'MDL-41608-master' of git://github.com/jethac/moodle
Dan Poltawski [Tue, 7 Apr 2015 14:38:34 +0000 (15:38 +0100)]
MDL-40988 quiz: behat fix from Raj
Damyon Wiese [Tue, 7 Apr 2015 13:42:39 +0000 (21:42 +0800)]
Merge branch 'MDL-49736_master' of git://github.com/markn86/moodle
Andrew Hancox [Fri, 13 Mar 2015 11:23:35 +0000 (11:23 +0000)]
MDL-48159 mod_assign: Added setting preventsubmissionnotingroup
If enabled a user will be unable to make a submission unless they are a
member of a group.
Michael Elbert [Wed, 25 Mar 2015 13:38:30 +0000 (09:38 -0400)]
MDL-49638 login: Wrong location of reCAPTCHA on signup page
Damyon Wiese [Tue, 7 Apr 2015 12:28:23 +0000 (20:28 +0800)]
Merge branch 'MDL-49503-master' of git://github.com/jleyva/moodle
Conflicts:
lib/db/services.php
version.php
Eloy Lafuente (stronk7) [Tue, 7 Apr 2015 12:20:48 +0000 (14:20 +0200)]
Merge branch 'MDL-48205_master' of https://github.com/totara/openbadges
Eloy Lafuente (stronk7) [Tue, 7 Apr 2015 12:15:33 +0000 (14:15 +0200)]
Merge branch 'MDL-49065_m29v6' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 7 Apr 2015 12:08:41 +0000 (13:08 +0100)]
Merge branch 'MDL-49740-locking-bugs' of https://github.com/brendanheywood/moodle
Dan Poltawski [Tue, 7 Apr 2015 10:28:35 +0000 (11:28 +0100)]
Merge branch 'MDL-49677' of https://github.com/sleperf/moodle
Dan Poltawski [Tue, 7 Apr 2015 10:17:44 +0000 (11:17 +0100)]
MDL-49504 notes: fix trailing whitespace
Dan Poltawski [Tue, 7 Apr 2015 10:17:04 +0000 (11:17 +0100)]
Merge branch 'MDL-49504-master' of git://github.com/jleyva/moodle
Conflicts:
lib/db/services.php
version.php
Damyon Wiese [Tue, 7 Apr 2015 09:26:24 +0000 (17:26 +0800)]
Merge branch 'MDL-49101' of https://github.com/andrewhancox/moodle
Conflicts:
lib/db/upgrade.php
version.php
Andrew Hancox [Tue, 17 Mar 2015 09:28:16 +0000 (09:28 +0000)]
MDL-49101 core: Add a global admin setting config->requiremodintro
Removed requiremodintro setting from all core activity plugins and replace
with a single global setting.
Deprecated moodleform_mod::add_intro_editor and replaced with
moodleform_mod::standard_intro_elements
Dan Poltawski [Tue, 7 Apr 2015 09:03:28 +0000 (10:03 +0100)]
Merge branch 'MDL-49501-master' of git://github.com/jleyva/moodle
Conflicts:
lib/db/services.php
version.php
David Monllao [Tue, 7 Apr 2015 08:25:07 +0000 (16:25 +0800)]
Merge branch 'MDL-43558_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Tue, 7 Apr 2015 07:17:38 +0000 (15:17 +0800)]
MDL-49395 core: add more unit tests for get_enrolled_sql
Andrew Nicols [Tue, 7 Apr 2015 07:30:04 +0000 (15:30 +0800)]
Merge branch 'suspended_userids_memory' of git://github.com/tlevi/moodle
Damyon Wiese [Tue, 7 Apr 2015 06:27:20 +0000 (14:27 +0800)]
Merge branch 'MDL-49498-master' of git://github.com/jleyva/moodle
Conflicts:
lib/db/services.php
version.php
David Monllao [Tue, 7 Apr 2015 04:06:22 +0000 (12:06 +0800)]
Merge branch 'MDL-49642' of git://github.com/jmvedrine/moodle
David Monllao [Tue, 7 Apr 2015 03:34:23 +0000 (11:34 +0800)]
Merge branch 'MDL-47773-master-commentui' of git://github.com/mudrd8mz/moodle
David Monllao [Tue, 7 Apr 2015 02:57:23 +0000 (10:57 +0800)]
MDL-43558 theme_base: We don't need edit toggle if modeditingmenu is disabled
David Monllao [Tue, 7 Apr 2015 01:38:48 +0000 (09:38 +0800)]
Merge branch 'MDL-37984-master' of git://github.com/mastnym/moodle
Dan Poltawski [Mon, 6 Apr 2015 13:34:31 +0000 (14:34 +0100)]
MDL-40988 quiz: correct install.xml inconsistency
quizid should not have a default set
Dan Poltawski [Mon, 6 Apr 2015 12:59:30 +0000 (13:59 +0100)]
Merge branch 'MDL-28592-master' of https://github.com/ninelanterns/moodle
Dan Poltawski [Mon, 6 Apr 2015 11:35:01 +0000 (12:35 +0100)]
Merge branch 'mdl38210-master' of https://github.com/tlock/moodle
Dan Poltawski [Mon, 6 Apr 2015 11:07:34 +0000 (12:07 +0100)]
Merge branch 'MDL-40988' of git://github.com/mkassaei/moodle
Dan Poltawski [Mon, 6 Apr 2015 10:09:25 +0000 (11:09 +0100)]
MDL-49684 time: fix unit tests broken by refactoring
Dan Poltawski [Mon, 6 Apr 2015 09:13:06 +0000 (10:13 +0100)]
Merge branch 'wip_MDL-49684_m29_tz2' of https://github.com/skodak/moodle
Conflicts:
version.php
David Monllao [Mon, 6 Apr 2015 02:47:54 +0000 (10:47 +0800)]
MDL-49380 enrol_cohort: Fixing matches
Tiny fix as the group name was not properly
generated when incrementing the captured
generated number. Also adding unit test for
this case.
David Monllao [Mon, 6 Apr 2015 02:16:38 +0000 (10:16 +0800)]
Merge branch 'wip-MDL-49380-master' of git://github.com/abgreeve/moodle
David Monllao [Mon, 6 Apr 2015 01:54:55 +0000 (09:54 +0800)]
Merge branch 'MDL-49313-master' of git://github.com/jleyva/moodle
Petr Skoda [Sat, 28 Mar 2015 05:46:16 +0000 (18:46 +1300)]
MDL-49684 timezones: rewrite timezone support
This patch replaces all homegrown timezone
stuff with standard PHP date/time code.
The main change is the introduction of core_date
class that returns normalised user and server
timezones. From now on nobody should be using
$CFG->timezone or $user->timezone directly!
Other new features and fixes:
* admins are prompted for timezone during install
* editing of other users is finally fixed
* timezones are displayed in user profile
* new $this->setTimezone() in phpunit
* time locale is now automatically reset in phpunit
* timezone is now automatically reset in phpunit
* phpunit has Australia/Perth as default timezone
M Kassaei [Thu, 2 Apr 2015 14:23:04 +0000 (15:23 +0100)]
MDL-40988 quiz: ability to break quizzes into sections
The sections are created on the edit quiz page, and then appear in the
navigation panel when the quiz is being attempted to help students find
their way around.
The 'Shuffle questions' setting has been moved from being per-quiz
to being a per-section.
This commit is actually the joint work of Mahmoud Kassaei and Tim Hunt
from The Open University. We could only use one persons name for the
commit and this time Mahmoud gets the credit/blame.
Jean-Michel Vedrine [Tue, 31 Mar 2015 18:17:38 +0000 (20:17 +0200)]
MDL-49642 mod_lesson: Fix issues found during integration review
Petr Skoda [Sat, 28 Mar 2015 01:20:22 +0000 (14:20 +1300)]
MDL-49684 timezones: add BC unit test first
Brendan Heywood [Thu, 2 Apr 2015 06:41:48 +0000 (17:41 +1100)]
MDL-49740 Lock: Fixed task lock release bugs
Brendan Heywood [Thu, 2 Apr 2015 06:44:45 +0000 (17:44 +1100)]
MDL-49747 Task: Improve coding error expection message
Juan Leyva [Wed, 18 Mar 2015 12:30:12 +0000 (13:30 +0100)]
MDL-49313 webservices: Unit tests for the external function
core_completion_get_course_completion_status
Juan Leyva [Wed, 18 Mar 2015 11:14:29 +0000 (12:14 +0100)]
MDL-49313 webservices: Fixes and add the function to the mobile service
Costantino Cito [Tue, 17 Mar 2015 17:08:23 +0000 (18:08 +0100)]
MDL-49313 webservices: New WS get_course_completion_status
Stephen Bourget [Sat, 28 Mar 2015 01:03:35 +0000 (21:03 -0400)]
MDL-49065 Lesson: Add Behat tests for my home
Stephen Bourget [Thu, 2 Apr 2015 17:17:33 +0000 (13:17 -0400)]
MDL-49065 Lesson: Fix attempt info displayed by course overview block
Costantino Cito [Tue, 31 Mar 2015 14:22:38 +0000 (16:22 +0200)]
MDL-49347 rating: New external function core_rating_get_item_ratings
Juan Leyva [Tue, 31 Mar 2015 10:26:32 +0000 (12:26 +0200)]
MDL-49503 forum: Add view_forum_discussion to the mobile service
Juan Leyva [Tue, 31 Mar 2015 10:25:10 +0000 (12:25 +0200)]
MDL-49503 forum: New external function mod_forum_view_forum_discussion
Juan Leyva [Tue, 31 Mar 2015 10:24:37 +0000 (12:24 +0200)]
MDL-49503 forum: Unit tests for forum_discussion_view
Juan Leyva [Tue, 31 Mar 2015 10:24:02 +0000 (12:24 +0200)]
MDL-49503 forum: Move discussion viewed triggering to API function
Juan Leyva [Mon, 30 Mar 2015 10:06:38 +0000 (12:06 +0200)]
MDL-49498 user: Add core_user_view_user_list to the mobile service
Juan Leyva [Mon, 30 Mar 2015 10:06:01 +0000 (12:06 +0200)]
MDL-49498 user: New external function core_user_view_user_list
Juan Leyva [Mon, 30 Mar 2015 10:05:15 +0000 (12:05 +0200)]
MDL-49498 user: New tests for user_list_view()
Juan Leyva [Mon, 30 Mar 2015 10:04:42 +0000 (12:04 +0200)]
MDL-49498 user: Move user/index event triggering to new API function
New function in user/lib.php: user_list_view
Juan Leyva [Tue, 31 Mar 2015 09:16:26 +0000 (11:16 +0200)]
MDL-49501 messages: Unit tests for mark_message_read
Juan Leyva [Tue, 31 Mar 2015 08:49:16 +0000 (10:49 +0200)]
MDL-49501 messages: Add mark_message_read to the mobile service
Juan Leyva [Tue, 31 Mar 2015 08:48:35 +0000 (10:48 +0200)]
MDL-49501 messages: New external function mark_message_read
Juan Leyva [Mon, 30 Mar 2015 12:12:00 +0000 (14:12 +0200)]
MDL-49499 user: Add core_user_view_user_profile to the mobile service
Juan Leyva [Mon, 30 Mar 2015 12:11:20 +0000 (14:11 +0200)]
MDL-49499 user: New external function core_user_view_user_profile
Juan Leyva [Mon, 30 Mar 2015 12:10:37 +0000 (14:10 +0200)]
MDL-49499 user: Unit tests for profile_view()
Juan Leyva [Mon, 30 Mar 2015 12:10:01 +0000 (14:10 +0200)]
MDL-49499 user: Move events triggering to new API function
New function in profile/lib: profile_viewed()
Juan Leyva [Tue, 31 Mar 2015 11:35:40 +0000 (13:35 +0200)]
MDL-49504 notes: Unit tests for core_notes_view_notes
Juan Leyva [Tue, 31 Mar 2015 11:31:48 +0000 (13:31 +0200)]
MDL-49504 notes: Add core_notes_view_notes to the mobile service
Juan Leyva [Tue, 31 Mar 2015 11:31:11 +0000 (13:31 +0200)]
MDL-49504 notes: New external function core_notes_view_notes
Juan Leyva [Tue, 31 Mar 2015 11:30:30 +0000 (13:30 +0200)]
MDL-49504 notes: Move note view triggering to API function
Juan Leyva [Mon, 30 Mar 2015 08:35:21 +0000 (10:35 +0200)]
MDL-49500 grades: Unit tests for the new external function
gradereport_user_view_grade_report
Juan Leyva [Mon, 30 Mar 2015 08:34:34 +0000 (10:34 +0200)]
MDL-49500 grades: Add the new function to the mobile service
Juan Leyva [Mon, 30 Mar 2015 08:33:54 +0000 (10:33 +0200)]
MDL-49500 grades: External function gradereport_user_view_grade_report
Juan Leyva [Mon, 30 Mar 2015 08:31:29 +0000 (10:31 +0200)]
MDL-49500 grades: Move events triggering (user report) to a new method
Stephen Bourget [Sun, 29 Mar 2015 00:19:36 +0000 (20:19 -0400)]
MDL-49642 mod_lesson: Behat tests for overrides
Jean-Michel Vedrine [Fri, 2 Jan 2015 20:57:31 +0000 (21:57 +0100)]
MDL-49642 mod_lesson: Group/user overrides
Eloy Lafuente (stronk7) [Thu, 2 Apr 2015 11:19:35 +0000 (13:19 +0200)]
Merge branch 'MDL-49203-master' of git://github.com/jleyva/moodle
Juan Leyva [Thu, 2 Apr 2015 10:56:42 +0000 (12:56 +0200)]
MDL-49203 webservices: Fix unit tests for avoid random order issues
This problem usually happens in Postgres where a set of records is
ordered by a timestamp column and there are two or more records with
the same value
Eloy Lafuente (stronk7) [Thu, 2 Apr 2015 09:48:43 +0000 (11:48 +0200)]
weekly release 2.9dev
Eloy Lafuente (stronk7) [Thu, 2 Apr 2015 09:48:43 +0000 (11:48 +0200)]
NOBUG: Fixed file access permissions
Dan Poltawski [Thu, 2 Apr 2015 08:20:36 +0000 (09:20 +0100)]
Merge branch 'MDL-46805-scorm-last-fix' of git://github.com/dmonllao/moodle
David Monllao [Thu, 2 Apr 2015 08:17:56 +0000 (16:17 +0800)]
MDL-46805 mod_scorm: Re-fix as previous object was removed in 2.8
Rajesh Taneja [Thu, 2 Apr 2015 07:27:21 +0000 (15:27 +0800)]
MDL-46805 scorm: Set user_id if scorm|aiccuserid config is set
Ankit Agarwal [Thu, 2 Apr 2015 06:04:11 +0000 (11:34 +0530)]
MDL-49330 webservices: Fix get_course_notes api
Marina Glancy [Thu, 2 Apr 2015 03:05:18 +0000 (11:05 +0800)]
MDL-46960 completion: trigger event after clearing cache
Rajesh Taneja [Thu, 2 Apr 2015 01:05:17 +0000 (09:05 +0800)]
MDL-49513 behat: Updated step name to match new step
Eloy Lafuente (stronk7) [Wed, 1 Apr 2015 22:55:47 +0000 (00:55 +0200)]
MDL-48887 auth: added new hook to upgrade notes.
Brendan Heywood [Tue, 20 Jan 2015 03:25:14 +0000 (14:25 +1100)]
MDL-48887 An auth plugin hook enabling removal of redundant redirects
This introduces a new hook allowing an auth plugin to redirect to an
external login page directly without redundant redirects to the standard
login page first, or where possible to authenticate the user and simply
continue loading the page without any redirects. For some protocols such
as SAML reducing the number of redirects to the bare minimum greatly
speeds up the login process on high latency networks.
Eloy Lafuente (stronk7) [Wed, 1 Apr 2015 11:04:51 +0000 (13:04 +0200)]
Merge branch 'MDL-49330-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Thu, 2 Apr 2015 09:08:11 +0000 (11:08 +0200)]
Merge branch 'MDL-49686-master' of git://github.com/merrill-oakland/moodle
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Andrew Nicols [Wed, 1 Apr 2015 10:35:22 +0000 (18:35 +0800)]
Merge branch 'wip-mdl-49513' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 1 Apr 2015 10:28:24 +0000 (12:28 +0200)]
Merge branch 'MDL-49314-master' of git://github.com/jleyva/moodle
Juan Leyva [Wed, 1 Apr 2015 08:34:37 +0000 (10:34 +0200)]
MDL-49606 webservices: Use correct item null value for files in summary
Juan Leyva [Wed, 1 Apr 2015 08:56:16 +0000 (10:56 +0200)]
MDL-49453 webservices: Validate section number (exists and visibility)
Eloy Lafuente (stronk7) [Thu, 2 Apr 2015 09:06:20 +0000 (11:06 +0200)]
Merge branch 'MDL-49330-master' of git://github.com/jleyva/moodle
Conflicts:
lib/db/services.php
version.php
Eloy Lafuente (stronk7) [Wed, 1 Apr 2015 08:33:57 +0000 (10:33 +0200)]
MDL-49314 webservices: Version bump
Eloy Lafuente (stronk7) [Thu, 2 Apr 2015 09:06:02 +0000 (11:06 +0200)]
Merge branch 'MDL-49314-master' of git://github.com/jleyva/moodle
David Monllao [Wed, 1 Apr 2015 08:13:15 +0000 (16:13 +0800)]
MDL-49481 theme_bootstrapbase: Fix responsive margin-top