moodle.git
9 years agoMerge branch 'MDL-38619_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 11:33:16 +0000 (13:33 +0200)]
Merge branch 'MDL-38619_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-26956' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 11:20:23 +0000 (13:20 +0200)]
Merge branch 'MDL-26956' of git://github.com/timhunt/moodle

9 years agoMDL-26956 user selector: fix regressions sam caused.
Tim Hunt [Wed, 3 Apr 2013 10:44:23 +0000 (11:44 +0100)]
MDL-26956 user selector: fix regressions sam caused.

9 years agoMerge branch 'MDL-36804-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 3 Apr 2013 09:32:15 +0000 (17:32 +0800)]
Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle

9 years agoMDL-36804 Assign attempt history: Fix course unit tests
Damyon Wiese [Wed, 3 Apr 2013 09:31:12 +0000 (17:31 +0800)]
MDL-36804 Assign attempt history: Fix course unit tests

Handle missing attemptreopenmethod in add/update instance.

9 years agoMerge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github...
Dan Poltawski [Wed, 3 Apr 2013 09:22:38 +0000 (17:22 +0800)]
Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github.com/scara/moodle

9 years agoMerge branch 'MDL-38657_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Wed, 3 Apr 2013 08:50:43 +0000 (16:50 +0800)]
Merge branch 'MDL-38657_master' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'm25_MDL-38745_SCORM_API_Debugging_trivial_issue' of git://github.com...
Aparup Banerjee [Wed, 3 Apr 2013 08:48:53 +0000 (16:48 +0800)]
Merge branch 'm25_MDL-38745_SCORM_API_Debugging_trivial_issue' of git://github.com/scara/moodle

9 years agoMerge branch 'MDL-36804-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 3 Apr 2013 08:47:15 +0000 (16:47 +0800)]
Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle

9 years agoMDL-36804 Assign attempt history - Add missing index to upgrade step.
Damyon Wiese [Wed, 3 Apr 2013 08:44:31 +0000 (16:44 +0800)]
MDL-36804 Assign attempt history - Add missing index to upgrade step.

9 years agoMerge branch 'MDL-38809' of git://github.com/timhunt/moodle
Aparup Banerjee [Wed, 3 Apr 2013 08:32:42 +0000 (16:32 +0800)]
Merge branch 'MDL-38809' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-38691-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 3 Apr 2013 08:27:16 +0000 (16:27 +0800)]
Merge branch 'MDL-38691-master-int' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-36804-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 3 Apr 2013 08:18:50 +0000 (16:18 +0800)]
Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle

9 years agoMDL-36804: Assign attempt history - add upgrade.txt
Damyon Wiese [Wed, 3 Apr 2013 08:16:21 +0000 (16:16 +0800)]
MDL-36804: Assign attempt history - add upgrade.txt

9 years agoMerge branch 'w13_MDL-38627_m25_byteservingstop' of git://github.com/skodak/moodle
Damyon Wiese [Wed, 3 Apr 2013 07:48:35 +0000 (15:48 +0800)]
Merge branch 'w13_MDL-38627_m25_byteservingstop' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-37602-workshop-overall-feedback' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 3 Apr 2013 07:39:48 +0000 (15:39 +0800)]
Merge branch 'MDL-37602-workshop-overall-feedback' of git://github.com/mudrd8mz/moodle

9 years agoMDL-26644 Course - Remove completion tracking begins on enrolment setting from behat.
Damyon Wiese [Wed, 3 Apr 2013 07:30:49 +0000 (15:30 +0800)]
MDL-26644 Course - Remove completion tracking begins on enrolment setting from behat.

9 years agoMDL-37602 Fix broken workshop unit tests
David Mudrák [Wed, 3 Apr 2013 07:28:11 +0000 (09:28 +0200)]
MDL-37602 Fix broken workshop unit tests

