moodle.git
7 years agoMerge branch 'MDL-49740-locking-bugs' of https://github.com/brendanheywood/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

7 years agoMerge branch 'MDL-49677' of https://github.com/sleperf/moodle
Dan Poltawski [Tue, 7 Apr 2015 10:28:35 +0000 (11:28 +0100)]
Merge branch 'MDL-49677' of https://github.com/sleperf/moodle

7 years agoMDL-49504 notes: fix trailing whitespace
Dan Poltawski [Tue, 7 Apr 2015 10:17:44 +0000 (11:17 +0100)]
MDL-49504 notes: fix trailing whitespace

7 years agoMerge branch 'MDL-49504-master' of git://github.com/jleyva/moodle
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

7 years agoMerge branch 'MDL-49101' of https://github.com/andrewhancox/moodle
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

7 years agoMDL-49101 core: Add a global admin setting config->requiremodintro
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

7 years agoMerge branch 'MDL-49501-master' of git://github.com/jleyva/moodle
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

7 years agoMerge branch 'MDL-43558_master' of git://github.com/dmonllao/moodle
David Monllao [Tue, 7 Apr 2015 08:25:07 +0000 (16:25 +0800)]
Merge branch 'MDL-43558_master' of git://github.com/dmonllao/moodle

7 years agoMDL-49395 core: add more unit tests for get_enrolled_sql
Andrew Nicols [Tue, 7 Apr 2015 07:17:38 +0000 (15:17 +0800)]
MDL-49395 core: add more unit tests for get_enrolled_sql

7 years agoMerge branch 'suspended_userids_memory' of git://github.com/tlevi/moodle
Andrew Nicols [Tue, 7 Apr 2015 07:30:04 +0000 (15:30 +0800)]
Merge branch 'suspended_userids_memory' of git://github.com/tlevi/moodle

7 years agoMerge branch 'MDL-49498-master' of git://github.com/jleyva/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

7 years agoMerge branch 'MDL-49642' of git://github.com/jmvedrine/moodle
David Monllao [Tue, 7 Apr 2015 04:06:22 +0000 (12:06 +0800)]
Merge branch 'MDL-49642' of git://github.com/jmvedrine/moodle

7 years agoMerge branch 'MDL-47773-master-commentui' of git://github.com/mudrd8mz/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

7 years agoMDL-43558 theme_base: We don't need edit toggle if modeditingmenu is disabled
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

7 years agoMerge branch 'MDL-37984-master' of git://github.com/mastnym/moodle
David Monllao [Tue, 7 Apr 2015 01:38:48 +0000 (09:38 +0800)]
Merge branch 'MDL-37984-master' of git://github.com/mastnym/moodle

7 years agoMDL-40988 quiz: correct install.xml inconsistency
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

7 years agoMerge branch 'MDL-28592-master' of https://github.com/ninelanterns/moodle
Dan Poltawski [Mon, 6 Apr 2015 12:59:30 +0000 (13:59 +0100)]
Merge branch 'MDL-28592-master' of https://github.com/ninelanterns/moodle

7 years agoMerge branch 'mdl38210-master' of https://github.com/tlock/moodle
Dan Poltawski [Mon, 6 Apr 2015 11:35:01 +0000 (12:35 +0100)]
Merge branch 'mdl38210-master' of https://github.com/tlock/moodle

7 years agoMerge branch 'MDL-40988' of git://github.com/mkassaei/moodle
Dan Poltawski [Mon, 6 Apr 2015 11:07:34 +0000 (12:07 +0100)]
Merge branch 'MDL-40988' of git://github.com/mkassaei/moodle

7 years agoMDL-49684 time: fix unit tests broken by refactoring
Dan Poltawski [Mon, 6 Apr 2015 10:09:25 +0000 (11:09 +0100)]
MDL-49684 time: fix unit tests broken by refactoring

7 years agoMerge branch 'wip_MDL-49684_m29_tz2' of https://github.com/skodak/moodle
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

7 years agoMDL-49380 enrol_cohort: Fixing matches
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.

7 years agoMerge branch 'wip-MDL-49380-master' of git://github.com/abgreeve/moodle
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

