moodle.git
5 years agoMDL-53247 search: add cli indexer script
Dan Poltawski [Thu, 3 Mar 2016 07:32:27 +0000 (15:32 +0800)]
MDL-53247 search: add cli indexer script

5 years agoMDL-53247 search: allow search to be configured before enabled
Dan Poltawski [Thu, 3 Mar 2016 04:28:52 +0000 (12:28 +0800)]
MDL-53247 search: allow search to be configured before enabled

The seach manager no longer checks if search is enabled before providing
an instance. It's up to the callers to do the access control.

5 years agoweekly release 3.1dev
Andrew Nicols [Thu, 25 Feb 2016 05:52:15 +0000 (13:52 +0800)]
weekly release 3.1dev

5 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Thu, 25 Feb 2016 05:52:11 +0000 (13:52 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

5 years agoMerge branch 'MDL-45104-master-fix' of github.com:xow/moodle
Andrew Nicols [Thu, 25 Feb 2016 02:14:06 +0000 (10:14 +0800)]
Merge branch 'MDL-45104-master-fix' of github.com:xow/moodle

5 years agoMDL-45104 logging: Check if legacy log is enabled
John Okely [Thu, 25 Feb 2016 02:00:02 +0000 (10:00 +0800)]
MDL-45104 logging: Check if legacy log is enabled

5 years agoMDL-45104 logging: Fix spelling of writing
John Okely [Thu, 25 Feb 2016 01:59:28 +0000 (09:59 +0800)]
MDL-45104 logging: Fix spelling of writing

5 years agoMerge branch 'wip-mdl-49324' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Thu, 25 Feb 2016 01:53:43 +0000 (09:53 +0800)]
Merge branch 'wip-mdl-49324' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-49324 behat: Use singleselect step to select user
Rajesh Taneja [Thu, 25 Feb 2016 01:49:24 +0000 (09:49 +0800)]
MDL-49324 behat: Use singleselect step to select user

5 years agoAutomatically generated installer lang files
AMOS bot [Wed, 24 Feb 2016 16:11:21 +0000 (00:11 +0800)]
Automatically generated installer lang files

5 years agoMerge branch 'MDL-53071-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Wed, 24 Feb 2016 10:01:15 +0000 (11:01 +0100)]
Merge branch 'MDL-53071-master' of git://github.com/junpataleta/moodle

5 years agoMDL-45104 admin: convert error to warning
Dan Poltawski [Wed, 24 Feb 2016 08:29:41 +0000 (08:29 +0000)]
MDL-45104 admin: convert error to warning

5 years agoMerge branch 'MDL-49324-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 24 Feb 2016 06:55:51 +0000 (07:55 +0100)]
Merge branch 'MDL-49324-master' of git://github.com/andrewnicols/moodle

5 years agoMDL-49324 grade: Ensure report appears in breadcrumbs
Andrew Nicols [Mon, 1 Feb 2016 05:23:41 +0000 (13:23 +0800)]
MDL-49324 grade: Ensure report appears in breadcrumbs

5 years agoMDL-49324 gradereport_singleview: Fix unit tests
Andrew Nicols [Mon, 1 Feb 2016 03:46:43 +0000 (11:46 +0800)]
MDL-49324 gradereport_singleview: Fix unit tests

5 years agoMDL-49324 grades: Remove old variable usage
Andrew Nicols [Fri, 29 Jan 2016 07:03:57 +0000 (15:03 +0800)]
MDL-49324 grades: Remove old variable usage

5 years agoMDL-49324 grades: Remove unnecessary @javascript tag from tests
Andrew Nicols [Fri, 29 Jan 2016 06:19:23 +0000 (14:19 +0800)]
MDL-49324 grades: Remove unnecessary @javascript tag from tests

5 years agoMDL-49324 grade: Ensure weights adjusted message is displayed
Andrew Nicols [Mon, 1 Feb 2016 01:05:05 +0000 (09:05 +0800)]
MDL-49324 grade: Ensure weights adjusted message is displayed

The grade settings page displays a message to inform users that weights
have been adjusted if they did not previously add up to the required 100%.

With the change to sometimes displaying a progress bar, whether the message
is displayed must be calculated immediately after the regrade took place,
and before the page redirects.

I have added a callback with arguments to the regrade_if_required function
which is called immediately after regrade has taken place (regardless of
whether the progress bar is required).

