moodle.git
6 years agoMerge branch 'MDL-49242-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 10 Mar 2015 23:11:56 +0000 (00:11 +0100)]
Merge branch 'MDL-49242-master' of git://github.com/jleyva/moodle

6 years agoMDL-39752 fix whitespace errors
Dan Poltawski [Tue, 10 Mar 2015 14:13:20 +0000 (14:13 +0000)]
MDL-39752 fix whitespace errors

(And some others unrelated to above issue, because its spring and i'm
cleaning).

6 years agoMDL-39752 behat: Return proper behat dir if config set
Rajesh Taneja [Tue, 10 Mar 2015 13:42:11 +0000 (21:42 +0800)]
MDL-39752 behat: Return proper behat dir if config set

6 years agoMDL-48595 upgrade.txt: just add some rationale explaining change
Dan Poltawski [Tue, 10 Mar 2015 10:00:40 +0000 (10:00 +0000)]
MDL-48595 upgrade.txt: just add some rationale explaining change

6 years agoMerge branch 'MDL-48595_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 10 Mar 2015 09:59:28 +0000 (09:59 +0000)]
Merge branch 'MDL-48595_master' of git://github.com/dmonllao/moodle

Conflicts:
version.php

6 years agoMerge branch 'MDL-49256-master' of git://github.com/andrewnicols/moodle
David Monllao [Tue, 10 Mar 2015 09:42:35 +0000 (17:42 +0800)]
Merge branch 'MDL-49256-master' of git://github.com/andrewnicols/moodle

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

6 years agoMerge branch 'wip-mdl-49402' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 10 Mar 2015 08:33:37 +0000 (08:33 +0000)]
Merge branch 'wip-mdl-49402' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-48682_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 10 Mar 2015 08:25:30 +0000 (08:25 +0000)]
Merge branch 'MDL-48682_master' of git://github.com/dmonllao/moodle

6 years agoMerge branch 'MDL-49333-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 10 Mar 2015 08:23:17 +0000 (16:23 +0800)]
Merge branch 'MDL-49333-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'wip-mdl-39752' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 10 Mar 2015 08:08:51 +0000 (08:08 +0000)]
Merge branch 'wip-mdl-39752' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-49316-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 10 Mar 2015 07:50:13 +0000 (15:50 +0800)]
Merge branch 'MDL-49316-master' of git://github.com/jleyva/moodle

Conflicts:
version.php

6 years agoMerge branch 'MDL-49346-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 10 Mar 2015 07:31:51 +0000 (15:31 +0800)]
Merge branch 'MDL-49346-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-49351-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 10 Mar 2015 07:21:13 +0000 (15:21 +0800)]
Merge branch 'MDL-49351-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-49366' of git://github.com/timhunt/moodle
David Monllao [Tue, 10 Mar 2015 06:41:09 +0000 (14:41 +0800)]
Merge branch 'MDL-49366' of git://github.com/timhunt/moodle

6 years agoMerge branch 'MDL-49107-master' of git://github.com/FMCorz/moodle
David Monllao [Tue, 10 Mar 2015 03:42:58 +0000 (11:42 +0800)]
Merge branch 'MDL-49107-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-49332-master' of git://github.com/merrill-oakland/moodle
David Monllao [Tue, 10 Mar 2015 02:42:42 +0000 (10:42 +0800)]
Merge branch 'MDL-49332-master' of git://github.com/merrill-oakland/moodle

6 years agoMerge branch 'MDL-48572' of git://github.com/rlorenzo/moodle
David Monllao [Tue, 10 Mar 2015 02:26:58 +0000 (10:26 +0800)]
Merge branch 'MDL-48572' of git://github.com/rlorenzo/moodle

6 years agoMerge branch 'MDL-46064_master' of git://github.com/markn86/moodle
David Monllao [Tue, 10 Mar 2015 02:23:55 +0000 (10:23 +0800)]
Merge branch 'MDL-46064_master' of git://github.com/markn86/moodle

6 years agoMerge branch 'MDL-39262' of git://github.com/jmvedrine/moodle
David Monllao [Tue, 10 Mar 2015 02:12:44 +0000 (10:12 +0800)]
Merge branch 'MDL-39262' of git://github.com/jmvedrine/moodle

6 years agoMDL-5583 mod_data: Unify mod_data version
David Monllao [Tue, 10 Mar 2015 02:08:32 +0000 (10:08 +0800)]
MDL-5583 mod_data: Unify mod_data version

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

