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
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
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
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.
Dan Poltawski [Thu, 18 Jun 2015 13:03:02 +0000 (14:03 +0100)]
weekly release 3.0dev
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
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
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
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
Martin Mastny [Thu, 14 May 2015 01:03:30 +0000 (09:03 +0800)]
MDL-49744 JavaScript: Glossary term window is draggable
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
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.
Dan Poltawski [Tue, 16 Jun 2015 07:45:40 +0000 (08:45 +0100)]
Merge branch 'capabilities_cache' of git://github.com/tlevi/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
Andrew Nicols [Tue, 16 Jun 2015 03:32:27 +0000 (11:32 +0800)]
MDL-39353 xmlrpc: Add note to upgrde.txt regarding proxybypass
Andrew Nicols [Tue, 16 Jun 2015 03:28:41 +0000 (11:28 +0800)]
Merge branch 'MDL-39353' of https://github.com/rtcn2/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
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
Andrew Nicols [Tue, 16 Jun 2015 00:25:24 +0000 (08:25 +0800)]
Merge branch 'php7_reserved_words' of git://github.com/tlevi/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
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
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
Marina Glancy [Mon, 15 Jun 2015 09:14:59 +0000 (17:14 +0800)]
MDL-50580 signup: move recaptcha outside of category
AMOS bot [Tue, 16 Jun 2015 16:03:59 +0000 (00:03 +0800)]
Automatically generated installer lang files
AMOS bot [Tue, 16 Jun 2015 16:03:58 +0000 (00:03 +0800)]
Automatically generated installer lang files
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).
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
Dan Poltawski [Mon, 15 Jun 2015 11:14:35 +0000 (12:14 +0100)]
Merge branch 'MDL-49368' of git://github.com/timhunt/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
Dan Poltawski [Mon, 15 Jun 2015 10:06:09 +0000 (11:06 +0100)]
Merge branch 'MDL-50219-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
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
Tony Levi [Mon, 1 Jun 2015 06:02:11 +0000 (15:32 +0930)]
MDL-50453 core: Replace reserved word usage in progress\null (PHP7)
Andrew Nicols [Mon, 15 Jun 2015 02:20:19 +0000 (10:20 +0800)]
Merge branch 'MDL-50438-master' of git://github.com/mastnym/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
Andrew Nicols [Mon, 15 Jun 2015 01:46:29 +0000 (09:46 +0800)]
MDL-50554 themes: Rebuild of bootstrapbase
Andrew Nicols [Mon, 15 Jun 2015 01:08:48 +0000 (09:08 +0800)]
Merge branch 'MDL-50520-master' of git://github.com/jethac/moodle
Mary Evans [Fri, 5 Jun 2015 00:08:57 +0000 (01:08 +0100)]
MDL-50004 theme: Fixes frontpage coursename and enrolment icons.
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.
Juan Leyva [Mon, 8 Jun 2015 12:38:01 +0000 (14:38 +0200)]
MDL-50459 messages: Handle deleted users in external functions
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
Dan Poltawski [Fri, 12 Jun 2015 09:24:37 +0000 (10:24 +0100)]
weekly release 3.0dev
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
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.
David Monllao [Fri, 12 Jun 2015 05:19:04 +0000 (13:19 +0800)]
MDL-48618 grades: Testing calculated items with minmaxtouse
Marina Glancy [Fri, 12 Jun 2015 02:41:36 +0000 (10:41 +0800)]
MDL-50568 navigation: correct cap check
Frederic Massart [Thu, 11 Jun 2015 08:22:01 +0000 (16:22 +0800)]
MDL-48618 grades: Do not run minmax upgrade for fresh installs
Dan Poltawski [Thu, 11 Jun 2015 08:56:07 +0000 (09:56 +0100)]
Merge branch 'wip-mdl-49659' of https://github.com/rajeshtaneja/moodle
David Monllao [Thu, 11 Jun 2015 07:02:06 +0000 (15:02 +0800)]
MDL-48618 upgrade: Matching conditions and upgrade savepoints
David Monllao [Thu, 11 Jun 2015 06:37:31 +0000 (14:37 +0800)]
MDL-48618 grades: Forcing new upgrade savepoint
David Monllao [Thu, 11 Jun 2015 06:20:56 +0000 (14:20 +0800)]
Merge branch 'MDL-48618-master' of git://github.com/FMCorz/moodle
Rajesh Taneja [Thu, 11 Jun 2015 02:21:35 +0000 (10:21 +0800)]
MDL-49659 theme_clean: Add login info in the nav bar
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
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
Juan Leyva [Wed, 10 Jun 2015 08:57:09 +0000 (10:57 +0200)]
MDL-50107 webservices: Enable CORS in login/token.php
Rod Norfor [Wed, 10 Jun 2015 07:17:36 +0000 (08:17 +0100)]
MDL-39353 xmlrpc: Add proxy support
Frederic Massart [Wed, 10 Jun 2015 04:16:16 +0000 (12:16 +0800)]
MDL-48618 grades: Test for the minmax upgrade step
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.
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()
Frederic Massart [Thu, 4 Jun 2015 09:56:37 +0000 (17:56 +0800)]
MDL-48618 grades: Handling of inconsistencies due to min/max grades
Eloy Lafuente (stronk7) [Tue, 9 Jun 2015 23:39:17 +0000 (01:39 +0200)]
Merge branch 'MDL-49882' of git://github.com/jmvedrine/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
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
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
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
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
Eloy Lafuente (stronk7) [Tue, 9 Jun 2015 18:28:36 +0000 (20:28 +0200)]
Merge branch 'MDL-50176' of git://github.com/aolley/moodle
Dan Poltawski [Tue, 9 Jun 2015 13:56:52 +0000 (14:56 +0100)]
Merge branch 'MDL-43731' of https://github.com/ramdesh/moodle
Dan Poltawski [Tue, 9 Jun 2015 13:42:12 +0000 (14:42 +0100)]
Merge branch 'MDL-49659_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Tue, 9 Jun 2015 12:57:10 +0000 (13:57 +0100)]
Merge branch 'MDL-49885_course_overview_block2' of https://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 9 Jun 2015 12:28:16 +0000 (13:28 +0100)]
Merge branch 'MDL-50186-master' of git://github.com/mastnym/moodle
Barry Oosthuizen [Mon, 8 Jun 2015 08:25:44 +0000 (09:25 +0100)]
MDL-49959 course: Fix hidden drag and drop message
Mark Nelson [Fri, 22 May 2015 03:14:55 +0000 (20:14 -0700)]
MDL-50145 mod_lesson: added behat test for multiple dashboard lessons
Jetha Chan [Tue, 9 Jun 2015 07:23:04 +0000 (15:23 +0800)]
MDL-50520 templates: fix helpers not firing inside pix helper
Mark Nelson [Tue, 12 May 2015 23:46:27 +0000 (16:46 -0700)]
MDL-50145 mod_lesson: fixed issue with duplicate values
Rajesh Taneja [Thu, 4 Jun 2015 08:08:34 +0000 (16:08 +0800)]
MDL-50179 lesson: Get student/attempts only when showing overview
Rajesh Taneja [Wed, 13 May 2015 07:13:51 +0000 (15:13 +0800)]
MDL-50179 behat: Use %d for windows compatibility
Eloy Lafuente (stronk7) [Mon, 8 Jun 2015 20:53:06 +0000 (22:53 +0200)]
MDL-48470 strings: Fix unit tests by moving to another string.
Eloy Lafuente (stronk7) [Mon, 8 Jun 2015 17:55:34 +0000 (19:55 +0200)]
Merge branch 'MDL-48470-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Mon, 8 Jun 2015 16:32:45 +0000 (18:32 +0200)]
Merge branch 'MDL-50394_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Mon, 8 Jun 2015 16:21:31 +0000 (18:21 +0200)]
Merge branch 'MDL-50442-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 8 Jun 2015 13:49:06 +0000 (15:49 +0200)]
Merge branch 'MDL-50408_master' of git://github.com/dmonllao/moodle
David Mudrák [Mon, 8 Jun 2015 09:04:04 +0000 (11:04 +0200)]
MDL-50509 datalib: Fix the typo in the variable name
The line is supposed to sanitize the function parameter.
Marina Glancy [Thu, 14 May 2015 01:31:30 +0000 (09:31 +0800)]
MDL-50222 admin: do not use deprecated print_textarea()
David Monllao [Thu, 4 Jun 2015 04:22:38 +0000 (12:22 +0800)]
MDL-50408 tool_log: Extra deprecation tip
Adding a debugging message and returning alternative data to keep backwards
compatibility as get_readers is a widely used function.
Marina Glancy [Mon, 11 May 2015 08:42:46 +0000 (16:42 +0800)]
MDL-28954 cohorts: support files in cohort descriptions
Eloy Lafuente (stronk7) [Mon, 8 Jun 2015 00:33:31 +0000 (02:33 +0200)]
Merge branch 'wip-mdl-50452' of git://github.com/rajeshtaneja/moodle
Andrew Davis [Fri, 29 May 2015 06:38:37 +0000 (14:38 +0800)]
MDL-49885 core_blocks: fixed course_overview block applicable_formats()
Eloy Lafuente (stronk7) [Sun, 7 Jun 2015 19:56:18 +0000 (21:56 +0200)]
Merge branch 'MDL-50456-master' of git://github.com/damyon/moodle
Eric Merrill [Tue, 2 Jun 2015 20:25:06 +0000 (16:25 -0400)]
MDL-48618 gradebook: Only use individual min/max for aggrigate grades
Juan Leyva [Tue, 2 Jun 2015 08:49:26 +0000 (10:49 +0200)]
MDL-50442 ws: Add core_user_get_users_by_field to the mobile service
Mary Evans [Mon, 1 Jun 2015 19:11:14 +0000 (20:11 +0100)]
MDL-49659 theme: Removed home link and limited login info in secure.php
Credits: Thanks go to Andreas Hruska [https://github.com/ahruska] for the original patch for this issue.
Eloy Lafuente (stronk7) [Thu, 4 Jun 2015 10:08:53 +0000 (12:08 +0200)]
weekly release 3.0dev
Eloy Lafuente (stronk7) [Thu, 4 Jun 2015 10:08:45 +0000 (12:08 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Rajesh Taneja [Thu, 4 Jun 2015 03:13:00 +0000 (11:13 +0800)]
MDL-47995 lib: encode title properly, before additing it to image title
jinhofer [Wed, 3 Jun 2015 14:24:38 +0000 (09:24 -0500)]
MDL-50140 grade/import: Fix for misplaced CSH buttons
Eloy Lafuente (stronk7) [Wed, 3 Jun 2015 09:10:41 +0000 (11:10 +0200)]
Merge branch 'MDL-47995-master' of git://github.com/lameze/moodle
yashvardhanpatel07 [Wed, 18 Feb 2015 17:22:31 +0000 (22:52 +0530)]
MDL-49098 feedback: Fix completion message language strings
With contributions from John Okely
Dan Poltawski [Wed, 3 Jun 2015 07:53:19 +0000 (08:53 +0100)]
Merge branch 'MDL-46294-master' of git://github.com/ankitagarwal/moodle
Mark Nelson [Mon, 1 Jun 2015 07:22:33 +0000 (00:22 -0700)]
MDL-50394 core_course: fixed form validation of 'gradepass'
