moodle.git
6 years agoMerge branch 'MDL-50533-master' of git://github.com/jethac/moodle
Dan Poltawski [Tue, 23 Jun 2015 13:12:21 +0000 (14:12 +0100)]
Merge branch 'MDL-50533-master' of git://github.com/jethac/moodle

6 years agoMerge branch 'MDL-50283_master' of https://github.com/dmonllao/moodle
Dan Poltawski [Tue, 23 Jun 2015 11:37:05 +0000 (12:37 +0100)]
Merge branch 'MDL-50283_master' of https://github.com/dmonllao/moodle

6 years agoMerge branch 'wip-MDL-49257-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 23 Jun 2015 10:20:08 +0000 (11:20 +0100)]
Merge branch 'wip-MDL-49257-master' of git://github.com/marinaglancy/moodle

6 years agoMDL-49257 grades: behat tests for extra credit
Marina Glancy [Fri, 19 Jun 2015 05:20:04 +0000 (13:20 +0800)]
MDL-49257 grades: behat tests for extra credit

6 years agoMDL-49257 grades: fix bugs with extra credit weights
Marina Glancy [Fri, 19 Jun 2015 05:17:23 +0000 (13:17 +0800)]
MDL-49257 grades: fix bugs with extra credit weights

When we adjust the weights in natural grading (setup screen), the extra credit items
should not depend on other overrides. If extra credit item's weight was overriden, it stays as it is.
Otherwise it is calculated as itemgrademax / totalgrademax (total excludes extra credit items)

6 years agoMDL-49257 grades: introduce calculation freeze
Marina Glancy [Fri, 19 Jun 2015 05:13:51 +0000 (13:13 +0800)]
MDL-49257 grades: introduce calculation freeze

In order to prevent changes in the existing grades when we fix bugs
we are introducing the gradebook code versioning. Each course may
"freeze" the code version to the older date. Freezing is usually done
during upgrade or restore and can be removed by the teacher by pressing
the button and accepting potential grade changes. There is no visible
setting and not possible to change the version back manually.

See MDL-50432 and MDL-50522

6 years agoMerge branch 'MDL-50491' of git://github.com/stronk7/moodle
David Monllao [Tue, 23 Jun 2015 05:31:34 +0000 (13:31 +0800)]
Merge branch 'MDL-50491' of git://github.com/stronk7/moodle

6 years agoMDL-50611 testing: Extra http status code checking
David Monllao [Tue, 23 Jun 2015 02:11:56 +0000 (10:11 +0800)]
MDL-50611 testing: Extra http status code checking

6 years agoMerge branch 'MDL-50611-master' of git://github.com/LukeCarrier/moodle
David Monllao [Tue, 23 Jun 2015 02:25:36 +0000 (10:25 +0800)]
Merge branch 'MDL-50611-master' of git://github.com/LukeCarrier/moodle

6 years agoMerge branch 'MDL-50171-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 22 Jun 2015 23:42:47 +0000 (01:42 +0200)]
Merge branch 'MDL-50171-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-29763_portfolio_description' of git://github.com/davosmith/moodle
Eloy Lafuente (stronk7) [Mon, 22 Jun 2015 23:39:55 +0000 (01:39 +0200)]
Merge branch 'MDL-29763_portfolio_description' of git://github.com/davosmith/moodle

6 years agoMerge branch 'MDL-50089-master' of git://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Mon, 22 Jun 2015 17:58:53 +0000 (19:58 +0200)]
Merge branch 'MDL-50089-master' of git://github.com/merrill-oakland/moodle

6 years agoMDL-50089 grades: Use grade item min/max in exports
Eric Merrill [Tue, 16 Jun 2015 02:37:57 +0000 (22:37 -0400)]
MDL-50089 grades: Use grade item min/max in exports

6 years agoMerge branch 'MDL-50583_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 22 Jun 2015 16:57:35 +0000 (18:57 +0200)]
Merge branch 'MDL-50583_master' of git://github.com/dmonllao/moodle