6 years agoMerge branch 'wip-MDL-48437_MASTER' of git://github.com/jason-platts/moodle
David Monllao [Tue, 10 Mar 2015 01:56:21 +0000 (09:56 +0800)]
Merge branch 'wip-MDL-48437_MASTER' of git://github.com/jason-platts/moodle

6 years agoweekly release 2.9dev
Eloy Lafuente (stronk7) [Mon, 9 Mar 2015 15:47:28 +0000 (16:47 +0100)]
weekly release 2.9dev

6 years agoMDL-5583 mod_data: Improve required fields
John Okely [Tue, 17 Feb 2015 05:30:45 +0000 (13:30 +0800)]
MDL-5583 mod_data: Improve required fields

Fix accidental <tr> in some field modify screens
Update mod_data version
Change required asterisk to image
Improve required error message
Fix required icon positions
Remove required code from date field
Add name in labels for fields
Add required field option for multimenu
Remove old required field title text modifier
Add multimenu to behat
Add more comprehensive behat tests
Reload old input when an input error occurs
Behat grammar fixes
Allow location of 0, 0
Use html_writer
Fix existing mod_data behat tests

6 years agoMDL-49418 core: partial revert of MDL-48804
Marina Glancy [Mon, 9 Mar 2015 03:26:18 +0000 (11:26 +0800)]
MDL-49418 core: partial revert of MDL-48804

this is a quick fix for the issue 'Course module with two or more availability restrictions is not accessible'
MDL-49434 is created to deal with the renderer access inside availability check

6 years agoMDL-48595 logstore: Replacing references to deprecated interfaces
David Monllao [Mon, 23 Feb 2015 08:18:51 +0000 (16:18 +0800)]
MDL-48595 logstore: Replacing references to deprecated interfaces

6 years agoMDL-48595 logstore: Adding new interfaces
David Monllao [Mon, 23 Feb 2015 07:56:05 +0000 (15:56 +0800)]
MDL-48595 logstore: Adding new interfaces

sql_reader and sql_internal_table_reader.

6 years agoMDL-48595 log: Replacing current interfaces
David Monllao [Mon, 23 Feb 2015 07:53:41 +0000 (15:53 +0800)]
MDL-48595 log: Replacing current interfaces

Deprecating sql_internal_reader and sql_select_reader in
favour of the new interfaces including get_events_select_iterator.

6 years agoMDL-48595 core_dml: Adding a recordset walker
David Monllao [Mon, 23 Feb 2015 07:09:34 +0000 (15:09 +0800)]
MDL-48595 core_dml: Adding a recordset walker

6 years agoMDL-39752 behat: Updated composer to use step count formatter
Rajesh Taneja [Sun, 8 Mar 2015 23:11:01 +0000 (07:11 +0800)]
MDL-39752 behat: Updated composer to use step count formatter

6 years agoMDL-39752 behat: Added support for behat_wwwroot and behat_dataroot
Rajesh Taneja [Fri, 6 Mar 2015 02:00:37 +0000 (10:00 +0800)]
MDL-39752 behat: Added support for behat_wwwroot and behat_dataroot

6 years agoMDL-39752 behat: for drop option don't have to pass parallel option
Rajesh Taneja [Thu, 5 Mar 2015 04:44:06 +0000 (12:44 +0800)]
MDL-39752 behat: for drop option don't have to pass parallel option

6 years agoMDL-39752 behat: Added information about defines in config-dist
Rajesh Taneja [Thu, 5 Mar 2015 04:09:25 +0000 (12:09 +0800)]
MDL-39752 behat: Added information about defines in config-dist

6 years agoMDL-39752 behat: Show output of failed install process
Rajesh Taneja [Wed, 4 Mar 2015 08:29:03 +0000 (16:29 +0800)]
MDL-39752 behat: Show output of failed install process

6 years agoMDL-39752 behat: Moved parallel run checks from setup to behat/lib.php
Rajesh Taneja [Tue, 3 Mar 2015 04:04:54 +0000 (12:04 +0800)]
MDL-39752 behat: Moved parallel run checks from setup to behat/lib.php

6 years agoMDL-39752 behat: Added Fromrun and torun for running on multiple vms
Rajesh Taneja [Thu, 26 Feb 2015 05:40:29 +0000 (13:40 +0800)]
MDL-39752 behat: Added Fromrun and torun for running on multiple vms