This callback modifies the PAGE URL such that the redirect message will be
displayed after the redirect. This does not use the session as the message
should only be displayed immediately after a change. If the user does not
click on the continue button after the progress bar has been displayed, and
comes back to the page later, this may be confusing.

5 years agoMDL-49324 grades: Remove category aggregation change backend
Andrew Nicols [Fri, 29 Jan 2016 06:03:34 +0000 (14:03 +0800)]
MDL-49324 grades: Remove category aggregation change backend

The UI for this was removed several releases ago and this code is no longer
called.

5 years agoMDL-49324 gradereport_singleview: Correct url params supplied to PAGE
Andrew Nicols [Fri, 29 Jan 2016 06:02:39 +0000 (14:02 +0800)]
MDL-49324 gradereport_singleview: Correct url params supplied to PAGE

5 years agoMDL-49324 grades: Create helper function for regrading on report view
Andrew Nicols [Fri, 29 Jan 2016 06:02:03 +0000 (14:02 +0800)]
MDL-49324 grades: Create helper function for regrading on report view

5 years agoMerge branch 'MDL-31989_admin-performance' of git://github.com/dmonllao/moodle
Andrew Nicols [Wed, 24 Feb 2016 03:05:41 +0000 (11:05 +0800)]
Merge branch 'MDL-31989_admin-performance' of git://github.com/dmonllao/moodle

5 years agoMDL-31989 admin: Search admin settings only when needed
David Monllao [Wed, 24 Feb 2016 02:46:15 +0000 (10:46 +0800)]
MDL-31989 admin: Search admin settings only when needed

5 years agoMerge branch 'wip-mdl-52996' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 24 Feb 2016 02:38:17 +0000 (10:38 +0800)]
Merge branch 'wip-mdl-52996' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-52996 Atto: Only check if plugins are loaded
Rajesh Taneja [Wed, 24 Feb 2016 02:09:15 +0000 (10:09 +0800)]
MDL-52996 Atto: Only check if plugins are loaded

Atto bold using behat with phantomjs doesn't work.
In this case there is no need to test plugin functionality.
Only checking if plugin is loaded in toolbar is sufficient.

5 years agoAutomatically generated installer lang files
AMOS bot [Tue, 23 Feb 2016 16:04:19 +0000 (00:04 +0800)]
Automatically generated installer lang files

5 years agoMerge branch 'MDL-42460-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 23 Feb 2016 14:36:54 +0000 (14:36 +0000)]
Merge branch 'MDL-42460-master' of git://github.com/marinaglancy/moodle

5 years agoMDL-31989 version: proper bump
Dan Poltawski [Tue, 23 Feb 2016 12:11:39 +0000 (12:11 +0000)]
MDL-31989 version: proper bump

5 years agoMDL-31989 version: bump
Dan Poltawski [Tue, 23 Feb 2016 12:10:05 +0000 (12:10 +0000)]
MDL-31989 version: bump

5 years agoMerge branch 'MDL-31989_survey-fix' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 23 Feb 2016 12:07:46 +0000 (12:07 +0000)]
Merge branch 'MDL-31989_survey-fix' of git://github.com/dmonllao/moodle

5 years agoMDL-31989 mod_survey: Prevent templates from being indexed
David Monllao [Tue, 23 Feb 2016 11:58:48 +0000 (19:58 +0800)]
MDL-31989 mod_survey: Prevent templates from being indexed

5 years agoMerge branch 'MDL-33663' of https://github.com/rushi963/moodle
Dan Poltawski [Tue, 23 Feb 2016 11:44:24 +0000 (11:44 +0000)]
Merge branch 'MDL-33663' of https://github.com/rushi963/moodle

5 years agoMerge branch 'wip-MDL-45104-master-v2' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 23 Feb 2016 11:06:05 +0000 (11:06 +0000)]
Merge branch 'wip-MDL-45104-master-v2' of git://github.com/abgreeve/moodle

5 years agoMerge branch 'MDL-52958_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 23 Feb 2016 10:57:38 +0000 (10:57 +0000)]
Merge branch 'MDL-52958_master' of git://github.com/dmonllao/moodle

5 years agoMDL-31989 search: get_config method to search areas
David Monllao [Tue, 23 Feb 2016 02:44:20 +0000 (10:44 +0800)]
MDL-31989 search: get_config method to search areas

Also content_to_text moved to weblib.

5 years agoMDL-31989 component: Allow classes to be retrieved by namespace
David Monllao [Wed, 17 Feb 2016 03:48:06 +0000 (11:48 +0800)]
MDL-31989 component: Allow classes to be retrieved by namespace

