Andrew Nicols [Thu, 7 May 2015 02:03:37 +0000 (10:03 +0800)]
Merge branch 'MDL-49802-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Thu, 7 May 2015 01:42:21 +0000 (09:42 +0800)]
Merge branch 'MDL-49783-master' of git://github.com/mastnym/moodle
Martin Mastny [Wed, 22 Apr 2015 05:35:10 +0000 (13:35 +0800)]
MDL-49783 forms: Collapsed form section is opened on error
Dan Poltawski [Wed, 6 May 2015 09:50:35 +0000 (10:50 +0100)]
Merge branch 'MDL-50102' of git://github.com/stronk7/moodle
Frederic Massart [Wed, 6 May 2015 09:43:48 +0000 (17:43 +0800)]
MDL-49802 core_message: Prevent message being sent twice in messenger
David Monllao [Wed, 6 May 2015 07:30:31 +0000 (15:30 +0800)]
Merge branch 'MDL-49870-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 5 May 2015 03:52:14 +0000 (11:52 +0800)]
MDL-49788 navigation: Ensure we only check active enrolments
Damyon Wiese [Mon, 4 May 2015 05:16:52 +0000 (13:16 +0800)]
MDL-49870 tool_templatelibrary: Allow docs in parent template only.
If the mustache comment containing the docs for the template is
not found in the theme overridden template, search the original
core/plugin template for the docs.
Salih Gedik [Sun, 12 Apr 2015 01:35:30 +0000 (04:35 +0300)]
MDL-49789 mod_book: filter book chapter content
Marina Glancy [Wed, 6 May 2015 04:32:07 +0000 (12:32 +0800)]
MDL-49718 externallib: unittest correction
Andrew Nicols [Wed, 6 May 2015 04:25:56 +0000 (12:25 +0800)]
Merge branch 'MDL-49931-master' of git://github.com/ankitagarwal/moodle
Andrew Nicols [Wed, 6 May 2015 03:11:21 +0000 (11:11 +0800)]
Merge branch 'MDL-49985_master' of git://github.com/markn86/moodle
Conflicts:
mod/forum/post.php
Marina Glancy [Fri, 1 May 2015 14:21:43 +0000 (22:21 +0800)]
MDL-50090 user: suspended user can login upon conrimation
Juan Leyva [Mon, 13 Apr 2015 12:38:30 +0000 (14:38 +0200)]
MDL-49718 webservices: Fix forced format and force external text cleaning
Juan Leyva [Tue, 28 Apr 2015 10:30:17 +0000 (12:30 +0200)]
MDL-49994 files: Prevent to browse private files when are disabled
Andrew Nicols [Wed, 6 May 2015 01:13:19 +0000 (09:13 +0800)]
Merge branch 'MDL-50001-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 5 May 2015 16:23:21 +0000 (18:23 +0200)]
MDL-50102 versions: coding style cleanup.
Eloy Lafuente (stronk7) [Tue, 5 May 2015 15:45:06 +0000 (17:45 +0200)]
MDL-50102 versions: main version mini-bump
Eloy Lafuente (stronk7) [Tue, 5 May 2015 14:58:49 +0000 (16:58 +0200)]
MDL-50102 versions: bump all versions and requires near release
version = planned
2015051100 release version
requires= current
2015050500 rc1 version
Note: On purpose, the course format social wrong version (
2015102100)
has been kept unmodified. Looking forward a solution right now.
Marina Glancy [Sun, 3 May 2015 13:57:50 +0000 (21:57 +0800)]
MDL-50099 auth: less verbose account confirmed message
Frederic Massart [Thu, 5 Mar 2015 14:00:24 +0000 (15:00 +0100)]
MDL-49179 setuplib: print_error() uses local URLs exclusively
Frederic Massart [Wed, 4 Mar 2015 15:00:32 +0000 (16:00 +0100)]
MDL-49179 weblib: Secure the direct usage of $_SERVER['HTTP_REFERER']
Frederic Massart [Wed, 4 Mar 2015 11:11:08 +0000 (12:11 +0100)]
MDL-49179 mod_forum, mod_quiz: Prevent misuse of get_referer()
Tim Hunt [Tue, 21 Apr 2015 10:03:26 +0000 (11:03 +0100)]
MDL-49941 quiz: mod/quiz:grade should declare RISK_XSS
Frederic Massart [Thu, 5 Mar 2015 08:30:52 +0000 (09:30 +0100)]
MDL-49401 moodlelib: PARAM_LOCALURL supports loginhttps
Eloy Lafuente (stronk7) [Tue, 5 May 2015 10:29:09 +0000 (12:29 +0200)]
Moodle release 2.9rc1
Eloy Lafuente (stronk7) [Tue, 5 May 2015 09:42:08 +0000 (11:42 +0200)]
Merge branch 'MDL-49845-fix3-master' of git://github.com/gurgus/moodle
Dave Cooper [Tue, 5 May 2015 09:28:28 +0000 (17:28 +0800)]
MDL-49845 core_user: Fix behat failures
Dave Cooper [Tue, 5 May 2015 08:36:30 +0000 (16:36 +0800)]
MDL-49845 lang: Remove userspreferences string
Mark Nelson [Tue, 5 May 2015 05:14:01 +0000 (22:14 -0700)]
MDL-49985 core_enrol: direct user to appropriate URL
Mark Nelson [Mon, 4 May 2015 20:13:19 +0000 (13:13 -0700)]
MDL-49985 core_course: revert commit belonging to MDL-18309
This reverts commit
6601690202764d786a5ee4b7bbd9afb5b91dd0ec.
This commit was adding the 'returnurl' param unnecessarily to the
course links in the navigation block, causing a lot of long URLs
to be created.
Andrew Nicols [Tue, 5 May 2015 07:34:00 +0000 (15:34 +0800)]
Merge branch 'MDL-49983-master-fix-3' of https://github.com/xow/moodle
David Monllao [Tue, 5 May 2015 07:20:47 +0000 (15:20 +0800)]
Merge branch 'wip-MDL-49778-master' of git://github.com/abgreeve/moodle
Adrian Greeve [Mon, 4 May 2015 04:25:58 +0000 (12:25 +0800)]
MDL-49778 lib: Update to upgrade_stale_php_files_present()
John Okely [Tue, 5 May 2015 07:12:59 +0000 (15:12 +0800)]
MDL-49983 admin: Improve user menu grades setting language strings
Ankit Agarwal [Wed, 22 Apr 2015 04:23:35 +0000 (09:53 +0530)]
MDL-49931 preferences: Add cancel button to forms
Damyon Wiese [Tue, 5 May 2015 04:02:21 +0000 (21:02 -0700)]
MDL-50001 grunt: Make grunt work on windows
Unfortunately, this is not perfect yet. It will build the entire
repository every time - which takes a while because it builds all the
yui modules (On linux it correctly only builds whats in the current dir).
Andrew Nicols [Tue, 5 May 2015 03:57:03 +0000 (11:57 +0800)]
Merge branch 'MDL-49983-master-fix-2' of https://github.com/xow/moodle
John Okely [Tue, 5 May 2015 03:35:18 +0000 (11:35 +0800)]
MDL-49983 lang: Remove language strings that were added in 2.9
Andrew Nicols [Tue, 5 May 2015 02:39:47 +0000 (10:39 +0800)]
MDL-48002 inbound: Tidy up language in unit test
David Monllao [Tue, 5 May 2015 02:51:30 +0000 (10:51 +0800)]
Merge branch 'MDL-50055-master' of git://github.com/andrewnicols/moodle
David Monllao [Tue, 5 May 2015 02:37:53 +0000 (10:37 +0800)]
Merge branch 'MDL-49848-master' of git://github.com/xow/moodle
Andrew Nicols [Tue, 5 May 2015 02:28:50 +0000 (10:28 +0800)]
Merge branch 'MDL-49845-fix-master' of git://github.com/gurgus/moodle
John Okely [Wed, 22 Apr 2015 04:07:21 +0000 (12:07 +0800)]
MDL-49848 message: Make messaging interface responsive
Andrew Nicols [Thu, 30 Apr 2015 01:15:54 +0000 (09:15 +0800)]
MDL-50055 enrol: Stop requiring javascript for behat tests
Andrew Nicols [Fri, 1 May 2015 01:18:37 +0000 (09:18 +0800)]
MDL-50055 tests: Add new step to deal with Single Selects
David Monllao [Tue, 5 May 2015 02:21:06 +0000 (10:21 +0800)]
Merge branch 'MDL-48002-master' of git://github.com/ankitagarwal/moodle
Andrew Nicols [Tue, 5 May 2015 02:18:21 +0000 (10:18 +0800)]
Merge branch 'MDL-50084-master' of git://github.com/gurgus/moodle
Dave Cooper [Tue, 5 May 2015 02:01:48 +0000 (10:01 +0800)]
MDL-49845 lang: Fixing incorrect component name for deprecated string
Andrew Nicols [Tue, 5 May 2015 01:55:11 +0000 (09:55 +0800)]
Merge branch 'MDL-50059-master' of git://github.com/damyon/moodle
Damyon Wiese [Mon, 4 May 2015 06:20:30 +0000 (14:20 +0800)]
MDL-50085 output: Remove component and subtype from renderer
They were only added to support templates, and due to refactoring
are not required any more. So we should remove this API change.
Damyon Wiese [Mon, 4 May 2015 06:18:42 +0000 (14:18 +0800)]
MDL-50085 templates: Minor fixes from peer review
* rename get_filename to get_filepath
* phpdocs fixes
* improve formatting of exceptions
* lang string improvement
Damyon Wiese [Fri, 1 May 2015 08:43:21 +0000 (16:43 +0800)]
MDL-50085 Mustache : Strictly define the search paths for templates.
This change moves several repeated sections of code that was searching
for templates and valid template locations to a new class. It adds
unit tests for the new class and verifies subsystem support for templates.
David Monllao [Mon, 4 May 2015 10:16:53 +0000 (18:16 +0800)]
MDL-49983-master lang: Fixing wrong mygrades string location
David Monllao [Mon, 4 May 2015 10:06:26 +0000 (18:06 +0800)]
Merge branch 'MDL-49923-master-fix1' of git://github.com/damyon/moodle
Ankit Agarwal [Mon, 4 May 2015 08:10:36 +0000 (13:40 +0530)]
MDL-48002: inbound: Add outlook fixture
Ankit Agarwal [Mon, 4 May 2015 08:21:19 +0000 (13:51 +0530)]
MDL-48002 inbound: Update regex for token matching
Damyon Wiese [Mon, 4 May 2015 09:02:33 +0000 (17:02 +0800)]
MDL-50059 Output: Remove heading param from full_header
It was only used for a hack in clean to show the logo.
Damyon Wiese [Mon, 4 May 2015 08:57:10 +0000 (16:57 +0800)]
MDL-49923 theme_clean: The core renderer was in the wrong folder
Renderers need to follow autoloading rules or be included from renderer.php.
John Okely [Mon, 4 May 2015 08:31:16 +0000 (16:31 +0800)]
MDL-49987 Navigation: Put messages before preferences, not mypreferences
Dave Cooper [Mon, 4 May 2015 06:38:16 +0000 (14:38 +0800)]
MDL-50084 pix: Updated pix to use the templatable interface
Ankit Agarwal [Mon, 4 May 2015 07:55:10 +0000 (13:25 +0530)]
MDL-48002: inbound: Add ios fixture
David Monllao [Mon, 4 May 2015 07:16:01 +0000 (15:16 +0800)]
Merge branch 'MDL-49954-master' of git://github.com/jleyva/moodle
Andrew Nicols [Mon, 4 May 2015 07:03:22 +0000 (15:03 +0800)]
Merge branch 'MDL-49845-master' of git://github.com/gurgus/moodle
David Monllao [Mon, 4 May 2015 06:57:18 +0000 (14:57 +0800)]
Merge branch 'wip-MDL-49846-master-fix' of git://github.com/abgreeve/moodle
Andrew Nicols [Mon, 4 May 2015 06:40:09 +0000 (14:40 +0800)]
MDL-49987 upgrade: Correct missing main_savepoint update
David Monllao [Mon, 4 May 2015 06:16:09 +0000 (14:16 +0800)]
Merge branch 'wip-mdl-50042' of git://github.com/rajeshtaneja/moodle
Adrian Greeve [Mon, 4 May 2015 06:05:44 +0000 (14:05 +0800)]
MDL-49846 tool_monitor: Context simplification and clean up.
Removed some unnecessary variables and simplified the context
usage in the index.php page.
Dave Cooper [Wed, 29 Apr 2015 04:11:56 +0000 (12:11 +0800)]
MDL-49845 notes: Changed headers for notes index
Dave Cooper [Wed, 29 Apr 2015 02:05:56 +0000 (10:05 +0800)]
MDL-49845 blog: Changed headers for blog index
Dave Cooper [Tue, 28 Apr 2015 06:02:49 +0000 (14:02 +0800)]
MDL-49845 profile: changed 'My preferences' display logic
Dave Cooper [Thu, 23 Apr 2015 10:39:41 +0000 (18:39 +0800)]
MDL-49845 blog: Fixed navigation logic for blog
Dave Cooper [Wed, 22 Apr 2015 06:05:06 +0000 (14:05 +0800)]
MDL-49845 navigation: Fix breadcrumbs for links in my profile.
Andrew Nicols [Mon, 4 May 2015 05:40:57 +0000 (13:40 +0800)]
Merge branch 'MDL-49987-master' of git://github.com/damyon/moodle
Conflicts:
lib/db/upgrade.php
version.php
Andrew Nicols [Mon, 4 May 2015 04:39:48 +0000 (12:39 +0800)]
Merge branch 'MDL-49983-master' of git://github.com/xow/moodle
John Okely [Wed, 29 Apr 2015 03:29:52 +0000 (11:29 +0800)]
MDL-49983 navigation: Remove 'my' from user context navigation
Andrew Nicols [Mon, 4 May 2015 04:31:20 +0000 (12:31 +0800)]
Merge branch 'wip-MDL-49846-master-v2' of git://github.com/abgreeve/moodle
Adrian Greeve [Thu, 16 Apr 2015 02:04:07 +0000 (10:04 +0800)]
MDL-49846 tool_monitor: Subscription page now filters on site events.
David Monllao [Mon, 4 May 2015 03:14:45 +0000 (11:14 +0800)]
Merge branch 'MDL-49923-master' of git://github.com/FMCorz/moodle
Ankit Agarwal [Thu, 30 Apr 2015 04:03:09 +0000 (09:33 +0530)]
MDL-48002 inbound: Update fixtures to add client info
Ankit Agarwal [Tue, 28 Apr 2015 05:56:07 +0000 (11:26 +0530)]
MDL-48002 inbound: add tests for evolution
Andrew Nicols [Tue, 28 Apr 2015 01:31:10 +0000 (09:31 +0800)]
MDL-48002 inbound Unit tests from fixtures for quoted text
Ankit Agarwal [Mon, 13 Apr 2015 08:08:25 +0000 (13:38 +0530)]
MDL-48002 inbound: Remove quoted text from forum emails
Andrew Nicols [Mon, 4 May 2015 01:07:26 +0000 (09:07 +0800)]
Merge branch 'wip-MDL-50066-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Wed, 29 Apr 2015 08:59:39 +0000 (16:59 +0800)]
MDL-49987 upgrade: Make sure messages is in the user menu
Because we have removed messages from the navigation tree,
it is important that it exists in the user menu. That is the default
behaviour, but if sites previously removed it, we need to make sure it
is inserted back.
Frederic Massart [Wed, 29 Apr 2015 08:14:06 +0000 (16:14 +0800)]
MDL-49923 theme_clean: Removed nested H1 tags due to new full_header()
David Monllao [Fri, 1 May 2015 08:51:51 +0000 (16:51 +0800)]
on-demand release 2.9beta+
David Monllao [Fri, 1 May 2015 07:43:09 +0000 (15:43 +0800)]
MDL-49232 enrol_self: Adapting unit test to new can_self_enrol() output
David Monllao [Fri, 1 May 2015 07:05:42 +0000 (15:05 +0800)]
Merge branch 'MDL-49998' of git://github.com/stronk7/moodle
David Monllao [Fri, 1 May 2015 03:05:59 +0000 (11:05 +0800)]
Merge branch 'MDL-49840-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Fri, 1 May 2015 01:27:11 +0000 (09:27 +0800)]
Merge branch 'MDL-49232_master' of git://github.com/markn86/moodle
Dan Poltawski [Thu, 30 Apr 2015 15:06:58 +0000 (16:06 +0100)]
Merge branch 'MDL-50028' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 30 Apr 2015 08:52:58 +0000 (10:52 +0200)]
MDL-49998 editpdf: Clean code to make it more readable.
There was a big proliferation and reuse of $pdf variable
that was making the code hard to read/review. This commit
does change nothing but makes it more readable.
Also adds a couple of Close() calls, not strictly needed
because they don't have opened files. But think it makes
really clearer the scope of every variable. And, for sure
it frees some resources. That cannot be bad.
Rajesh Taneja [Wed, 29 Apr 2015 02:43:49 +0000 (10:43 +0800)]
MDL-50042 behat: Use double quotes to avoid symfony adding it
Marina Glancy [Thu, 30 Apr 2015 08:14:53 +0000 (16:14 +0800)]
MDL-50066 strings: unable to deprecate string from moodle.php
Andrew Nicols [Thu, 30 Apr 2015 07:39:13 +0000 (15:39 +0800)]
Merge branch 'MDL-49986-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Thu, 30 Apr 2015 07:00:25 +0000 (15:00 +0800)]
Merge branch 'MDL-49583' of https://github.com/NeillM/moodle
Andrew Nicols [Thu, 30 Apr 2015 06:55:48 +0000 (14:55 +0800)]
Merge branch 'MDL-50038-master' of git://github.com/FMCorz/moodle
David Monllao [Thu, 30 Apr 2015 06:53:52 +0000 (14:53 +0800)]
Merge branch 'MDL-49281-master' of git://github.com/mastnym/moodle
David Monllao [Thu, 30 Apr 2015 03:04:09 +0000 (11:04 +0800)]
MDL-49637 mod_assign: Fixing behat test
The participant number is dynamically generated so it is not possible to
match known values.
Match on the submission text instead.