https://circleci.com

6 years agoMDL-39752 behat: Don't package default step count with moodle
Rajesh Taneja [Mon, 23 Feb 2015 08:52:20 +0000 (16:52 +0800)]
MDL-39752 behat: Don't package default step count with moodle

6 years agoMDL-39752 behat: Use symfony2/process
Rajesh Taneja [Tue, 17 Feb 2015 06:19:00 +0000 (14:19 +0800)]
MDL-39752 behat: Use symfony2/process

6 years agoMDL-39752 behat: Modified following for parallel run:
Rajesh Taneja [Tue, 20 Jan 2015 05:56:29 +0000 (13:56 +0800)]
MDL-39752 behat:  Modified following for parallel run:

1. Create behat datadir within behat_dataroot not at same level
2. Define suffix for link and not use hard-coded values
3. Renamed ns_parallel to run.php
4. Rename variables to best understand them
5. Added support for each run to specify db, prefix, rerun and profile.
6. Showing number of steps in each line of parallel run.

6 years agoMDL-39752 behat: Parallel execution support
Tony Levi [Sat, 31 May 2014 08:10:26 +0000 (17:40 +0930)]
MDL-39752 behat: Parallel execution support

6 years agoMDL-39262 mod_lesson: disable shortforms in lesson question display
Jean-Michel Vedrine [Sun, 8 Mar 2015 10:06:53 +0000 (11:06 +0100)]
MDL-39262 mod_lesson: disable shortforms in lesson question display

6 years agoMDL-49316 webservices: Add core_course_get_courses to mobile service
Juan Leyva [Fri, 27 Feb 2015 10:40:43 +0000 (11:40 +0100)]
MDL-49316 webservices: Add core_course_get_courses to mobile service

6 years agoMDL-49333 webservices: Additional unit tests for core_get_site_info
Juan Leyva [Fri, 27 Feb 2015 14:17:21 +0000 (15:17 +0100)]
MDL-49333 webservices: Additional unit tests for core_get_site_info

6 years agoMDL-49333 webservices: Return additional info in core_get_site_info
Juan Leyva [Fri, 27 Feb 2015 14:17:04 +0000 (15:17 +0100)]
MDL-49333 webservices: Return additional info in core_get_site_info

6 years agoMDL-49346 ratings: ratingarea should be a required parameter
Juan Leyva [Mon, 2 Mar 2015 12:27:56 +0000 (13:27 +0100)]
MDL-49346 ratings: ratingarea should be a required parameter

6 years agoMDL-49351 ratings: Correct check of viewallratings permission
Juan Leyva [Mon, 2 Mar 2015 15:52:24 +0000 (16:52 +0100)]
MDL-49351 ratings: Correct check of viewallratings permission

6 years agoMDL-49242 webservices: Units tests for core_course_get_contents
Juan Leyva [Wed, 25 Feb 2015 11:26:51 +0000 (12:26 +0100)]
MDL-49242 webservices: Units tests for core_course_get_contents

6 years agoMDL-49242 webservices: Add filter options in core_course_get_contents
Juan Leyva [Wed, 25 Feb 2015 09:18:11 +0000 (10:18 +0100)]
MDL-49242 webservices: Add filter options in core_course_get_contents

6 years agoMDL-46064 install: prevent install/upgrade with MyISAM
Mark Nelson [Fri, 27 Feb 2015 03:01:37 +0000 (19:01 -0800)]
MDL-46064 install: prevent install/upgrade with MyISAM

6 years agoMDL-49402 behat: Fixed feature file with same scenario name
Rajesh Taneja [Fri, 6 Mar 2015 00:48:51 +0000 (08:48 +0800)]
MDL-49402 behat: Fixed feature file with same scenario name

1. We should not have same scanrio name in 1 feature file
   As it doesn't explain what is being tested. So modified.
2. Removed empty line, to keep it consistnet with other features

6 years agoMDL-49256 atto: Check form existence before resetAutosave
Andrew Nicols [Fri, 6 Mar 2015 03:23:29 +0000 (11:23 +0800)]
MDL-49256 atto: Check form existence before resetAutosave

6 years agoMDL-48682 behat: Changing window size on specific tests
David Monllao [Wed, 4 Mar 2015 02:57:54 +0000 (10:57 +0800)]
MDL-48682 behat: Changing window size on specific tests