5 years agoMDL-31989 search: Search API and search engine API
David Monllao [Fri, 19 Feb 2016 06:46:37 +0000 (14:46 +0800)]
MDL-31989 search: Search API and search engine API

Introducing both APIs in moodle along with:
- search_box widget to add a tiny search box
- admin settings with setup steps helper
- cache for search results
- template for a search result
- php unit stuff

Many thanks to Tomasz Muras, Prateek Sachan and Daniel Neis for their contributions, for starting this development
and for pushing for it to be completed. Also thanks to other contributors: Jonathan Harker and eugeneventer.

5 years agoMDL-31989 search_solr: Solr search engine
David Monllao [Fri, 19 Feb 2016 06:44:41 +0000 (14:44 +0800)]
MDL-31989 search_solr: Solr search engine

5 years agoMDL-31989 search: New search areas
David Monllao [Fri, 19 Feb 2016 06:40:30 +0000 (14:40 +0800)]
MDL-31989 search: New search areas

Some search areas have been introduced as part of the initial search API
and search engine API implementation.
- Forum posts
- Glossary enties
- All moodle activities

5 years agoMDL-31989 block_globalsearch: Adding the block
David Monllao [Fri, 19 Feb 2016 06:36:44 +0000 (14:36 +0800)]
MDL-31989 block_globalsearch: Adding the block

Just a basic block with a search box.

5 years agoMDL-31989 report_search: Adding the report
David Monllao [Fri, 19 Feb 2016 06:36:16 +0000 (14:36 +0800)]
MDL-31989 report_search: Adding the report

5 years agoMDL-31989 theme: Global search styles
David Monllao [Fri, 19 Feb 2016 06:34:43 +0000 (14:34 +0800)]
MDL-31989 theme: Global search styles

5 years agoMDL-31989 task: Global search indexing task
David Monllao [Wed, 27 Jan 2016 09:54:17 +0000 (17:54 +0800)]
MDL-31989 task: Global search indexing task

5 years agoMerge branch 'MDL-50312_master' of https://github.com/jinhofer/moodle
Dan Poltawski [Tue, 23 Feb 2016 08:07:13 +0000 (08:07 +0000)]
Merge branch 'MDL-50312_master' of https://github.com/jinhofer/moodle

5 years agoMerge branch 'MDL-49338' of git://github.com/timhunt/moodle
Andrew Nicols [Tue, 23 Feb 2016 05:32:00 +0000 (13:32 +0800)]
Merge branch 'MDL-49338' of git://github.com/timhunt/moodle

5 years agoMerge branch 'wip-MDL-53129-master' of https://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 23 Feb 2016 05:22:49 +0000 (13:22 +0800)]
Merge branch 'wip-MDL-53129-master' of https://github.com/marinaglancy/moodle

5 years agoMDL-53129 mod_feedback: forms cleanup and behat tests
Marina Glancy [Tue, 16 Feb 2016 07:08:19 +0000 (15:08 +0800)]
MDL-53129 mod_feedback: forms cleanup and behat tests

5 years agoMerge branch 'MDL-52996-master' of https://github.com/sammarshallou/moodle
Andrew Nicols [Tue, 23 Feb 2016 04:44:06 +0000 (12:44 +0800)]
Merge branch 'MDL-52996-master' of https://github.com/sammarshallou/moodle

5 years agoMDL-45104 logging: Deprecate writting to the legacy log store.
Adrian Greeve [Mon, 22 Feb 2016 06:19:12 +0000 (14:19 +0800)]
MDL-45104 logging: Deprecate writting to the legacy log store.

5 years agoMerge branch 'MDL-52371-Activity-Chooser-alignment-of-strings-that-need-line-wrap...
Andrew Nicols [Tue, 23 Feb 2016 03:36:54 +0000 (11:36 +0800)]
Merge branch 'MDL-52371-Activity-Chooser-alignment-of-strings-that-need-line-wrap' of git://github.com/synergylearning/moodle

5 years agoMerge branch 'MDL-53081-master-txtfiles' of git://github.com/mudrd8mz/moodle
Andrew Nicols [Tue, 23 Feb 2016 03:13:45 +0000 (11:13 +0800)]
Merge branch 'MDL-53081-master-txtfiles' of git://github.com/mudrd8mz/moodle

5 years agoMDL-53071 course: Allow blank space input for section name
Jun Pataleta [Thu, 11 Feb 2016 04:57:17 +0000 (12:57 +0800)]
MDL-53071 course: Allow blank space input for section name