9 years agoMerge branch 'MDL-38610-master-int' of git://github.com/FMCorz/moodle
Damyon Wiese [Wed, 3 Apr 2013 06:48:06 +0000 (14:48 +0800)]
Merge branch 'MDL-38610-master-int' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-38808' of git://github.com/jmvedrine/moodle
Dan Poltawski [Wed, 3 Apr 2013 06:46:58 +0000 (14:46 +0800)]
Merge branch 'MDL-38808' of git://github.com/jmvedrine/moodle

9 years agoMerge branch 'MDL-38705' of git://github.com/jonof/moodle
Damyon Wiese [Wed, 3 Apr 2013 06:35:12 +0000 (14:35 +0800)]
Merge branch 'MDL-38705' of git://github.com/jonof/moodle

9 years agoMDL-26644 Course - Version bump for upgrade script.
Damyon Wiese [Wed, 3 Apr 2013 06:27:26 +0000 (14:27 +0800)]
MDL-26644 Course - Version bump for upgrade script.

9 years agoMerge branch 'MDL-26644-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Wed, 3 Apr 2013 06:32:11 +0000 (14:32 +0800)]
Merge branch 'MDL-26644-master' of git://github.com/FMCorz/moodle

Conflicts:
lib/db/install.xml
lib/db/upgrade.php

9 years agoMerge branch 'MDL-38681-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 3 Apr 2013 06:27:08 +0000 (14:27 +0800)]
Merge branch 'MDL-38681-master-int' of git://github.com/FMCorz/moodle

9 years agoMDL-36804: Assign resubmission history - remove locked/mailed
Damyon Wiese [Wed, 3 Apr 2013 06:17:00 +0000 (14:17 +0800)]
MDL-36804: Assign resubmission history - remove locked/mailed

Remove locked/mailed flags from the grade record in the unit tests.
It just would not have done anything because the columns dont exist.

9 years agoMerge branch 'MDL-34640' of git://github.com/timhunt/moodle
Dan Poltawski [Wed, 3 Apr 2013 05:57:02 +0000 (13:57 +0800)]
Merge branch 'MDL-34640' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-38855_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Wed, 3 Apr 2013 04:44:05 +0000 (12:44 +0800)]
Merge branch 'MDL-38855_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-37602-workshop-overall-feedback' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 3 Apr 2013 04:30:12 +0000 (12:30 +0800)]
Merge branch 'MDL-37602-workshop-overall-feedback' of git://github.com/mudrd8mz/moodle

9 years agoMDL-10516 Question Type - Fix upgrade code so new install matches upgrade.
Damyon Wiese [Wed, 3 Apr 2013 04:21:04 +0000 (12:21 +0800)]
MDL-10516 Question Type - Fix upgrade code so new install matches upgrade.

9 years agoMDL-10516 Question Type - Essay - Whitespace fix
Damyon Wiese [Wed, 3 Apr 2013 03:21:36 +0000 (11:21 +0800)]
MDL-10516 Question Type - Essay - Whitespace fix

9 years agoMDL-10516 Pre-populated answer (template) in essay questions
Jean-Michel Vedrine [Sun, 10 Feb 2013 09:36:22 +0000 (10:36 +0100)]
MDL-10516 Pre-populated answer (template) in essay questions

9 years agoMDL-38509 Version bump for plugins installation
Dan Poltawski [Wed, 3 Apr 2013 03:29:56 +0000 (11:29 +0800)]
MDL-38509 Version bump for plugins installation

9 years agoMerge branch 'MDL-38509-tool-installaddon' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 3 Apr 2013 03:28:49 +0000 (11:28 +0800)]
Merge branch 'MDL-38509-tool-installaddon' of git://github.com/mudrd8mz/moodle

9 years agoMDL-38855 blocks: Fix missing setType calls
David Monllao [Wed, 3 Apr 2013 02:48:32 +0000 (10:48 +0800)]
MDL-38855 blocks: Fix missing setType calls

9 years agoMDL-38016 Theme Bootstrap: Fix for unit tests undefined variable
Damyon Wiese [Wed, 3 Apr 2013 02:58:23 +0000 (10:58 +0800)]
MDL-38016 Theme Bootstrap: Fix for unit tests undefined variable