6 years agoMDL-49376 behat: Fixing resize step regex
David Monllao [Wed, 4 Mar 2015 03:31:35 +0000 (11:31 +0800)]
MDL-49376 behat: Fixing resize step regex

6 years agoMDL-5583 mod_data: Add required fields
Damyon Wiese [Wed, 11 Jul 2012 05:01:30 +0000 (13:01 +0800)]
MDL-5583 mod_data: Add required fields

This is implemented for most fields but not all. The reason is that there are
some fields for which this does not make sense because no entry is a valid entry.

The supported fields are:
    checkbox
    file
    latlong
    menu
    number
    picture
    radio
    text
    textarea
    url

The unsupported fields are:
    date
    multimenu

6 years agoMDL-5583 behat: Add multiline version of 'And I set the field to'
John Okely [Mon, 23 Feb 2015 06:47:05 +0000 (14:47 +0800)]
MDL-5583 behat: Add multiline version of 'And I set the field to'

6 years agoMDL-48572 gradereport_grader: Average wrong with suspended users
Rex Lorenzo [Tue, 24 Feb 2015 20:50:30 +0000 (12:50 -0800)]
MDL-48572 gradereport_grader: Average wrong with suspended users

6 years agoMDL-49332 gradebook: Raise time limit if we get into regrade
Eric Merrill [Fri, 27 Feb 2015 13:51:14 +0000 (08:51 -0500)]
MDL-49332 gradebook: Raise time limit if we get into regrade

Because all regrading should (and does) start from this point, it
is safe and best to call it just once, from this point.

6 years agoMDL-49366 questions: avoid PHP notices from bad pluginfile URLs
Tim Hunt [Tue, 3 Mar 2015 18:35:21 +0000 (18:35 +0000)]
MDL-49366 questions: avoid PHP notices from bad pluginfile URLs

6 years agoweekly release 2.9dev
Eloy Lafuente (stronk7) [Thu, 5 Mar 2015 10:26:30 +0000 (11:26 +0100)]
weekly release 2.9dev

6 years agoMDL-48962 mod_lesson: New lesson should not be timed
Rajesh Taneja [Thu, 5 Mar 2015 06:55:07 +0000 (14:55 +0800)]
MDL-48962 mod_lesson: New lesson should not be timed

6 years agoMDL-48962 mod_lesson: Fixed behat with new timeout setting and string
Rajesh Taneja [Thu, 5 Mar 2015 05:26:14 +0000 (13:26 +0800)]
MDL-48962 mod_lesson: Fixed behat with new timeout setting and string

6 years agoMerge branch 'MDL-48912' of git://github.com/jmvedrine/moodle
Eloy Lafuente (stronk7) [Wed, 4 Mar 2015 23:24:49 +0000 (00:24 +0100)]
Merge branch 'MDL-48912' of git://github.com/jmvedrine/moodle

6 years agoMDL-48912 mod_lesson: fix problems found during testing
Jean-Michel Vedrine [Wed, 4 Mar 2015 20:50:33 +0000 (21:50 +0100)]
MDL-48912 mod_lesson: fix problems found during testing

6 years agoMDL-48060 messaging: contact list paging bar style fixup
Jetha Chan [Wed, 4 Mar 2015 12:38:12 +0000 (20:38 +0800)]
MDL-48060 messaging: contact list paging bar style fixup

6 years agoMerge branch 'MDL-49379_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Wed, 4 Mar 2015 09:46:18 +0000 (10:46 +0100)]
Merge branch 'MDL-49379_master' of git://github.com/markn86/moodle

6 years agoMDL-49379 core_webservice: fixed ability to edit services
Mark Nelson [Wed, 4 Mar 2015 08:27:48 +0000 (00:27 -0800)]
MDL-49379 core_webservice: fixed ability to edit services

6 years agoMDL-49204 core_message: Checking current user
David Monllao [Tue, 3 Mar 2015 04:38:46 +0000 (12:38 +0800)]
MDL-49204 core_message: Checking current user

6 years agoMerge branch 'MDL-49164_old_rego' of https://github.com/andyjdavis/moodle
Andrew Nicols [Wed, 4 Mar 2015 00:57:00 +0000 (08:57 +0800)]
Merge branch 'MDL-49164_old_rego' of https://github.com/andyjdavis/moodle

6 years agoMerge branch 'MDL-49364' of git://github.com/timhunt/moodle
Andrew Nicols [Wed, 4 Mar 2015 00:51:21 +0000 (08:51 +0800)]
Merge branch 'MDL-49364' of git://github.com/timhunt/moodle

