moodle.git
8 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.

8 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!).

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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

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

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

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

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

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

8 years agoMDL-38547 behat: coding style fixes.
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 20:40:50 +0000 (22:40 +0200)]
MDL-38547 behat: coding style fixes.

8 years agoMerge branch 'MDL-38547_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 20:32:06 +0000 (22:32 +0200)]
Merge branch 'MDL-38547_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38499_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 20:23:58 +0000 (22:23 +0200)]
Merge branch 'MDL-38499_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38486_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 20:17:12 +0000 (22:17 +0200)]
Merge branch 'MDL-38486_master' of git://github.com/dmonllao/moodle

8 years agoMDL-38825 behat: fix composer install url
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 16:55:34 +0000 (18:55 +0200)]
MDL-38825 behat: fix composer install url

8 years agoMerge branch 'MDL-38817_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 11:25:31 +0000 (13:25 +0200)]
Merge branch 'MDL-38817_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38788_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 11:17:20 +0000 (13:17 +0200)]
Merge branch 'MDL-38788_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38787_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 1 Apr 2013 11:12:08 +0000 (13:12 +0200)]
Merge branch 'MDL-38787_master' of git://github.com/dmonllao/moodle

8 years agoMDL-38823 behat: New test
David Monllao [Mon, 1 Apr 2013 09:52:46 +0000 (17:52 +0800)]
MDL-38823 behat: New test

According to MDLQA-521, a teacher can set a certain
number of discussions as a completion condition for
a forum.

8 years agoMDL-38823 behat: Make default form field manage different HTML elements
David Monllao [Mon, 1 Apr 2013 09:51:54 +0000 (17:51 +0800)]
MDL-38823 behat: Make default form field manage different HTML elements

8 years agoMDL-38437 behat: Behat feature for mod_forum
David Monllao [Tue, 12 Mar 2013 07:48:27 +0000 (15:48 +0800)]
MDL-38437 behat: Behat feature for mod_forum

Basic add an activity, MDLQA-2 (students
can edit or delete their forum posts within
a set time limit).

8 years agoMDL-38437 behat: Step definition to add a discussion
David Monllao [Tue, 12 Mar 2013 07:47:30 +0000 (15:47 +0800)]
MDL-38437 behat: Step definition to add a discussion

8 years agoMDL-38817 behat: New test
David Monllao [Mon, 1 Apr 2013 05:57:01 +0000 (13:57 +0800)]
MDL-38817 behat: New test

According to MDLQA-50, in a survey activity
a teacher can set three types of survey

8 years agoMDL-38805 behat: Steps definitions to check students completed activities
David Monllao [Sat, 30 Mar 2013 08:20:09 +0000 (16:20 +0800)]
MDL-38805 behat: Steps definitions to check students completed activities

8 years agoMDL-38805 behat: New test
David Monllao [Sat, 30 Mar 2013 08:19:11 +0000 (16:19 +0800)]
MDL-38805 behat: New test

According to MDLQA-511, a teacher can
enable students to manually mark an activity
as complete.

8 years agoMDL-38805 behat: Externalized behat_form_field loader
David Monllao [Sat, 30 Mar 2013 08:17:14 +0000 (16:17 +0800)]
MDL-38805 behat: Externalized behat_form_field loader

8 years agoMDL-38804 behat: Step definition to set site administration settings
David Monllao [Sat, 30 Mar 2013 08:12:44 +0000 (16:12 +0800)]
MDL-38804 behat: Step definition to set site administration settings

8 years agoMDL-38804 behat: New test
David Monllao [Sat, 30 Mar 2013 08:11:43 +0000 (16:11 +0800)]
MDL-38804 behat: New test

According to MDLQA-1780, a teacher can
set completion conditions to restrict
the availability of a section

8 years agoMDL-38814 behat: Deleting old files
David Monllao [Mon, 1 Apr 2013 04:21:05 +0000 (12:21 +0800)]
MDL-38814 behat: Deleting old files

8 years agoDML-38814 behat: Split steps definitions tests into features
David Monllao [Mon, 1 Apr 2013 04:17:41 +0000 (12:17 +0800)]
DML-38814 behat: Split steps definitions tests into features

8 years agoMDL-38814 behat: Move filepicker steps definitions to repository/
David Monllao [Mon, 1 Apr 2013 04:16:57 +0000 (12:16 +0800)]
MDL-38814 behat: Move filepicker steps definitions to repository/

8 years agoMDL-38788 behat: Add a block and add an activity steps definitions compatible with...
David Monllao [Thu, 28 Mar 2013 10:05:05 +0000 (18:05 +0800)]
MDL-38788 behat: Add a block and add an activity steps definitions compatible with JS disabled