9 years agoMDL-38016 Theme Bootstrap - Add bootstrap to standard themes list.
Damyon Wiese [Wed, 3 Apr 2013 02:26:12 +0000 (10:26 +0800)]
MDL-38016 Theme Bootstrap - Add bootstrap to standard themes list.

9 years agoMDL-38016 Theme Bootstrap - Whitespace in Moodle .less files
Damyon Wiese [Wed, 3 Apr 2013 02:02:28 +0000 (10:02 +0800)]
MDL-38016 Theme Bootstrap - Whitespace in Moodle .less files

9 years agoMerge branch 'MDL-38735' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 3 Apr 2013 01:59:01 +0000 (09:59 +0800)]
Merge branch 'MDL-38735' of git://github.com/stronk7/moodle

9 years agoMerge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle
Dan Poltawski [Wed, 3 Apr 2013 01:55:21 +0000 (09:55 +0800)]
Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle

9 years agoMDL-38016 Theme Bootstrap - Add license information to lib/thirdpartylibs.xml
Damyon Wiese [Wed, 3 Apr 2013 01:41:33 +0000 (09:41 +0800)]
MDL-38016 Theme Bootstrap - Add license information to lib/thirdpartylibs.xml

Also minor formatting cleanup.

9 years agoMDL-38016 Themes - Add a bootstrap theme to core
Bas Brands [Wed, 3 Apr 2013 00:53:27 +0000 (08:53 +0800)]
MDL-38016 Themes - Add a bootstrap theme to core

This theme has been contributed by:
Bas Brands <bmbrands@gmail.com>
David Scotson <david.scotson@glasgow.ac.uk>
Michael Aherne <michael.aherne@strath.ac.uk>
Stuart Lamour <thisismyrice@gmail.com>

Thanks for your hard work.

9 years agoMerge branch 'MDL-38738-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 01:17:08 +0000 (03:17 +0200)]
Merge branch 'MDL-38738-master' of git://github.com/danpoltawski/moodle

9 years agoMDL-38735 backup: add missing setType() to forms
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 00:17:40 +0000 (02:17 +0200)]
MDL-38735 backup: add missing setType() to forms

9 years agoMDL-38509 Unify curl class usage in the add-on installer tool
David Mudrák [Tue, 2 Apr 2013 21:11:01 +0000 (23:11 +0200)]
MDL-38509 Unify curl class usage in the add-on installer tool

Both classes using cURL features now access it via the core curl wrapper
class. Credit goes to Dan Poltawski for spotting the previous discrepancy
during the integration review.

9 years agoMerge branch 'm25_MDL-38790_Missing_setType_in_My_private_files_form' of https:/...
Eloy Lafuente (stronk7) [Tue, 2 Apr 2013 19:06:21 +0000 (21:06 +0200)]
Merge branch 'm25_MDL-38790_Missing_setType_in_My_private_files_form' of https://github.com/scara/moodle

9 years agoMerge branch 'MDL-38690_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 2 Apr 2013 19:01:52 +0000 (21:01 +0200)]
Merge branch 'MDL-38690_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-38687_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 2 Apr 2013 18:46:05 +0000 (20:46 +0200)]
Merge branch 'MDL-38687_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-38785_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 2 Apr 2013 18:41:00 +0000 (20:41 +0200)]
Merge branch 'MDL-38785_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-38616_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 2 Apr 2013 16:35:41 +0000 (18:35 +0200)]
Merge branch 'MDL-38616_master' of git://github.com/dmonllao/moodle

9 years agoMDL-38538 question autosave: fix missing method.
Tim Hunt [Tue, 2 Apr 2013 15:53:25 +0000 (16:53 +0100)]
MDL-38538 question autosave: fix missing method.

Also change the unit tests to detect this problem.

9 years agoMDL-38509 Fix false unit test failures in the add-on installer
David Mudrák [Tue, 2 Apr 2013 14:58:12 +0000 (16:58 +0200)]
MDL-38509 Fix false unit test failures in the add-on installer