6 years agoMDL-49164 admin: removed unused registration config setting
Andrew Davis [Mon, 16 Feb 2015 08:17:03 +0000 (09:17 +0100)]
MDL-49164 admin: removed unused registration config setting

6 years agoMerge branch 'master_MDL-46390' of https://github.com/danmarsden/moodle
Andrew Nicols [Tue, 3 Mar 2015 23:52:55 +0000 (07:52 +0800)]
Merge branch 'master_MDL-46390' of https://github.com/danmarsden/moodle

6 years agoMerge branch 'MDL-48962' of git://github.com/jmvedrine/moodle
Eloy Lafuente (stronk7) [Tue, 3 Mar 2015 22:36:50 +0000 (23:36 +0100)]
Merge branch 'MDL-48962' of git://github.com/jmvedrine/moodle

6 years agoMDL-46390 mod_scorm: Find correct sco to launch when org based sco is selected
Dan Marsden [Fri, 20 Feb 2015 01:37:00 +0000 (14:37 +1300)]
MDL-46390 mod_scorm: Find correct sco to launch when org based sco is selected

Also tidies up some redundant code in scorm_format_toc_for_droplist()

6 years agoMerge branch 'MDL-49214_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Tue, 3 Mar 2015 18:34:49 +0000 (19:34 +0100)]
Merge branch 'MDL-49214_master' of git://github.com/lazydaisy/moodle

6 years agoMerge branch 'MDL-48912' of git://github.com/jmvedrine/moodle
Eloy Lafuente (stronk7) [Tue, 3 Mar 2015 18:30:00 +0000 (19:30 +0100)]
Merge branch 'MDL-48912' of git://github.com/jmvedrine/moodle

6 years agoMerge branch 'MDL-49335' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 3 Mar 2015 14:46:34 +0000 (14:46 +0000)]
Merge branch 'MDL-49335' of git://github.com/timhunt/moodle

6 years agoMerge branch 'MDL-49334' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 3 Mar 2015 13:25:33 +0000 (13:25 +0000)]
Merge branch 'MDL-49334' of git://github.com/timhunt/moodle

6 years agoMerge branch 'MDL-47000-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Tue, 3 Mar 2015 13:21:30 +0000 (13:21 +0000)]
Merge branch 'MDL-47000-master' of git://github.com/merrill-oakland/moodle

6 years agoMerge branch 'MDL-49246-master' of git://github.com/lameze/moodle
Dan Poltawski [Tue, 3 Mar 2015 13:19:36 +0000 (13:19 +0000)]
Merge branch 'MDL-49246-master' of git://github.com/lameze/moodle

6 years agoMDL-49364 quiz statistics: escape output in the response analysis
Tim Hunt [Tue, 3 Mar 2015 13:04:18 +0000 (13:04 +0000)]
MDL-49364 quiz statistics: escape output in the response analysis

6 years agoMDL-48984 mod_lesson: explicitly close some recordsets
Eloy Lafuente (stronk7) [Tue, 3 Mar 2015 11:40:25 +0000 (12:40 +0100)]
MDL-48984 mod_lesson: explicitly close some recordsets

6 years agoMerge branch 'MDL-48984' of git://github.com/jmvedrine/moodle
Eloy Lafuente (stronk7) [Tue, 3 Mar 2015 11:52:20 +0000 (12:52 +0100)]
Merge branch 'MDL-48984' of git://github.com/jmvedrine/moodle

6 years agoMerge branch 'MDL-34006_m29v6' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 3 Mar 2015 11:40:17 +0000 (11:40 +0000)]
Merge branch 'MDL-34006_m29v6' of https://github.com/sbourget/moodle

Conflicts:
mod/lesson/version.php
mod/lesson/db/upgrade.php
mod/lesson/db/install.xml

6 years agoMDL-49335 quiz behat: new test of attempting a quiz
Tim Hunt [Fri, 27 Feb 2015 14:45:17 +0000 (14:45 +0000)]
MDL-49335 quiz behat: new test of attempting a quiz

This separates out attempting the quiz into a separate .feature, away
from the monolithic add_quiz.feature. At some point we should clean that
up, but for now I am just adding this.

Really, the main reason for this test is to verify the two Behat
enhancememnts I just did.