6 years agoMDL-50611 test: use cURL extension to download Composer
Luke Carrier [Tue, 16 Jun 2015 11:11:18 +0000 (12:11 +0100)]
MDL-50611 test: use cURL extension to download Composer

The curl binary is nowhere near as common in Windows environments as it is
in Linux and Mac ones. In order to encourage more users to adopt Behat and
PHPUnit for their testing, we should avoid introducing unnecessary
hurdles.

6 years agoMerge branch 'MDL-50460_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 22 Jun 2015 12:29:10 +0000 (13:29 +0100)]
Merge branch 'MDL-50460_master' of git://github.com/lazydaisy/moodle

6 years agoMerge branch 'MDL-50091' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 22 Jun 2015 11:06:49 +0000 (12:06 +0100)]
Merge branch 'MDL-50091' of git://github.com/timhunt/moodle

6 years agoMerge branch 'MDL-50622-master-enfix' of git://github.com/mudrd8mz/moodle
David Monllao [Mon, 22 Jun 2015 09:43:56 +0000 (17:43 +0800)]
Merge branch 'MDL-50622-master-enfix' of git://github.com/mudrd8mz/moodle

6 years agoMerge branch 'MDL-50561-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 22 Jun 2015 08:02:57 +0000 (16:02 +0800)]
Merge branch 'MDL-50561-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'wip-MDL-50568-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 22 Jun 2015 07:33:06 +0000 (15:33 +0800)]
Merge branch 'wip-MDL-50568-master' of git://github.com/marinaglancy/moodle

6 years agoMerge branch 'wip-MDL-50580-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 22 Jun 2015 04:48:26 +0000 (12:48 +0800)]
Merge branch 'wip-MDL-50580-master' of git://github.com/marinaglancy/moodle

6 years agoMerge branch 'MDL-50631-master-clilogo' of git://github.com/mudrd8mz/moodle
David Monllao [Mon, 22 Jun 2015 03:19:07 +0000 (11:19 +0800)]
Merge branch 'MDL-50631-master-clilogo' of git://github.com/mudrd8mz/moodle

6 years agoMDL-29763 portfolio: add helpful description to the page
Davo Smith [Fri, 19 Jun 2015 13:54:58 +0000 (14:54 +0100)]
MDL-29763 portfolio: add helpful description to the page

6 years agoMDL-50648 grader report: columns misaligned with some permissions
Tim Hunt [Fri, 19 Jun 2015 11:35:54 +0000 (12:35 +0100)]
MDL-50648 grader report: columns misaligned with some permissions

If a user can see the grader report and singleview report, but not
the user report ($CFG->grade_profilereport) then the colspans
were wrong and so the columns did not line up under the right headers.

6 years agoMDL-50622 lang: Merge English strings from the en_fix language pack
Helen Foster [Fri, 19 Jun 2015 10:11:33 +0000 (12:11 +0200)]
MDL-50622 lang: Merge English strings from the en_fix language pack

6 years agoMDL-50561 messages: Add missing __isset magic method
Juan Leyva [Thu, 11 Jun 2015 15:07:56 +0000 (17:07 +0200)]
MDL-50561 messages: Add missing __isset magic method

6 years agoMDL-50171 data: Fixed incorrect text formatting in external functions
Juan Leyva [Thu, 14 May 2015 14:36:47 +0000 (16:36 +0200)]
MDL-50171 data: Fixed incorrect text formatting in external functions

6 years agoMDL-50283 gradingform_rubric: Minor styling fixes
David Monllao [Fri, 19 Jun 2015 04:44:07 +0000 (12:44 +0800)]
MDL-50283 gradingform_rubric: Minor styling fixes

6 years agoMDL-50283 rubric: Add duplicate row button
Syxton [Tue, 19 May 2015 12:33:48 +0000 (08:33 -0400)]
MDL-50283 rubric: Add duplicate row button