7 years agoMerge branch 'MDL-49313-master' of git://github.com/jleyva/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

7 years agoMDL-49684 timezones: rewrite timezone support
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

7 years agoMDL-40988 quiz: ability to break quizzes into sections
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.

7 years agoMDL-49642 mod_lesson: Fix issues found during integration review
Jean-Michel Vedrine [Tue, 31 Mar 2015 18:17:38 +0000 (20:17 +0200)]
MDL-49642 mod_lesson: Fix issues found during integration review

7 years agoMDL-49684 timezones: add BC unit test first
Petr Skoda [Sat, 28 Mar 2015 01:20:22 +0000 (14:20 +1300)]
MDL-49684 timezones: add BC unit test first

7 years agoMDL-49740 Lock: Fixed task lock release bugs
Brendan Heywood [Thu, 2 Apr 2015 06:41:48 +0000 (17:41 +1100)]
MDL-49740 Lock: Fixed task lock release bugs

7 years agoMDL-49313 webservices: Unit tests for the external function
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

7 years agoMDL-49313 webservices: Fixes and add the function to the mobile service
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

7 years agoMDL-49313 webservices: New WS get_course_completion_status
Costantino Cito [Tue, 17 Mar 2015 17:08:23 +0000 (18:08 +0100)]
MDL-49313 webservices: New WS get_course_completion_status

7 years agoMDL-49498 user: Add core_user_view_user_list to the mobile service
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

7 years agoMDL-49498 user: New external function core_user_view_user_list
Juan Leyva [Mon, 30 Mar 2015 10:06:01 +0000 (12:06 +0200)]
MDL-49498 user: New external function core_user_view_user_list

7 years agoMDL-49498 user: New tests for user_list_view()
Juan Leyva [Mon, 30 Mar 2015 10:05:15 +0000 (12:05 +0200)]
MDL-49498 user: New tests for user_list_view()

7 years agoMDL-49498 user: Move user/index event triggering to new API function
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

7 years agoMDL-49501 messages: Unit tests for mark_message_read
Juan Leyva [Tue, 31 Mar 2015 09:16:26 +0000 (11:16 +0200)]
MDL-49501 messages: Unit tests for mark_message_read

7 years agoMDL-49501 messages: Add mark_message_read to the mobile service
Juan Leyva [Tue, 31 Mar 2015 08:49:16 +0000 (10:49 +0200)]
MDL-49501 messages: Add mark_message_read to the mobile service

7 years agoMDL-49501 messages: New external function mark_message_read
Juan Leyva [Tue, 31 Mar 2015 08:48:35 +0000 (10:48 +0200)]
MDL-49501 messages: New external function mark_message_read

7 years agoMDL-49504 notes: Unit tests for core_notes_view_notes
Juan Leyva [Tue, 31 Mar 2015 11:35:40 +0000 (13:35 +0200)]
MDL-49504 notes: Unit tests for core_notes_view_notes

7 years agoMDL-49504 notes: Add core_notes_view_notes to the mobile service
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

7 years agoMDL-49504 notes: New external function core_notes_view_notes
Juan Leyva [Tue, 31 Mar 2015 11:31:11 +0000 (13:31 +0200)]
MDL-49504 notes: New external function core_notes_view_notes

7 years agoMDL-49504 notes: Move note view triggering to API function
Juan Leyva [Tue, 31 Mar 2015 11:30:30 +0000 (13:30 +0200)]
MDL-49504 notes: Move note view triggering to API function

7 years agoMDL-49642 mod_lesson: Behat tests for overrides
Stephen Bourget [Sun, 29 Mar 2015 00:19:36 +0000 (20:19 -0400)]
MDL-49642 mod_lesson: Behat tests for overrides

7 years agoMDL-49642 mod_lesson: Group/user overrides
Jean-Michel Vedrine [Fri, 2 Jan 2015 20:57:31 +0000 (21:57 +0100)]
MDL-49642 mod_lesson: Group/user overrides

7 years agoMerge branch 'MDL-49203-master' of git://github.com/jleyva/moodle
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