6 years agoMDL-49335 quiz behat: improved step for adding questions to a quiz
Tim Hunt [Fri, 27 Feb 2015 14:44:03 +0000 (14:44 +0000)]
MDL-49335 quiz behat: improved step for adding questions to a quiz

Explicit headings make the script more readable, and pave the way for
new options that are due to be added.

6 years agoMDL-49335 Behat: new question selector
Tim Hunt [Fri, 27 Feb 2015 14:40:44 +0000 (14:40 +0000)]
MDL-49335 Behat: new question selector

So you can say things like
    And I click on "True" "radio" in the "First question" "question"

6 years agoMDL-49334 behat: sort selector lists
Tim Hunt [Fri, 27 Feb 2015 13:58:16 +0000 (13:58 +0000)]
MDL-49334 behat: sort selector lists

6 years agoMerge branch 'MDL-45621_m29v3' of git://github.com/sbourget/moodle
Eloy Lafuente (stronk7) [Tue, 3 Mar 2015 09:54:30 +0000 (10:54 +0100)]
Merge branch 'MDL-45621_m29v3' of git://github.com/sbourget/moodle

6 years agoMerge branch 'MDL-48975_rego_strings2' of https://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 3 Mar 2015 09:12:35 +0000 (09:12 +0000)]
Merge branch 'MDL-48975_rego_strings2' of https://github.com/andyjdavis/moodle

6 years agoMerge branch 'MDL-49160-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Tue, 3 Mar 2015 08:34:31 +0000 (08:34 +0000)]
Merge branch 'MDL-49160-master' of git://github.com/merrill-oakland/moodle

6 years agoMerge branch 'MDL-35995-master' of git://github.com/xow/moodle
Dan Poltawski [Tue, 3 Mar 2015 08:33:02 +0000 (08:33 +0000)]
Merge branch 'MDL-35995-master' of git://github.com/xow/moodle

6 years agoMDL-49285 mod_quiz: Remove unnecessary linebreak
Andrew Nicols [Tue, 3 Mar 2015 08:23:13 +0000 (16:23 +0800)]
MDL-49285 mod_quiz: Remove unnecessary linebreak

6 years agoMerge branch 'MDL-49285-master' of git://github.com/merrill-oakland/moodle
Andrew Nicols [Tue, 3 Mar 2015 08:22:01 +0000 (16:22 +0800)]
Merge branch 'MDL-49285-master' of git://github.com/merrill-oakland/moodle

6 years agoMerge branch 'MDL-38485-master' of git://github.com/ankitagarwal/moodle
Andrew Nicols [Tue, 3 Mar 2015 08:05:03 +0000 (16:05 +0800)]
Merge branch 'MDL-38485-master' of git://github.com/ankitagarwal/moodle

6 years agoMerge branch 'MDL-49075-master' of https://github.com/lucisgit/moodle
Andrew Nicols [Tue, 3 Mar 2015 07:32:13 +0000 (15:32 +0800)]
Merge branch 'MDL-49075-master' of https://github.com/lucisgit/moodle

6 years agoMDL-48984 mod_lesson: some lesson_answers answers should be plain text
Jean-Michel Vedrine [Sun, 8 Feb 2015 11:00:23 +0000 (12:00 +0100)]
MDL-48984 mod_lesson: some lesson_answers answers should be plain text

Branch tables jump descriptions, short answer question answers
and numerical question answers should be plain text, and no editor
should be available here.

6 years agoMerge branch 'MDL-49234_master' of git://github.com/crazyserver/moodle
Andrew Nicols [Tue, 3 Mar 2015 07:12:29 +0000 (15:12 +0800)]
Merge branch 'MDL-49234_master' of git://github.com/crazyserver/moodle

6 years agoMerge branch 'MDL-49247' of git://github.com/timhunt/moodle
Andrew Nicols [Tue, 3 Mar 2015 06:56:39 +0000 (14:56 +0800)]
Merge branch 'MDL-49247' of git://github.com/timhunt/moodle

6 years agoMerge branch 'MDL-49284' of git://github.com/timhunt/moodle
Andrew Nicols [Tue, 3 Mar 2015 05:40:53 +0000 (13:40 +0800)]
Merge branch 'MDL-49284' of git://github.com/timhunt/moodle

6 years agoMDL-49087 mdeploy: now relying on config.php documented
Eloy Lafuente (stronk7) [Tue, 3 Mar 2015 01:38:57 +0000 (02:38 +0100)]
MDL-49087 mdeploy: now relying on config.php documented