Previously, the testable validator's get_plugintype_location() used to
return path to a directory that itself did not need to be writable. This
was causing false failures. This patch reimplements the testable
validator's get_plugintype_location() method so that it returns a path
inside $CFG->tempdir which is always writable.

Also, to make all test methods consistent, all of them now use the
testable_tool_installaddon_validator class. Before this patch, some test
methods used the testable class and some used the parent class.

9 years agoMDL-38840 Statslib - Fix failing unit tests on ci server (DST change)
Damyon Wiese [Tue, 2 Apr 2013 14:00:56 +0000 (22:00 +0800)]
MDL-38840 Statslib - Fix failing unit tests on ci server (DST change)

9 years agoMerge branch 'MDL-38622_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 2 Apr 2013 13:51:17 +0000 (15:51 +0200)]
Merge branch 'MDL-38622_master' of git://github.com/dmonllao/moodle

9 years agoMDL-38549 behat: New tests
David Monllao [Wed, 20 Mar 2013 09:26:54 +0000 (17:26 +0800)]
MDL-38549 behat: New tests

Group mode activity icons toggle group
mode correctly. According to MDLQA-1603,
MDLQA-1604, MDLQA-1605, MDLQA-1606
and MDLQA-1607

9 years agoMDL-38811 behat: whitespace fixes
Eloy Lafuente (stronk7) [Tue, 2 Apr 2013 13:45:19 +0000 (15:45 +0200)]
MDL-38811 behat: whitespace fixes

9 years agoMDL-38811 behat: New test
David Monllao [Mon, 1 Apr 2013 02:55:08 +0000 (10:55 +0800)]
MDL-38811 behat: New test

According to MDLQA-1564, a teacher can
indent items on the course page

9 years agoMerge branch 'MDL-38548_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 2 Apr 2013 13:25:19 +0000 (15:25 +0200)]
Merge branch 'MDL-38548_master' of git://github.com/dmonllao/moodle

9 years agoMDL-38821 enrol_paypal: fix cost param type
Dan Poltawski [Tue, 2 Apr 2013 12:05:39 +0000 (20:05 +0800)]
MDL-38821 enrol_paypal: fix cost param type

9 years agoMerge branch 'MDL-38821_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 2 Apr 2013 11:54:46 +0000 (19:54 +0800)]
Merge branch 'MDL-38821_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-26956' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 2 Apr 2013 11:49:02 +0000 (19:49 +0800)]
Merge branch 'MDL-26956' of git://github.com/timhunt/moodle

9 years agoMDL-26956 enrol form: add missing setType calls.
Tim Hunt [Tue, 2 Apr 2013 10:57:12 +0000 (11:57 +0100)]
MDL-26956 enrol form: add missing setType calls.

9 years agoMDL-35073 badges: fix xmldb editor diff
Dan Poltawski [Tue, 2 Apr 2013 08:30:42 +0000 (16:30 +0800)]
MDL-35073 badges: fix xmldb editor diff

Tut tut tut!

9 years agoMerge branch 'wip-mdl-38344' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 2 Apr 2013 08:23:44 +0000 (16:23 +0800)]
Merge branch 'wip-mdl-38344' of git://github.com/rajeshtaneja/moodle

Conflicts:
lib/db/upgrade.php
version.php

9 years agoMerge branch 'MDL-38711-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Tue, 2 Apr 2013 08:17:25 +0000 (16:17 +0800)]
Merge branch 'MDL-38711-master' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-38712-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Tue, 2 Apr 2013 08:14:44 +0000 (16:14 +0800)]
Merge branch 'MDL-38712-master' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'master_MDL-38715' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 2 Apr 2013 08:11:01 +0000 (16:11 +0800)]
Merge branch 'master_MDL-38715' of git://github.com/danmarsden/moodle

9 years agoMDL-35073 Badges - Set of minor fixes for issues found during integration
Damyon Wiese [Tue, 2 Apr 2013 07:40:15 +0000 (15:40 +0800)]
MDL-35073 Badges - Set of minor fixes for issues found during integration