5 years agoMerge branch 'MDL-52892' of https://github.com/dg711/moodle
Andrew Nicols [Tue, 23 Feb 2016 01:39:26 +0000 (09:39 +0800)]
Merge branch 'MDL-52892' of https://github.com/dg711/moodle

5 years agoMDL-49324 Grades: Use a progress bar when recalculating gradebook grades
Damyon Wiese [Fri, 27 Feb 2015 08:33:54 +0000 (16:33 +0800)]
MDL-49324 Grades: Use a progress bar when recalculating gradebook grades

5 years agoMDL-49324 Output: The progress bar output is buffered.
Damyon Wiese [Fri, 27 Feb 2015 08:31:56 +0000 (16:31 +0800)]
MDL-49324 Output: The progress bar output is buffered.

Each call to update the progress bar needs to fill the output buffer so that it
gets sent immediately.

5 years agoMerge branch 'MDL-52806' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 22 Feb 2016 22:04:43 +0000 (23:04 +0100)]
Merge branch 'MDL-52806' of git://github.com/timhunt/moodle

5 years agoMerge branch 'MDL-53065' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 22 Feb 2016 22:01:04 +0000 (23:01 +0100)]
Merge branch 'MDL-53065' of git://github.com/timhunt/moodle

5 years agoMDL-42460 mod_feedback: Fix markup validation
Michael Milette [Wed, 23 Jul 2014 05:46:06 +0000 (13:46 +0800)]
MDL-42460 mod_feedback: Fix markup validation

5 years agoMerge branch 'MDL-44093-master-flowplayer' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 22 Feb 2016 09:04:15 +0000 (09:04 +0000)]
Merge branch 'MDL-44093-master-flowplayer' of git://github.com/mudrd8mz/moodle

5 years agoMDL-52371 theme_base: activity chooser - support long names
Davo Smith [Wed, 17 Feb 2016 13:19:57 +0000 (13:19 +0000)]
MDL-52371 theme_base: activity chooser - support long names

5 years agoMDL-52371 theme_bootstrapbase: activity chooser - support long names
Kenny McCormack [Tue, 26 Jan 2016 13:06:47 +0000 (13:06 +0000)]
MDL-52371 theme_bootstrapbase: activity chooser - support long names

5 years agoMerge branch 'wip-mdl-52970' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Mon, 22 Feb 2016 07:20:34 +0000 (15:20 +0800)]
Merge branch 'wip-mdl-52970' of https://github.com/rajeshtaneja/moodle

5 years agoMerge branch 'wip-mdl-50484' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Mon, 22 Feb 2016 04:22:07 +0000 (12:22 +0800)]
Merge branch 'wip-mdl-50484' of https://github.com/rajeshtaneja/moodle

5 years agoMDL-53065 quiz redo question: avoid PHP notice in edge case
Tim Hunt [Wed, 10 Feb 2016 19:22:17 +0000 (19:22 +0000)]
MDL-53065 quiz redo question: avoid PHP notice in edge case

When selecting the variant of the new question, we need to add the
new question to the usage before trying to select a variant.

Also, we need to acutally use the selected variant number!

5 years agoMDL-52806 quiz manual grading: show right answer for auto-graded Qs
Tim Hunt [Sat, 6 Feb 2016 08:31:15 +0000 (08:31 +0000)]
MDL-52806 quiz manual grading: show right answer for auto-graded Qs

5 years agoMDL-49338 quiz stats: preview urls wrong for question variants
Tim Hunt [Sat, 6 Feb 2016 17:31:02 +0000 (17:31 +0000)]
MDL-49338 quiz stats: preview urls wrong for question variants

5 years agoMDL-53081 docs: Improve the text doc files in the root directory
David Mudrák [Thu, 11 Feb 2016 23:05:39 +0000 (00:05 +0100)]
MDL-53081 docs: Improve the text doc files in the root directory

Existing contents of README moved to INSTALL. Added new README,
CONTRIBUTING and PULL_REQUEST_TEMPLATE files. TRADEMARK updated using
the text at https://moodle.com/trademarks/.

5 years agoMDL-52970 behat: Wait for page to be ready after click
Rajesh Taneja [Wed, 3 Feb 2016 07:25:52 +0000 (15:25 +0800)]
MDL-52970 behat: Wait for page to be ready after click

After click enusre to wait so text fields are not
use autosize