7 years agoMDL-49203 webservices: Fix unit tests for avoid random order issues
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

7 years agoweekly release 2.9dev
Eloy Lafuente (stronk7) [Thu, 2 Apr 2015 09:48:43 +0000 (11:48 +0200)]
weekly release 2.9dev

7 years agoNOBUG: Fixed file access permissions
Eloy Lafuente (stronk7) [Thu, 2 Apr 2015 09:48:43 +0000 (11:48 +0200)]
NOBUG: Fixed file access permissions

7 years agoMerge branch 'MDL-46805-scorm-last-fix' of git://github.com/dmonllao/moodle
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

7 years agoMDL-46805 mod_scorm: Re-fix as previous object was removed in 2.8
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

7 years agoMDL-46805 scorm: Set user_id if scorm|aiccuserid config is set
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

7 years agoMDL-49330 webservices: Fix get_course_notes api
Ankit Agarwal [Thu, 2 Apr 2015 06:04:11 +0000 (11:34 +0530)]
MDL-49330 webservices: Fix get_course_notes api

7 years agoMDL-46960 completion: trigger event after clearing cache
Marina Glancy [Thu, 2 Apr 2015 03:05:18 +0000 (11:05 +0800)]
MDL-46960 completion: trigger event after clearing cache

7 years agoMDL-49513 behat: Updated step name to match new step
Rajesh Taneja [Thu, 2 Apr 2015 01:05:17 +0000 (09:05 +0800)]
MDL-49513 behat: Updated step name to match new step

7 years agoMDL-48887 auth: added new hook to upgrade notes.
Eloy Lafuente (stronk7) [Wed, 1 Apr 2015 22:55:47 +0000 (00:55 +0200)]
MDL-48887 auth: added new hook to upgrade notes.

7 years agoMDL-48887 An auth plugin hook enabling removal of redundant redirects
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.

7 years agoMerge branch 'MDL-49330-master' of git://github.com/jleyva/moodle
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

7 years agoMerge branch 'MDL-49686-master' of git://github.com/merrill-oakland/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

7 years agoMerge branch 'wip-mdl-49513' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 1 Apr 2015 10:35:22 +0000 (18:35 +0800)]
Merge branch 'wip-mdl-49513' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-49314-master' of git://github.com/jleyva/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

7 years agoMDL-49606 webservices: Use correct item null value for files in summary
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

7 years agoMDL-49453 webservices: Validate section number (exists and visibility)
Juan Leyva [Wed, 1 Apr 2015 08:56:16 +0000 (10:56 +0200)]
MDL-49453 webservices: Validate section number (exists and visibility)

7 years agoMerge branch 'MDL-49330-master' of git://github.com/jleyva/moodle
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

7 years agoMDL-49314 webservices: Version bump
Eloy Lafuente (stronk7) [Wed, 1 Apr 2015 08:33:57 +0000 (10:33 +0200)]
MDL-49314 webservices: Version bump

7 years agoMerge branch 'MDL-49314-master' of git://github.com/jleyva/moodle
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

7 years agoMDL-49481 theme_bootstrapbase: Fix responsive margin-top
David Monllao [Wed, 1 Apr 2015 08:13:15 +0000 (16:13 +0800)]
MDL-49481 theme_bootstrapbase: Fix responsive margin-top

7 years agoRevert "Merge branch 'MDL-37864' of https://github.com/serega1394/moodle"
Dan Poltawski [Wed, 1 Apr 2015 07:34:42 +0000 (08:34 +0100)]
Revert "Merge branch 'MDL-37864' of https://github.com/serega1394/moodle"

This reverts commit 19ffcbe273171ea9e2d3f0974e99de2ea10c2d7e, reversing
changes made to 2112dd44e87092d5b760e7c4f91db3cdd8fb1c35.

7 years agoMerge branch 'MDL-49587' of git://github.com/mike-grant/moodle
David Monllao [Wed, 1 Apr 2015 07:09:52 +0000 (15:09 +0800)]
Merge branch 'MDL-49587' of git://github.com/mike-grant/moodle