8 years agoMDL-38788 behat: Generic form elements interaction compatibile with JS disabled
David Monllao [Thu, 28 Mar 2013 10:03:27 +0000 (18:03 +0800)]
MDL-38788 behat: Generic form elements interaction compatibile with JS disabled

8 years agoMDL-38788 behat: New tests with Javascript disabled
David Monllao [Thu, 28 Mar 2013 10:02:30 +0000 (18:02 +0800)]
MDL-38788 behat: New tests with Javascript disabled

Add a block and add an activity/resource
tests. The add an activity with JS disabled
test includes MDLQA-2446 automation.

8 years agoMDL-38538 quiz auto-save front end.
Tim Hunt [Thu, 28 Mar 2013 16:57:24 +0000 (16:57 +0000)]
MDL-38538 quiz auto-save front end.

1. There is a new admin setting to control whether this feature is
enabled. The admin can set the auto-save frequency to 1, 2 or 5 minutes,
or disable it.

2. When autosave is enabled, there is code in the quiz that monitors the
main quiz form, and does an ajax save call at the given frequency when
changes are being made by the student.

3. The ajax saves go to a new script that calls the question engine to
do the work.

4. To avoid simultaneous autosave + submit and finish, the auto-save
system shuts down shortly before time expires in a timed quiz.

8 years agoMDL-38538 question auto-save back end.
Tim Hunt [Thu, 28 Mar 2013 16:51:59 +0000 (16:51 +0000)]
MDL-38538 question auto-save back end.

1. Autosave works in some ways just like a normal save. We ultimately
call $behaviour->process_save() to do the work, and create a new step to
hold the data.

2. However, we come in through a completely different route through the
API, starting with separate auto-save methods. This keeps the auto-save
changes mostly separate, and so reduced the chance of breaking existing
working code.

3. When the time comes to store the auto-save step in the database, we
save it using a negative sequence number.

This is a clever trick that not only distinguises these steps, but also
avoids unique key errors when an auto-save and a real action happen
simultaneously. (There are unit tests for these tricky edge cases.)

4. When we load the data back from the database, most of the time the
auto-save steps are loaded back as if they were a real save, and so the
auto-saved data is used when the question is then rendered.

5. However, before we process another action, we remove the auto-saved
step, so it does not appear in the final history.

8 years agoMDL-38538 question unit tests: improve things a bit.
Tim Hunt [Thu, 28 Mar 2013 16:05:34 +0000 (16:05 +0000)]
MDL-38538 question unit tests: improve things a bit.

1. Split the question_attempt tests into one class per file.
2. Imporve the API to give tests more control, and to test more of the
   important code. Some of this is not used here, but it is about to be.

8 years agoMDL-38787 behat: Move to the new Javascript-based test class manager
David Monllao [Thu, 28 Mar 2013 08:59:18 +0000 (16:59 +0800)]
MDL-38787 behat: Move to the new Javascript-based test class manager

8 years agoweekly release 2.5dev
Damyon Wiese [Thu, 28 Mar 2013 06:44:31 +0000 (14:44 +0800)]
weekly release 2.5dev

8 years agoMDL-38686 behat: New restore course test
David Monllao [Tue, 26 Mar 2013 02:58:58 +0000 (10:58 +0800)]
MDL-38686 behat: New restore course test

According to MDLQA-4596, a teacher can change
the format of a restored course

8 years agoMDL-38689 behat: Steps definitions to compare DOM nodes position inside the DOM
David Monllao [Tue, 26 Mar 2013 09:27:08 +0000 (17:27 +0800)]
MDL-38689 behat: Steps definitions to compare DOM nodes position inside the DOM

8 years agoMDL-38689 behat: Allowing more than one selector type argument
David Monllao [Tue, 26 Mar 2013 09:26:10 +0000 (17:26 +0800)]
MDL-38689 behat: Allowing more than one selector type argument

Regex's placeholders can not be repeated, if
there are definitions that have more than one
selector type of the same kind it would not
be displayed like that in the steps definitions
list UI

8 years agoMDL-38689 behat: New test
David Monllao [Tue, 26 Mar 2013 09:22:35 +0000 (17:22 +0800)]
MDL-38689 behat: New test

According to MDLQA-931, a teacher can
copy an activity.

8 years agoFix permissions
Damyon Wiese [Thu, 28 Mar 2013 06:36:33 +0000 (14:36 +0800)]
Fix permissions

8 years agoMDL-38688 behat: Restore Moodle 2 courses tests
David Monllao [Mon, 25 Mar 2013 08:15:35 +0000 (16:15 +0800)]
MDL-38688 behat: Restore Moodle 2 courses tests

8 years agoMDL-38688 behat: Backup tests
David Monllao [Mon, 25 Mar 2013 08:15:15 +0000 (16:15 +0800)]
MDL-38688 behat: Backup tests

Complemented by restore_moodle2_courses.feature
tests.