5 years agoMDL-52970 behat: Navigation step improvement
Rajesh Taneja [Tue, 2 Feb 2016 02:06:25 +0000 (10:06 +0800)]
MDL-52970 behat: Navigation step improvement

If navigation node to expand is a link then first
click on it and navigate to next page where it is
expanded, and then click on link within. This is
needed as some drivers click on link and don't open
the navigation node which are links

5 years agoMDL-52970 behat: For single select only click event is enough
Rajesh Taneja [Thu, 4 Feb 2016 02:40:23 +0000 (10:40 +0800)]
MDL-52970 behat: For single select only click event is enough

5 years agoMDL-52970 behat: don't set select value if already set
Rajesh Taneja [Tue, 2 Feb 2016 09:12:09 +0000 (17:12 +0800)]
MDL-52970 behat: don't set select value if already set

In FF 44.0, it fails to click on submit button if
select value is set to the original value

5 years agoMDL-50484 core_lib: No need to cache action_icons
Rajesh Taneja [Mon, 8 Feb 2016 05:42:38 +0000 (13:42 +0800)]
MDL-50484 core_lib: No need to cache action_icons

action_icons should not be cached as they
have a unique id and if cache is used then
all icons will have same id.
Other solution is to replace id with some static
but it's not worth a cache for a page, so
removing cache

5 years agoMDL-50484 core_grade: courseheader id should be unique
Rajesh Taneja [Mon, 8 Feb 2016 06:25:00 +0000 (14:25 +0800)]
MDL-50484 core_grade: courseheader id should be unique

grader report show category with courseheader id
which gets replicated for all categories on page.
This will now be courseheader_categoryname.

5 years agoMDL-50484 block_navigation: Set number to be unique
Rajesh Taneja [Mon, 8 Feb 2016 05:04:35 +0000 (13:04 +0800)]
MDL-50484 block_navigation: Set number to be unique

Set number to be unique for unique id's
in navigation

5 years agoMDL-50484 lib_formslib: Persistant input should have different id
Rajesh Taneja [Fri, 5 Feb 2016 05:59:26 +0000 (13:59 +0800)]
MDL-50484 lib_formslib: Persistant input should have different id

Persistant input is appended for frozen elements
and should have different id then the actual element

5 years agoMDL-50484 mod_lesson: Use group to add multiple radio inputs
Rajesh Taneja [Fri, 5 Feb 2016 05:40:37 +0000 (13:40 +0800)]
MDL-50484 mod_lesson: Use group to add multiple radio inputs

https://docs.moodle.org/dev/lib/formslib.php_Form_Definition#radio
Radio input should be added in group and not individual, so
that each element created has unique id and template

5 years agoMDL-52892 message: users' pic overrides others
dg711 [Sun, 14 Feb 2016 10:15:02 +0000 (15:45 +0530)]
MDL-52892 message: users' pic overrides others

While listing the messages , the logged in users' profile pic used to
override over other users' pics .

5 years agoMDL-44093 flowplayer: Provide information about source code location
David Mudrák [Thu, 11 Feb 2016 15:01:50 +0000 (16:01 +0100)]
MDL-44093 flowplayer: Provide information about source code location

Moodle ships with compiled binary code of the flowplayer. This patch
adds information about the source code location according to GNU GPLv3
section 6d and provides the original license for the code from
https://github.com/flowplayer/flash/blob/7c39fbe31ecddc/core/LICENSE.txt

5 years agoweekly release 3.1dev
Dan Poltawski [Thu, 18 Feb 2016 09:14:12 +0000 (09:14 +0000)]
weekly release 3.1dev

5 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 18 Feb 2016 09:14:09 +0000 (09:14 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

5 years agoMerge branch 'wip-mdl-52387' of git://github.com/rajeshtaneja/moodle
David Monllao [Thu, 18 Feb 2016 03:48:14 +0000 (11:48 +0800)]
Merge branch 'wip-mdl-52387' of git://github.com/rajeshtaneja/moodle

5 years agoMDL-52387 auth_ldap: Use proper dn to find password age
Rajesh Taneja [Thu, 18 Feb 2016 03:37:54 +0000 (11:37 +0800)]
MDL-52387 auth_ldap: Use proper dn to find password age

dn with fine grained password should be used
to get msds-maximumpasswordage attribute.
No checks should be used to see if the array
key is set as entry should always return them.

5 years agoMDL-52964 Qtype: Small fixes to behat tests
Eloy Lafuente (stronk7) [Thu, 18 Feb 2016 00:42:22 +0000 (01:42 +0100)]
MDL-52964 Qtype: Small fixes to behat tests

This applies some small changes to proposed behat tests:

- Geting rid of the @javascript tag when it's not needed.
- Adding some missing @_switch_window tags.
- Fixing some scenario names, previously duplicated.
- Fixing some typos and whitespace.

5 years agoMerge branch 'MDL-52964' of https://github.com/mkassaei/moodle
Eloy Lafuente (stronk7) [Wed, 17 Feb 2016 23:58:10 +0000 (00:58 +0100)]
Merge branch 'MDL-52964' of https://github.com/mkassaei/moodle

5 years agoMerge branch 'wip-MDL-51802-fix' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 17 Feb 2016 16:29:07 +0000 (17:29 +0100)]
Merge branch 'wip-MDL-51802-fix' of https://github.com/marinaglancy/moodle