Adds the ability to duplicate a row in a rubric.

6 years agoMDL-50460 theme_bootstrapbase: Profile image overlays docked blocks.
Mary Evans [Thu, 4 Jun 2015 09:48:49 +0000 (10:48 +0100)]
MDL-50460 theme_bootstrapbase: Profile image overlays docked blocks.

6 years agoweekly release 3.0dev
Dan Poltawski [Thu, 18 Jun 2015 13:03:02 +0000 (14:03 +0100)]
weekly release 3.0dev

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 18 Jun 2015 13:03:00 +0000 (14:03 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMerge branch 'MDL-50004-M30' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Thu, 18 Jun 2015 05:25:29 +0000 (07:25 +0200)]
Merge branch 'MDL-50004-M30' of git://github.com/lazydaisy/moodle

6 years agoMerge branch 'MDL-50107-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jun 2015 22:16:18 +0000 (00:16 +0200)]
Merge branch 'MDL-50107-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-49959_course_dnd_message' of https://github.com/barrysspace/moodle
Dan Poltawski [Tue, 16 Jun 2015 12:06:50 +0000 (13:06 +0100)]
Merge branch 'MDL-49959_course_dnd_message' of https://github.com/barrysspace/moodle

6 years agoMDL-49744 JavaScript: Glossary term window is draggable
Martin Mastny [Thu, 14 May 2015 01:03:30 +0000 (09:03 +0800)]
MDL-49744 JavaScript: Glossary term window is draggable

6 years agoMerge branch 'MDL-42192-simpledata-unit-test' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 16 Jun 2015 08:34:11 +0000 (09:34 +0100)]
Merge branch 'MDL-42192-simpledata-unit-test' of git://github.com/dmonllao/moodle

6 years agoMDL-42192 accesslib: tweak get_all_capabilities
Dan Poltawski [Tue, 16 Jun 2015 08:03:28 +0000 (09:03 +0100)]
MDL-42192 accesslib: tweak get_all_capabilities

Tony thinks its bike shed painting, I think its a bit more readable
and memory efficient. I am using integrator dictatorship for sure.

6 years agoMerge branch 'capabilities_cache' of git://github.com/tlevi/moodle
Dan Poltawski [Tue, 16 Jun 2015 07:45:40 +0000 (08:45 +0100)]
Merge branch 'capabilities_cache' of git://github.com/tlevi/moodle

6 years agoMerge branch 'wip-MDL-50216-master' of git://github.com/abgreeve/moodle
Andrew Nicols [Tue, 16 Jun 2015 04:21:51 +0000 (12:21 +0800)]
Merge branch 'wip-MDL-50216-master' of git://github.com/abgreeve/moodle

6 years agoMDL-39353 xmlrpc: Add note to upgrde.txt regarding proxybypass
Andrew Nicols [Tue, 16 Jun 2015 03:32:27 +0000 (11:32 +0800)]
MDL-39353 xmlrpc: Add note to upgrde.txt regarding proxybypass

6 years agoMerge branch 'MDL-39353' of https://github.com/rtcn2/moodle
Andrew Nicols [Tue, 16 Jun 2015 03:28:41 +0000 (11:28 +0800)]
Merge branch 'MDL-39353' of https://github.com/rtcn2/moodle

6 years agoMerge branch 'wip-MDL-49667-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 16 Jun 2015 02:49:40 +0000 (10:49 +0800)]
Merge branch 'wip-MDL-49667-master' of git://github.com/marinaglancy/moodle

6 years agoMerge branch 'MDL-48283-master' of git://github.com/xow/moodle
Eloy Lafuente (stronk7) [Thu, 18 Jun 2015 05:13:10 +0000 (07:13 +0200)]
Merge branch 'MDL-48283-master' of git://github.com/xow/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