7 years agoMerge branch 'MDL-49481' of git://github.com/aolley/moodle
David Monllao [Wed, 1 Apr 2015 05:45:41 +0000 (13:45 +0800)]
Merge branch 'MDL-49481' of git://github.com/aolley/moodle

7 years agoMDL-49534 libraries: Removed pear/HTTP/WebDav
Dave Cooper [Tue, 24 Mar 2015 03:50:13 +0000 (11:50 +0800)]
MDL-49534 libraries: Removed pear/HTTP/WebDav

7 years agoMerge branch 'MDL-49693-master' of git://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Thu, 2 Apr 2015 09:05:32 +0000 (11:05 +0200)]
Merge branch 'MDL-49693-master' of git://github.com/merrill-oakland/moodle

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

7 years agoMDL-49677 enrol_self: allow fullname and email in the welcome message
LE PERF Stephane [Thu, 2 Apr 2015 07:42:20 +0000 (09:42 +0200)]
MDL-49677 enrol_self: allow fullname and email in the welcome message

7 years agoMDL-28592 webservices: Add manual unenrol users to external services
John Phoon [Wed, 28 Jan 2015 05:27:04 +0000 (16:27 +1100)]
MDL-28592 webservices: Add manual unenrol users to external services

7 years agoMDL-49395 accesslib: Make get_suspended_userids more efficient
Tony Levi [Thu, 5 Mar 2015 01:07:21 +0000 (11:37 +1030)]
MDL-49395 accesslib: Make get_suspended_userids more efficient

7 years agoMDL-49380 enrol_cohort: Update to code and introduction of a constant.
Adrian Greeve [Wed, 1 Apr 2015 06:04:11 +0000 (14:04 +0800)]
MDL-49380 enrol_cohort: Update to code and introduction of a constant.

7 years agoMDL-49330 core_notes: Fixed unit tests (broken in postgres)
Juan Leyva [Wed, 1 Apr 2015 11:02:25 +0000 (13:02 +0200)]
MDL-49330 core_notes: Fixed unit tests (broken in postgres)

7 years agoMDL-49314 webservices: Fix unit tests for handling hidden activities
Juan Leyva [Wed, 1 Apr 2015 10:22:08 +0000 (12:22 +0200)]
MDL-49314 webservices: Fix unit tests for handling hidden activities

7 years agoMDL-49330 core_notes: Unit tests for get_course_notes
Costantino Cito [Mon, 23 Mar 2015 14:31:33 +0000 (15:31 +0100)]
MDL-49330 core_notes: Unit tests for get_course_notes

7 years agoMDL-49330 core_notes: New external function core_notes_get_course_notes
Costantino Cito [Fri, 20 Mar 2015 11:56:32 +0000 (12:56 +0100)]
MDL-49330 core_notes: New external function core_notes_get_course_notes

7 years agoMDL-49314 webservices: Check groups using groups_user_groups_visible
Juan Leyva [Fri, 27 Mar 2015 09:09:57 +0000 (10:09 +0100)]
MDL-49314 webservices: Check groups using groups_user_groups_visible

7 years agoMDL-49314 groups: Unit tests for groups_user_groups_visible
Juan Leyva [Fri, 27 Mar 2015 10:09:39 +0000 (11:09 +0100)]
MDL-49314 groups: Unit tests for groups_user_groups_visible

7 years agoMDL-49314 groups: New API function groups_user_groups_visible
Juan Leyva [Fri, 27 Mar 2015 09:11:46 +0000 (10:11 +0100)]
MDL-49314 groups: New API function groups_user_groups_visible

7 years agoMDL-49314 webservices: Unit tests for the new external function
Juan Leyva [Mon, 16 Mar 2015 15:57:17 +0000 (16:57 +0100)]
MDL-49314 webservices: Unit tests for the new external function

7 years agoMDL-49314 webservices: Add the new function to the mobile service
Juan Leyva [Mon, 16 Mar 2015 15:39:23 +0000 (16:39 +0100)]
MDL-49314 webservices: Add the new function to the mobile service

The commit also include some clean-up