9 years agoMDL-35073 badges: Open badges integration
Yuliya Bozhko [Tue, 2 Apr 2013 00:57:39 +0000 (13:57 +1300)]
MDL-35073 badges: Open badges integration

The badges feature allows to integrate Mozilla "Open Badges" to issue, assign,
manage and display digital badges in Moodle. This feature supports:
-- badge creation and issuing based on criteria
-- badge baking and verification service
-- direct pushing of internal badges to external backpack
-- interanl and external badge display in Moodle
-- Moodle block to display latest badges

9 years agoMDL-38821 enrol_self: Fixing setType missing calls
David Monllao [Tue, 2 Apr 2013 07:37:32 +0000 (15:37 +0800)]
MDL-38821 enrol_self: Fixing setType missing calls

9 years agoMDL-38821 enrol_paypal: Fixing setType missing calls
David Monllao [Tue, 2 Apr 2013 07:37:21 +0000 (15:37 +0800)]
MDL-38821 enrol_paypal: Fixing setType missing calls

9 years agoMDL-38821 enrol_manual: Fixing setType missing calls
David Monllao [Tue, 2 Apr 2013 07:37:11 +0000 (15:37 +0800)]
MDL-38821 enrol_manual: Fixing setType missing calls

9 years agoMDL-38821 enrol_cohort: Fixing setType missing calls
David Monllao [Tue, 2 Apr 2013 07:37:00 +0000 (15:37 +0800)]
MDL-38821 enrol_cohort: Fixing setType missing calls

9 years agoMerge branch 'MDL-38455-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 2 Apr 2013 06:53:28 +0000 (14:53 +0800)]
Merge branch 'MDL-38455-master-int' of git://github.com/FMCorz/moodle

9 years agoMDL-35603 backup: fix coding style issues
Dan Poltawski [Tue, 2 Apr 2013 06:30:50 +0000 (14:30 +0800)]
MDL-35603 backup: fix coding style issues

9 years agoMerge branch 'MDL-35603-import-limit' of git://github.com/rlorenzo/moodle
Dan Poltawski [Tue, 2 Apr 2013 06:25:35 +0000 (14:25 +0800)]
Merge branch 'MDL-35603-import-limit' of git://github.com/rlorenzo/moodle

9 years agoMDL-38687 behat: New test
David Monllao [Tue, 26 Mar 2013 04:17:16 +0000 (12:17 +0800)]
MDL-38687 behat: New test

According to MDLQA-4590, an admin
can restore a course back up with
it's settings retained.

9 years agoMDL-38687 behat: Add activity step modification
David Monllao [Tue, 26 Mar 2013 04:16:00 +0000 (12:16 +0800)]
MDL-38687 behat: Add activity step modification

We are only supposed to look for
the activity name in @class=typename

9 years agoMDL-36804 Assign: Fix undeclared global $USER and undefined variable $userid
Damyon Wiese [Tue, 2 Apr 2013 05:44:25 +0000 (13:44 +0800)]
MDL-36804 Assign: Fix undeclared global $USER and undefined variable $userid

9 years agoMDL-36804 Assign submission history - One language string change.
Damyon Wiese [Tue, 26 Mar 2013 04:02:17 +0000 (12:02 +0800)]
MDL-36804 Assign submission history - One language string change.

9 years agoMDL-36804 Assignment submisison history - fix width column
Damyon Wiese [Tue, 26 Mar 2013 03:53:11 +0000 (11:53 +0800)]
MDL-36804 Assignment submisison history - fix width column

Fix the width of the left column in the history and submission tables so
they all line up on the page.

9 years agoMDL-36804 Assignment - Make sure webservice only returns the last submission/grade.
Damyon Wiese [Fri, 22 Mar 2013 15:32:53 +0000 (23:32 +0800)]
MDL-36804 Assignment - Make sure webservice only returns the last submission/grade.