5 years agoMDL-51802 core: change template example
Marina Glancy [Wed, 17 Feb 2016 12:27:37 +0000 (20:27 +0800)]
MDL-51802 core: change template example

5 years agoMerge branch 'MDL-51214-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Wed, 17 Feb 2016 07:58:15 +0000 (07:58 +0000)]
Merge branch 'MDL-51214-master' of git://github.com/andrewnicols/moodle

5 years agoMDL-49807 mod_wiki: section detection regexp fix
Marina Glancy [Wed, 17 Feb 2016 04:29:57 +0000 (12:29 +0800)]
MDL-49807 mod_wiki: section detection regexp fix

5 years agoMerge branch 'MDL-48015-master' of git://github.com/junpataleta/moodle
David Monllao [Wed, 17 Feb 2016 01:49:04 +0000 (09:49 +0800)]
Merge branch 'MDL-48015-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-51852-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 17 Feb 2016 01:03:48 +0000 (02:03 +0100)]
Merge branch 'MDL-51852-master' of git://github.com/andrewnicols/moodle

5 years agoMDL-51852 mod_forum: Respect timed discussions in emails
Andrew Nicols [Wed, 28 Oct 2015 07:01:25 +0000 (15:01 +0800)]
MDL-51852 mod_forum: Respect timed discussions in emails

5 years agoMerge branch 'wip-MDL-51802-master4' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 16 Feb 2016 22:22:35 +0000 (23:22 +0100)]
Merge branch 'wip-MDL-51802-master4' of https://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-29506-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 16 Feb 2016 16:50:22 +0000 (17:50 +0100)]
Merge branch 'MDL-29506-master' of git://github.com/andrewnicols/moodle

5 years agoMerge branch 'MDL-52997-email-threading' of https://github.com/brendanheywood/moodle
Eloy Lafuente (stronk7) [Tue, 16 Feb 2016 16:11:10 +0000 (17:11 +0100)]
Merge branch 'MDL-52997-email-threading' of https://github.com/brendanheywood/moodle

5 years agoAutomatically generated installer lang files
AMOS bot [Tue, 16 Feb 2016 16:05:41 +0000 (00:05 +0800)]
Automatically generated installer lang files

5 years agoMerge branch 'MDL-52814' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 16 Feb 2016 15:48:04 +0000 (16:48 +0100)]
Merge branch 'MDL-52814' of git://github.com/timhunt/moodle

5 years agoMDL-52993 wiki: Add unit tests for wiki_user_can_edit
Dani Palou [Thu, 4 Feb 2016 08:48:58 +0000 (09:48 +0100)]
MDL-52993 wiki: Add unit tests for wiki_user_can_edit

Note: amended on integration to fix some comments.

5 years agoMDL-52993 wiki: Fix wiki_user_can_edit for collab and separate groups
Dani Palou [Tue, 19 Jan 2016 10:24:12 +0000 (11:24 +0100)]
MDL-52993 wiki: Fix wiki_user_can_edit for collab and separate groups

5 years agoMerge branch 'MDL-52862_master' of https://github.com/juancs/moodle
Dan Poltawski [Tue, 16 Feb 2016 15:18:46 +0000 (15:18 +0000)]
Merge branch 'MDL-52862_master' of https://github.com/juancs/moodle

5 years agoMerge branch 'MDL-52990-email-themes' of https://github.com/brendanheywood/moodle
Dan Poltawski [Tue, 16 Feb 2016 11:17:54 +0000 (11:17 +0000)]
Merge branch 'MDL-52990-email-themes' of https://github.com/brendanheywood/moodle