6 years agoMerge branch 'php7_reserved_words' of git://github.com/tlevi/moodle
Andrew Nicols [Tue, 16 Jun 2015 00:25:24 +0000 (08:25 +0800)]
Merge branch 'php7_reserved_words' of git://github.com/tlevi/moodle

6 years agoMerge branch 'MDL-50380-master' of git://github.com/lameze/moodle
Andrew Nicols [Mon, 15 Jun 2015 23:56:39 +0000 (07:56 +0800)]
Merge branch 'MDL-50380-master' of git://github.com/lameze/moodle

6 years agoMDL-50491 filters: Some final touches.
Eloy Lafuente (stronk7) [Thu, 18 Jun 2015 01:02:23 +0000 (03:02 +0200)]
MDL-50491 filters: Some final touches.

- Complete the deprecation information to follow the rules.
- Minor tweak to PLAIN tests to have clearer expectations.
- Completely delete get_global_config() from filters, there
  was not much utility keeping it there. Note we have opted
  for direct deletion because it's private API, not public one
  (and searching github/google/docs did not reveal any use
  of those functions either, just in case).

6 years agoMDL-50631 cli: Display the Moodle ASCII logo in the CLI installer header
David Mudrák [Wed, 17 Jun 2015 20:48:14 +0000 (22:48 +0200)]
MDL-50631 cli: Display the Moodle ASCII logo in the CLI installer header

6 years agoMDL-50631 cli: Add a new function to display Moodle ASCII logo
David Mudrák [Wed, 17 Jun 2015 20:32:14 +0000 (22:32 +0200)]
MDL-50631 cli: Add a new function to display Moodle ASCII logo

6 years agoMDL-50491 filters: Eliminate un-resettable static caching.
Tim Hunt [Wed, 17 Jun 2015 11:49:22 +0000 (12:49 +0100)]
MDL-50491 filters: Eliminate un-resettable static caching.

This was breaking unit tests. I think it is no longer necessary since
get_config now has good caching of its own.

6 years agoMDL-50491 filters: option to disable some filters in filter_text.
Tim Hunt [Fri, 5 Jun 2015 14:58:18 +0000 (15:58 +0100)]
MDL-50491 filters: option to disable some filters in filter_text.

This lets you programmatically prevent certain filters running on
certain content.

Also, I created some unit tests for the basic format_text functionality
since there did not seem to be any yet.

6 years agoMDL-50491 admin: new setting class for list of filters.
Tim Hunt [Fri, 5 Jun 2015 15:38:57 +0000 (16:38 +0100)]
MDL-50491 admin: new setting class for list of filters.

6 years agoMDL-50491 filters: deprectate old methods & improve comments
Tim Hunt [Fri, 5 Jun 2015 13:50:59 +0000 (14:50 +0100)]
MDL-50491 filters: deprectate old methods & improve comments

Two methods relating to the old way of doing format_text caching have
been deprecated.

6 years agoMDL-50091 grade singleview: use standard API to build the link
Tim Hunt [Wed, 17 Jun 2015 12:43:41 +0000 (13:43 +0100)]
MDL-50091 grade singleview: use standard API to build the link

Acutally the necessary code was already there. There was just some
unnecessary code that was added with the issue number MDL-47746. I have
just stripped out the unused code, which fixes the bug where a missing
activity caused a fatal error.

6 years agoMDL-50580 signup: move recaptcha outside of category
Marina Glancy [Mon, 15 Jun 2015 09:14:59 +0000 (17:14 +0800)]
MDL-50580 signup: move recaptcha outside of category

6 years agoAutomatically generated installer lang files
AMOS bot [Tue, 16 Jun 2015 16:03:59 +0000 (00:03 +0800)]
Automatically generated installer lang files

6 years agoAutomatically generated installer lang files
AMOS bot [Tue, 16 Jun 2015 16:03:58 +0000 (00:03 +0800)]
Automatically generated installer lang files