8 years agoMDL-38688 behat: Steps definitions for backup/restore
David Monllao [Mon, 25 Mar 2013 08:14:21 +0000 (16:14 +0800)]
MDL-38688 behat: Steps definitions for backup/restore

8 years agoMDL-38620 behat: Modified upload_users.csv fixture
David Monllao [Fri, 22 Mar 2013 02:33:09 +0000 (10:33 +0800)]
MDL-38620 behat: Modified upload_users.csv fixture

Including course and group enrolments

8 years agoMDL-38620 behat: New test
David Monllao [Fri, 22 Mar 2013 02:32:29 +0000 (10:32 +0800)]
MDL-38620 behat: New test

According to MDLQA-1175; test
removed from repository_upload as
is included in MDLQA-1175 test

8 years agoMDL-38621 behat: New test
David Monllao [Fri, 22 Mar 2013 02:57:26 +0000 (10:57 +0800)]
MDL-38621 behat: New test

According to MDLQA-1172, course short
names may be displayed on the list of
courses page.

8 years agoMerge branch 'MDL-25631' of git://github.com/merrill-oakland/moodle
Damyon Wiese [Thu, 28 Mar 2013 01:39:05 +0000 (09:39 +0800)]
Merge branch 'MDL-25631' of git://github.com/merrill-oakland/moodle

8 years agoMerge branch 'MDL-38516-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 22:56:57 +0000 (23:56 +0100)]
Merge branch 'MDL-38516-m' of https://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38520-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 22:38:33 +0000 (23:38 +0100)]
Merge branch 'MDL-38520-m' of https://github.com/andrewnicols/moodle

8 years agoMDL-38516 JavaScript: Migrate moodle-block_navigation-navigation to use Shifter
Andrew Robert Nicols [Sat, 16 Mar 2013 22:30:02 +0000 (22:30 +0000)]
MDL-38516 JavaScript: Migrate moodle-block_navigation-navigation to use Shifter

8 years agoMerge branch 'MDL-38473-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 22:20:18 +0000 (23:20 +0100)]
Merge branch 'MDL-38473-m' of https://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38404-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 22:06:46 +0000 (23:06 +0100)]
Merge branch 'MDL-38404-m' of https://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38472-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 21:42:33 +0000 (22:42 +0100)]
Merge branch 'MDL-38472-m' of https://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38519-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 21:29:21 +0000 (22:29 +0100)]
Merge branch 'MDL-38519-m' of https://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38517-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 20:43:30 +0000 (21:43 +0100)]
Merge branch 'MDL-38517-m' of https://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-38471-m' of https://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 17:50:34 +0000 (18:50 +0100)]
Merge branch 'MDL-38471-m' of https://github.com/andrewnicols/moodle

8 years agoMDL-38477 behat: New test
David Monllao [Thu, 14 Mar 2013 06:37:23 +0000 (14:37 +0800)]
MDL-38477 behat: New test

According to MDLQA-16, teachers can edit
or delete any forum post.

8 years agoMDL-38476 behat: New test
David Monllao [Thu, 14 Mar 2013 06:34:34 +0000 (14:34 +0800)]
MDL-38476 behat: New test

According to MDLQA-9, in a single
simple discussion forum only teachers
can start discussions.

8 years agoMDL-38475 behat: New test
David Monllao [Thu, 14 Mar 2013 06:28:58 +0000 (14:28 +0800)]
MDL-38475 behat: New test

According to MDLQA-5, students can choose
from 4 discussion display options and their
choice is remembered.

8 years agoMDL-38475 behat: Step definition to reply a discussion
David Monllao [Thu, 14 Mar 2013 06:27:25 +0000 (14:27 +0800)]
MDL-38475 behat: Step definition to reply a discussion

8 years agoMDL-38439 behat: New test
David Monllao [Tue, 12 Mar 2013 08:25:36 +0000 (16:25 +0800)]
MDL-38439 behat: New test

According to MDLQA-3, a teacher can
set one of 3 possible options for
tracking read forum posts.

8 years agoMDL-38437 behat: Behat feature for mod_forum
David Monllao [Tue, 12 Mar 2013 07:48:27 +0000 (15:48 +0800)]
MDL-38437 behat: Behat feature for mod_forum

Basic add an activity, MDLQA-2 (students
can edit or delete their forum posts within
a set time limit).

8 years agoMDL-38437 behat: Step definition to add a discussion
David Monllao [Tue, 12 Mar 2013 07:47:30 +0000 (15:47 +0800)]
MDL-38437 behat: Step definition to add a discussion

8 years agoMDL-38499 behat: Steps definitions for section visibility management
David Monllao [Tue, 19 Mar 2013 06:09:14 +0000 (14:09 +0800)]
MDL-38499 behat: Steps definitions for section visibility management