7 years agoMDL-49314 webservices: New WS get_activities_completion_status
Costantino Cito [Mon, 9 Mar 2015 14:16:48 +0000 (15:16 +0100)]
MDL-49314 webservices: New WS get_activities_completion_status

7 years agoMDL-49513 behat: Set admin config using php api
Rajesh Taneja [Tue, 24 Mar 2015 07:35:01 +0000 (15:35 +0800)]
MDL-49513 behat: Set admin config using php api

Added a new set to set config using set_config() api
to make steps faster and more efficient

7 years agoMDL-49380 enrol_cohort: Unit tests and formatting update.
Adrian Greeve [Fri, 27 Mar 2015 01:17:23 +0000 (09:17 +0800)]
MDL-49380 enrol_cohort: Unit tests and formatting update.

7 years agoMerge branch 'MDL-49453-master' of git://github.com/jleyva/moodle
David Monllao [Wed, 1 Apr 2015 03:59:33 +0000 (11:59 +0800)]
Merge branch 'MDL-49453-master' of git://github.com/jleyva/moodle

Conflicts:
lib/db/services.php

7 years agoMerge branch 'MDL-49502-master' of git://github.com/jleyva/moodle
David Monllao [Wed, 1 Apr 2015 03:49:31 +0000 (11:49 +0800)]
Merge branch 'MDL-49502-master' of git://github.com/jleyva/moodle

Conflicts:
lib/db/services.php

7 years agoMerge branch 'MDL-49520-master' of git://github.com/gurgus/moodle
David Monllao [Wed, 1 Apr 2015 03:13:28 +0000 (11:13 +0800)]
Merge branch 'MDL-49520-master' of git://github.com/gurgus/moodle

7 years agoMDL-49627 core: Update uses of generate_image_thumbnail
Andrew Nicols [Mon, 23 Mar 2015 01:13:26 +0000 (09:13 +0800)]
MDL-49627 core: Update uses of generate_image_thumbnail

This removes the need to write tempfiles in these locations.

7 years agoMDL-49627 core: Improve thumbnail generation
Andrew Nicols [Mon, 23 Mar 2015 01:12:28 +0000 (09:12 +0800)]
MDL-49627 core: Improve thumbnail generation

We now abstract the actual file generation to a new function.
We are then able to call this function from the other image generation
sources. This allows us to generate thumbnails in a more efficient manner.

* Stored files stay as stored files and are not temporarily re-written to
  disk;
* Strings containing an image remain as a variable and are not temporarily
  written to disk; and
* Arbitrary files are not captured to string.

7 years agoMerge branch 'MDL-23296-master' of git://github.com/FMCorz/moodle
David Monllao [Wed, 1 Apr 2015 02:41:41 +0000 (10:41 +0800)]
Merge branch 'MDL-23296-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-40992' of git://github.com/timhunt/moodle
David Monllao [Wed, 1 Apr 2015 00:00:43 +0000 (08:00 +0800)]
Merge branch 'MDL-40992' of git://github.com/timhunt/moodle

7 years agoMDL-38210 report_participation: implement get view/post actions
Tim Lock [Thu, 3 Apr 2014 03:35:17 +0000 (14:05 +1030)]
MDL-38210 report_participation: implement get view/post actions

7 years agoMerge branch 'wip-mdl-48605' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 31 Mar 2015 19:38:00 +0000 (21:38 +0200)]
Merge branch 'wip-mdl-48605' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-49617-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 31 Mar 2015 19:10:27 +0000 (20:10 +0100)]
Merge branch 'MDL-49617-master' of git://github.com/jleyva/moodle

7 years agoMerge branch 'MDL-49518-master' of git://github.com/gurgus/moodle
Dan Poltawski [Tue, 31 Mar 2015 19:04:54 +0000 (20:04 +0100)]
Merge branch 'MDL-49518-master' of git://github.com/gurgus/moodle

7 years agoMerge branch 'MDL-37864' of https://github.com/serega1394/moodle
Dan Poltawski [Tue, 31 Mar 2015 18:53:46 +0000 (19:53 +0100)]
Merge branch 'MDL-37864' of https://github.com/serega1394/moodle