6 years agoMDL-50533 theme_bootstrapbase: retarget collapse styles
Jetha Chan [Tue, 16 Jun 2015 08:10:03 +0000 (16:10 +0800)]
MDL-50533 theme_bootstrapbase: retarget collapse styles

6 years agoMDL-49667 navigation: allow items without branches in the settings menu
Marina Glancy [Wed, 25 Mar 2015 23:43:24 +0000 (07:43 +0800)]
MDL-49667 navigation: allow items without branches in the settings menu

also remove the code that adds a "return to XXX user" link that was
supposed to be removed in MDL-23911 , otherwise the link would become
visible after the bug fix (but not functional).

6 years agoMDL-50216 JavaScript: Default visibility of M.core.info set to false
Martin Mastny [Wed, 13 May 2015 08:19:32 +0000 (16:19 +0800)]
MDL-50216 JavaScript: Default visibility of M.core.info set to false

6 years agoMerge branch 'MDL-49368' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 15 Jun 2015 11:14:35 +0000 (12:14 +0100)]
Merge branch 'MDL-49368' of git://github.com/timhunt/moodle

6 years agoMerge branch 'MDL-49098-master' of git://github.com/xow/moodle
Dan Poltawski [Mon, 15 Jun 2015 11:12:07 +0000 (12:12 +0100)]
Merge branch 'MDL-49098-master' of git://github.com/xow/moodle

6 years agoMerge branch 'MDL-50219-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 15 Jun 2015 10:06:09 +0000 (11:06 +0100)]
Merge branch 'MDL-50219-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-50459-master' of git://github.com/jleyva/moodle
Andrew Nicols [Mon, 15 Jun 2015 08:02:53 +0000 (16:02 +0800)]
Merge branch 'MDL-50459-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'wip-MDL-50222-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Mon, 15 Jun 2015 07:16:30 +0000 (15:16 +0800)]
Merge branch 'wip-MDL-50222-master' of git://github.com/marinaglancy/moodle

6 years agoMDL-50453 core: Replace reserved word usage in progress\null (PHP7)
Tony Levi [Mon, 1 Jun 2015 06:02:11 +0000 (15:32 +0930)]
MDL-50453 core: Replace reserved word usage in progress\null (PHP7)

6 years agoMDL-50583 upgrade: Optimize upgrade_minmaxgrade
GeekSmith [Fri, 12 Jun 2015 20:21:50 +0000 (16:21 -0400)]
MDL-50583 upgrade: Optimize upgrade_minmaxgrade

Reverse join order to use existing database keys. Changed query to use the
more easily read NOT IN.

6 years agoMerge branch 'MDL-50438-master' of git://github.com/mastnym/moodle
Andrew Nicols [Mon, 15 Jun 2015 02:20:19 +0000 (10:20 +0800)]
Merge branch 'MDL-50438-master' of git://github.com/mastnym/moodle

6 years agoMerge branch 'MDL-50509-master-vartypo' of git://github.com/mudrd8mz/moodle
Andrew Nicols [Mon, 15 Jun 2015 01:56:49 +0000 (09:56 +0800)]
Merge branch 'MDL-50509-master-vartypo' of git://github.com/mudrd8mz/moodle

6 years agoMDL-50554 themes: Rebuild of bootstrapbase
Andrew Nicols [Mon, 15 Jun 2015 01:46:29 +0000 (09:46 +0800)]
MDL-50554 themes: Rebuild of bootstrapbase

6 years agoMerge branch 'MDL-50520-master' of git://github.com/jethac/moodle
Andrew Nicols [Mon, 15 Jun 2015 01:08:48 +0000 (09:08 +0800)]
Merge branch 'MDL-50520-master' of git://github.com/jethac/moodle

6 years agoMDL-50004 theme: Fixes frontpage coursename and enrolment icons.
Mary Evans [Fri, 5 Jun 2015 00:08:57 +0000 (01:08 +0100)]
MDL-50004 theme: Fixes frontpage coursename and enrolment icons.