9 years agoMDL-36804 mod_assign - allow students to resubmit work and display a submission ...
Damyon Wiese [Wed, 13 Mar 2013 03:36:23 +0000 (11:36 +0800)]
MDL-36804 mod_assign - allow students to resubmit work and display a submission + grading history

This is based on work by Davo Smith with input from Fernando Oliveira (Thanks guys!).

9 years agoMerge branch 'MDL-38713-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Tue, 2 Apr 2013 05:23:00 +0000 (13:23 +0800)]
Merge branch 'MDL-38713-master' of git://github.com/danpoltawski/moodle

9 years agoMDL-38690 behat: New test
David Monllao [Tue, 26 Mar 2013 06:14:47 +0000 (14:14 +0800)]
MDL-38690 behat: New test

According to MDLQA-327, a teacher can
import data from another course.

9 years agoMerge branch 'MDL-38700-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Tue, 2 Apr 2013 04:48:08 +0000 (12:48 +0800)]
Merge branch 'MDL-38700-master' of git://github.com/danpoltawski/moodle

Conflicts:
course/tests/courselib_test.php

9 years agoMDL-38785 behat: Steps definitions to add and delete comments
David Monllao [Sat, 30 Mar 2013 02:38:04 +0000 (10:38 +0800)]
MDL-38785 behat: Steps definitions to add and delete comments

9 years agoMDL-38785 behat: New tests
David Monllao [Sat, 30 Mar 2013 02:37:38 +0000 (10:37 +0800)]
MDL-38785 behat: New tests

According to MDLQA-943, users can
add comments via a comments block

9 years agoMerge branch 'MDL-38825' of git://github.com/stronk7/moodle
Dan Poltawski [Tue, 2 Apr 2013 03:49:24 +0000 (11:49 +0800)]
Merge branch 'MDL-38825' of git://github.com/stronk7/moodle

9 years agoMDL-38622 behat: New tests
David Monllao [Fri, 22 Mar 2013 04:44:22 +0000 (12:44 +0800)]
MDL-38622 behat: New tests

Navigation works correctly in paged
mode, according to MDLQA-1633, MDLQA-1639,
MDLQA-1645, MDLQA-1646, MDLQA-1647,
MDLQA-1648, MDLQA-1649, MDLQA-1651,
MDLQA-1652, MDLQA-1653, MDLQA-1654
and MDLQA-1655.

9 years agoMerge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 2 Apr 2013 03:27:32 +0000 (11:27 +0800)]
Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-38702_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Tue, 2 Apr 2013 02:04:26 +0000 (10:04 +0800)]
Merge branch 'MDL-38702_master' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'MDL-38814_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 2 Apr 2013 01:30:30 +0000 (03:30 +0200)]
Merge branch 'MDL-38814_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-38689_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 2 Apr 2013 00:41:44 +0000 (02:41 +0200)]
Merge branch 'MDL-38689_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-38686_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 2 Apr 2013 00:41:33 +0000 (02:41 +0200)]
Merge branch 'MDL-38686_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-38688_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 2 Apr 2013 00:41:25 +0000 (02:41 +0200)]
Merge branch 'MDL-38688_master' of git://github.com/dmonllao/moodle

9 years agoMDL-38621 behat: whitespace fix
Eloy Lafuente (stronk7) [Tue, 2 Apr 2013 00:28:40 +0000 (02:28 +0200)]
MDL-38621 behat: whitespace fix

9 years agoMerge branch 'MDL-38621_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 2 Apr 2013 00:27:10 +0000 (02:27 +0200)]
Merge branch 'MDL-38621_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-38620_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 2 Apr 2013 00:26:54 +0000 (02:26 +0200)]
Merge branch 'MDL-38620_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'MDL-38823_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 23:47:40 +0000 (01:47 +0200)]
Merge branch 'MDL-38823_master' of git://github.com/dmonllao/moodle

Conflicts:
mod/forum/tests/behat/behat_mod_forum.php

9 years agoMerge branch 'MDL-38805_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 23:45:43 +0000 (01:45 +0200)]
Merge branch 'MDL-38805_master' of git://github.com/dmonllao/moodle