8 years agoMDL-38499 behat: New test
David Monllao [Tue, 19 Mar 2013 05:46:44 +0000 (13:46 +0800)]
MDL-38499 behat: New test

The show/hide section icon functions
correctly. According to MDLQA-1579,
MDLQA-1580, MDLQA-1581, MDLQA-1582
and MDLQA-1583.

8 years agoMDL-38486 behat: New test
David Monllao [Fri, 15 Mar 2013 03:27:19 +0000 (11:27 +0800)]
MDL-38486 behat: New test

Section highlighting can be turned off
correctly using the toggle highlighting
icon. According to MDLQA-1591, MDLQA-1592,
MDLQA-1593, MDLQA-1594 and MDLQA-1595

8 years agoMDL-38486 behat: Course's topics highlighting steps definitions
David Monllao [Fri, 15 Mar 2013 03:26:18 +0000 (11:26 +0800)]
MDL-38486 behat: Course's topics highlighting steps definitions

8 years agoMerge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Wed, 27 Mar 2013 06:11:27 +0000 (14:11 +0800)]
Merge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-38147 fixed bug with windows PHP different function behaviour
Marina Glancy [Wed, 27 Mar 2013 06:06:27 +0000 (17:06 +1100)]
MDL-38147 fixed bug with windows PHP different function behaviour

8 years agoMDL-38147 added comments for SQL-based course search that might not work on some DB
Marina Glancy [Wed, 27 Mar 2013 06:05:51 +0000 (17:05 +1100)]
MDL-38147 added comments for SQL-based course search that might not work on some DB

8 years agoMDL-38147 do not use DB->sql_length because it does not work on MSSQL
Marina Glancy [Wed, 27 Mar 2013 05:07:29 +0000 (16:07 +1100)]
MDL-38147 do not use DB->sql_length because it does not work on MSSQL

8 years agoMerge branch 'MDL-38632' of git://github.com/stronk7/moodle
Aparup Banerjee [Wed, 27 Mar 2013 05:07:10 +0000 (13:07 +0800)]
Merge branch 'MDL-38632' of git://github.com/stronk7/moodle

8 years agoMerge branch 'MDL-38736-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Wed, 27 Mar 2013 04:17:47 +0000 (12:17 +0800)]
Merge branch 'MDL-38736-master' of git://github.com/danpoltawski/moodle

8 years agoMDL-38717 Admin: Change setType for email to PARAM_EMAIL
Damyon Wiese [Wed, 27 Mar 2013 04:11:06 +0000 (12:11 +0800)]
MDL-38717 Admin: Change setType for email to PARAM_EMAIL

8 years agoMerge branch 'MDL-38717-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Wed, 27 Mar 2013 03:57:14 +0000 (11:57 +0800)]
Merge branch 'MDL-38717-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-38659' of git://github.com/stronk7/moodle
Aparup Banerjee [Wed, 27 Mar 2013 02:38:31 +0000 (10:38 +0800)]
Merge branch 'MDL-38659' of git://github.com/stronk7/moodle

8 years agoMDL-38736 mod_choice: fix missing param type
Dan Poltawski [Wed, 27 Mar 2013 02:08:40 +0000 (10:08 +0800)]
MDL-38736 mod_choice: fix missing param type

8 years agoMDL-35876: Whitespace, indenting and more verbose upgrade.txt
Damyon Wiese [Wed, 27 Mar 2013 02:16:09 +0000 (10:16 +0800)]
MDL-35876: Whitespace, indenting and more verbose upgrade.txt

8 years agoMDL-38717 admin: missing setType on email
Dan Poltawski [Wed, 27 Mar 2013 02:12:46 +0000 (10:12 +0800)]
MDL-38717 admin: missing setType on email

8 years agoMerge branch 'wip-MDL-35876-master' of git://github.com/phalacee/moodle
Damyon Wiese [Wed, 27 Mar 2013 02:06:30 +0000 (10:06 +0800)]
Merge branch 'wip-MDL-35876-master' of git://github.com/phalacee/moodle

Conflicts:
lib/upgrade.txt

8 years agoMerge branch 'wip-mdl-38543' of git://github.com/deraadt/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 01:00:02 +0000 (02:00 +0100)]
Merge branch 'wip-mdl-38543' of git://github.com/deraadt/moodle

8 years agoMerge branch 'MDL-38552-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 00:51:35 +0000 (01:51 +0100)]
Merge branch 'MDL-38552-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-38566-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 27 Mar 2013 00:49:10 +0000 (01:49 +0100)]
Merge branch 'MDL-38566-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/base/style/core.css

8 years agoMerge branch 'MDL-38484_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 26 Mar 2013 23:47:32 +0000 (00:47 +0100)]
Merge branch 'MDL-38484_master' of git://github.com/dmonllao/moodle