6 years agoMDL-50554 themes: Drag a link move mouse makes icons move in Chrome.
Gareth J Barnard [Wed, 10 Jun 2015 17:53:37 +0000 (18:53 +0100)]
MDL-50554 themes: Drag a link move mouse makes icons move in Chrome.

6 years agoMDL-50459 messages: Handle deleted users in external functions
Juan Leyva [Mon, 8 Jun 2015 12:38:01 +0000 (14:38 +0200)]
MDL-50459 messages: Handle deleted users in external functions

6 years agoMDL-50219 users: Include add_user_private_files in the mobile service
Juan Leyva [Thu, 14 May 2015 14:30:32 +0000 (16:30 +0200)]
MDL-50219 users: Include add_user_private_files in the mobile service

6 years agoweekly release 3.0dev
Dan Poltawski [Fri, 12 Jun 2015 09:24:37 +0000 (10:24 +0100)]
weekly release 3.0dev

6 years agoMerge branch 'MDL-48618_master-test-calculated' of git://github.com/dmonllao/moodle
Dan Poltawski [Fri, 12 Jun 2015 09:19:23 +0000 (10:19 +0100)]
Merge branch 'MDL-48618_master-test-calculated' of git://github.com/dmonllao/moodle

6 years agoMDL-50176 repository_youtube: delay loading google service stuff
Eloy Lafuente (stronk7) [Thu, 11 Jun 2015 22:54:46 +0000 (00:54 +0200)]
MDL-50176 repository_youtube: delay loading google service stuff

Loading Google client services is a little monster, eating around
2MB (opcache enabled) of memory. As far as we instantiate the
repository instances really early, no matter they are not used
later (editor, file picker, admin...).. we are delaying the
load of the service until we know we are going to use it.

Surely applying this very same (sort of lazy load) techinque
to other repositories could lead to a nice memory reduction
in lots of pages.

MDL-50176 repository_youtube: also delay the inclusion of client.

While memory was fixed with previous commit, still some extra included
files where being reported, so go crazy and move all the stuff to
the new init delayed method.

6 years agoMDL-48618 grades: Testing calculated items with minmaxtouse
David Monllao [Fri, 12 Jun 2015 05:19:04 +0000 (13:19 +0800)]
MDL-48618 grades: Testing calculated items with minmaxtouse

6 years agoMDL-50568 navigation: correct cap check
Marina Glancy [Fri, 12 Jun 2015 02:41:36 +0000 (10:41 +0800)]
MDL-50568 navigation: correct cap check

6 years agoMDL-48618 grades: Do not run minmax upgrade for fresh installs
Frederic Massart [Thu, 11 Jun 2015 08:22:01 +0000 (16:22 +0800)]
MDL-48618 grades: Do not run minmax upgrade for fresh installs

6 years agoMerge branch 'wip-mdl-49659' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Thu, 11 Jun 2015 08:56:07 +0000 (09:56 +0100)]
Merge branch 'wip-mdl-49659' of https://github.com/rajeshtaneja/moodle

6 years agoMDL-48618 upgrade: Matching conditions and upgrade savepoints
David Monllao [Thu, 11 Jun 2015 07:02:06 +0000 (15:02 +0800)]
MDL-48618 upgrade: Matching conditions and upgrade savepoints

6 years agoMDL-48618 grades: Forcing new upgrade savepoint
David Monllao [Thu, 11 Jun 2015 06:37:31 +0000 (14:37 +0800)]
MDL-48618 grades: Forcing new upgrade savepoint

6 years agoMerge branch 'MDL-48618-master' of git://github.com/FMCorz/moodle
David Monllao [Thu, 11 Jun 2015 06:20:56 +0000 (14:20 +0800)]
Merge branch 'MDL-48618-master' of git://github.com/FMCorz/moodle

6 years agoMDL-49659 theme_clean: Add login info in the nav bar
Rajesh Taneja [Thu, 11 Jun 2015 02:21:35 +0000 (10:21 +0800)]
MDL-49659 theme_clean: Add login info in the nav bar

6 years agoMerge branch 'MDL-50250-master' of git://github.com/lameze/moodle
Eloy Lafuente (stronk7) [Wed, 10 Jun 2015 22:32:11 +0000 (00:32 +0200)]
Merge branch 'MDL-50250-master' of git://github.com/lameze/moodle

6 years agoMDL-50452 behat: 2nd level dep. Update twig/twig to v1.18.2
Eloy Lafuente (stronk7) [Wed, 10 Jun 2015 11:34:58 +0000 (13:34 +0200)]
MDL-50452 behat: 2nd level dep. Update twig/twig to v1.18.2

6 years agoMDL-50107 webservices: Enable CORS in login/token.php
Juan Leyva [Wed, 10 Jun 2015 08:57:09 +0000 (10:57 +0200)]
MDL-50107 webservices: Enable CORS in login/token.php

6 years agoMDL-39353 xmlrpc: Add proxy support
Rod Norfor [Wed, 10 Jun 2015 07:17:36 +0000 (08:17 +0100)]
MDL-39353 xmlrpc: Add proxy support

6 years agoMDL-48618 grades: Test for the minmax upgrade step
Frederic Massart [Wed, 10 Jun 2015 04:16:16 +0000 (12:16 +0800)]
MDL-48618 grades: Test for the minmax upgrade step

6 years agoMDL-48618 grades: Behat tests to cover min/max grade changes
Frederic Massart [Fri, 5 Jun 2015 03:51:23 +0000 (11:51 +0800)]
MDL-48618 grades: Behat tests to cover min/max grade changes

The values provided as part of this test are similar to values
that can be found in 2.7. This is to ensure that users will not
experience changes in grades.

6 years agoMDL-48618 grades: Unit tests for grade_grade::get_min/max_grade()
Frederic Massart [Thu, 4 Jun 2015 09:57:18 +0000 (17:57 +0800)]
MDL-48618 grades: Unit tests for grade_grade::get_min/max_grade()

6 years agoMDL-48618 grades: Handling of inconsistencies due to min/max grades
Frederic Massart [Thu, 4 Jun 2015 09:56:37 +0000 (17:56 +0800)]
MDL-48618 grades: Handling of inconsistencies due to min/max grades

6 years agoMerge branch 'MDL-49882' of git://github.com/jmvedrine/moodle
Eloy Lafuente (stronk7) [Tue, 9 Jun 2015 23:39:17 +0000 (01:39 +0200)]
Merge branch 'MDL-49882' of git://github.com/jmvedrine/moodle

6 years agoMerge branch 'MDL-47480-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Tue, 9 Jun 2015 22:32:10 +0000 (00:32 +0200)]
Merge branch 'MDL-47480-master' of git://github.com/ankitagarwal/moodle

6 years agoMerge branch 'wip-MDL-28954-master' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 9 Jun 2015 22:23:20 +0000 (00:23 +0200)]
Merge branch 'wip-MDL-28954-master' of https://github.com/marinaglancy/moodle

6 years agoMerge branch 'MDL-50145_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 9 Jun 2015 18:40:56 +0000 (20:40 +0200)]
Merge branch 'MDL-50145_master' of git://github.com/markn86/moodle

6 years agoMerge branch 'm30_MDL-50415_Add_PHP_Variables_In_PHPInfo_Admin_Page' of https://githu...
Eloy Lafuente (stronk7) [Tue, 9 Jun 2015 18:35:02 +0000 (20:35 +0200)]
Merge branch 'm30_MDL-50415_Add_PHP_Variables_In_PHPInfo_Admin_Page' of https://github.com/scara/moodle

6 years agoMerge branch 'wip-mdl-50179' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 9 Jun 2015 18:32:10 +0000 (20:32 +0200)]
Merge branch 'wip-mdl-50179' of https://github.com/rajeshtaneja/moodle