moodle.git
7 years agoMerge branch 'MDL-46481-master' of https://github.com/FMCorz/moodle
Sam Hemelryk [Wed, 8 Oct 2014 19:51:40 +0000 (08:51 +1300)]
Merge branch 'MDL-46481-master' of https://github.com/FMCorz/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'wip-MDL-47543-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 8 Oct 2014 14:49:58 +0000 (15:49 +0100)]
Merge branch 'wip-MDL-47543-master' of git://github.com/marinaglancy/moodle

Conflicts:
theme/bootstrapbase/less/moodle/grade.less
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'wip-MDL-46547-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 8 Oct 2014 14:33:46 +0000 (15:33 +0100)]
Merge branch 'wip-MDL-46547-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'MDL-47536' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 8 Oct 2014 14:24:14 +0000 (15:24 +0100)]
Merge branch 'MDL-47536' of git://github.com/stronk7/moodle

7 years agoMerge branch 'wip-mdl-46987' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Wed, 8 Oct 2014 14:00:20 +0000 (22:00 +0800)]
Merge branch 'wip-mdl-46987' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-47084-master' of git://github.com/jleyva/moodle
Dan Poltawski [Wed, 8 Oct 2014 13:43:13 +0000 (14:43 +0100)]
Merge branch 'MDL-47084-master' of git://github.com/jleyva/moodle

7 years agoMerge branch 'MDL-46458-master' of git://github.com/jleyva/moodle
Damyon Wiese [Wed, 8 Oct 2014 13:14:39 +0000 (21:14 +0800)]
Merge branch 'MDL-46458-master' of git://github.com/jleyva/moodle

Conflicts:
version.php

7 years agoMerge branch 'MDL-47298-master' of git://github.com/FMCorz/moodle
Marina Glancy [Wed, 8 Oct 2014 11:58:43 +0000 (19:58 +0800)]
Merge branch 'MDL-47298-master' of git://github.com/FMCorz/moodle

7 years agoMDL-47497 qformats gift and xml: basic test of export.
Tim Hunt [Wed, 1 Oct 2014 15:59:56 +0000 (16:59 +0100)]
MDL-47497 qformats gift and xml: basic test of export.

Really, this is just to test the new behat setps, as much as anything.

Note that the details of what is written to the export files is tested in
the unit tests.

7 years agoMDL-47497 behat: steps for basic download testing.
Tim Hunt [Wed, 1 Oct 2014 15:39:06 +0000 (16:39 +0100)]
MDL-47497 behat: steps for basic download testing.

These steps were created by sam marshall and Jes Ackland-Snow at the Open
University. I just altered them to make them a bit more generic, and
submitted them to Moodle core, at the point when I wanted to reuse them
in another plugin.

This commit introduces two new steps:

Then following "XXX" should download "YY" bytes
Then following "XXX" should download between "YY" and "ZZ" bytes

At the moment, this only works for links with href attributes.

7 years agoMDL-47297 libraries: upgrade note about Google API update
Marina Glancy [Wed, 8 Oct 2014 11:22:14 +0000 (19:22 +0800)]
MDL-47297 libraries: upgrade note about Google API update

7 years agoMDL-47297 repository_googledocs: Use the newer Google API
Frederic Massart [Tue, 30 Sep 2014 11:59:02 +0000 (19:59 +0800)]
MDL-47297 repository_googledocs: Use the newer Google API

7 years agoMDL-47297 libraries: Update Google API to v1.0.5-beta
Frederic Massart [Tue, 30 Sep 2014 11:52:26 +0000 (19:52 +0800)]
MDL-47297 libraries: Update Google API to v1.0.5-beta

7 years agoMerge branch 'MDL-47389-master' of git://github.com/jleyva/moodle
Dan Poltawski [Wed, 8 Oct 2014 10:08:29 +0000 (11:08 +0100)]
Merge branch 'MDL-47389-master' of git://github.com/jleyva/moodle

7 years agoMerge branch 'MDL-45893-master-fixup' of https://github.com/FMCorz/moodle
Dan Poltawski [Wed, 8 Oct 2014 09:42:20 +0000 (10:42 +0100)]
Merge branch 'MDL-45893-master-fixup' of https://github.com/FMCorz/moodle

7 years agoMDL-46658 - fix trailing whitespace
Dan Poltawski [Wed, 8 Oct 2014 09:22:25 +0000 (10:22 +0100)]
MDL-46658 - fix trailing whitespace

7 years agoMerge branch 'MDL-46658-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Wed, 8 Oct 2014 09:26:13 +0000 (10:26 +0100)]
Merge branch 'MDL-46658-master' of git://github.com/andrewnicols/moodle

Conflicts:
theme/bootstrapbase/less/moodle/grade.less
theme/bootstrapbase/style/moodle.css

7 years agoMDL-45893 my: Specifically follow My home from block in Behat tests
Frederic Massart [Wed, 8 Oct 2014 08:16:01 +0000 (16:16 +0800)]
MDL-45893 my: Specifically follow My home from block in Behat tests

7 years agoMerge branch 'MDL-38540' of git://github.com/jmvedrine/moodle
Damyon Wiese [Wed, 8 Oct 2014 08:46:12 +0000 (16:46 +0800)]
Merge branch 'MDL-38540' of git://github.com/jmvedrine/moodle

7 years agoMerge branch 'MDL-46284-master-fix' of git://github.com/andrewnicols/moodle
Dan Poltawski [Wed, 8 Oct 2014 07:54:07 +0000 (08:54 +0100)]
Merge branch 'MDL-46284-master-fix' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-40697_master_alt_usergraded' of https://github.com/markn86/moodle
Dan Poltawski [Wed, 8 Oct 2014 07:39:31 +0000 (08:39 +0100)]
Merge branch 'MDL-40697_master_alt_usergraded' of https://github.com/markn86/moodle

7 years agoMDL-46284 tool_messageinbound: Handle checkboxes correctly
Andrew Nicols [Wed, 8 Oct 2014 07:10:58 +0000 (15:10 +0800)]
MDL-46284 tool_messageinbound: Handle checkboxes correctly

When a checkbox is not checked, it does not submit in the form, therefore
this must be an !empty() test instead of an (int) casting.

This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.

7 years agoMDL-47543 core_grades: behat changes, also MDL-47541
Marina Glancy [Tue, 7 Oct 2014 13:57:40 +0000 (21:57 +0800)]
MDL-47543 core_grades: behat changes, also MDL-47541

7 years agoMDL-47543 core_grades: improve navigation menu in grade administration
Marina Glancy [Tue, 7 Oct 2014 13:58:19 +0000 (21:58 +0800)]
MDL-47543 core_grades: improve navigation menu in grade administration

7 years agoMDL-47541 core_grades: hints about aggregation settings on setup page
Marina Glancy [Tue, 7 Oct 2014 04:11:08 +0000 (12:11 +0800)]
MDL-47541 core_grades: hints about aggregation settings on setup page

Also do not indicate 'Natural' aggregation method

7 years agoMDL-46481 backup: Reposition one-click backup button
Frederic Massart [Wed, 8 Oct 2014 05:45:24 +0000 (13:45 +0800)]
MDL-46481 backup: Reposition one-click backup button

7 years agoMDL-38540 Lesson: import images in question answers
Jean-Michel Vedrine [Sun, 17 Mar 2013 22:40:40 +0000 (23:40 +0100)]
MDL-38540 Lesson: import images in question answers

7 years agoMDL-38106 lesson: fix tests introduced in MDL-32870
Dan Poltawski [Sun, 5 Oct 2014 08:20:25 +0000 (09:20 +0100)]
MDL-38106 lesson: fix tests introduced in MDL-32870

7 years agoMDL-40697 mod_*: fixed unit tests so they pass
Mark Nelson [Thu, 25 Sep 2014 01:36:17 +0000 (18:36 -0700)]
MDL-40697 mod_*: fixed unit tests so they pass

7 years agoMDL-40697 core: added unit test for grade_deleted event
Mark Nelson [Sat, 27 Sep 2014 01:14:26 +0000 (18:14 -0700)]
MDL-40697 core: added unit test for grade_deleted event

7 years agoMDL-40697 core: added more unit tests for the user_graded event
Mark Nelson [Tue, 26 Aug 2014 01:10:01 +0000 (18:10 -0700)]
MDL-40697 core: added more unit tests for the user_graded event

7 years agoMDL-40697 core_grades: trigger the grade_deleted event
Mark Nelson [Fri, 26 Sep 2014 03:52:40 +0000 (20:52 -0700)]
MDL-40697 core_grades: trigger the grade_deleted event

7 years agoMDL-40697 core_grades: trigger the user_graded event
Mark Nelson [Mon, 15 Sep 2014 03:46:06 +0000 (20:46 -0700)]
MDL-40697 core_grades: trigger the user_graded event

7 years agoMDL-40697 core_grades: removed existing user_graded event triggers
Mark Nelson [Sat, 27 Sep 2014 00:29:33 +0000 (17:29 -0700)]
MDL-40697 core_grades: removed existing user_graded event triggers

7 years agoMDL-40697 core_grades: changed user_graded event name
Mark Nelson [Tue, 30 Sep 2014 06:04:02 +0000 (23:04 -0700)]
MDL-40697 core_grades: changed user_graded event name

7 years agoMDL-40697 core: added grade_deleted event
Mark Nelson [Mon, 22 Sep 2014 04:57:52 +0000 (21:57 -0700)]
MDL-40697 core: added grade_deleted event

7 years agoMDL-28484 Libraries: Update comments to suggest using new is_https()
Damyon Wiese [Wed, 8 Oct 2014 01:52:17 +0000 (09:52 +0800)]
MDL-28484 Libraries: Update comments to suggest using new is_https()

7 years agoMerge branch 'MDL-28484-master' of https://github.com/lucisgit/moodle
Damyon Wiese [Wed, 8 Oct 2014 01:53:53 +0000 (09:53 +0800)]
Merge branch 'MDL-28484-master' of https://github.com/lucisgit/moodle

7 years agoMerge branch 'wip_MDL-47477_m28_jqueryuitheme' of https://github.com/skodak/moodle
Sam Hemelryk [Wed, 8 Oct 2014 01:35:02 +0000 (14:35 +1300)]
Merge branch 'wip_MDL-47477_m28_jqueryuitheme' of https://github.com/skodak/moodle

7 years agoMDL-46658 gradebook: Fix gradebook behat tests
Andrew Nicols [Tue, 7 Oct 2014 23:31:49 +0000 (07:31 +0800)]
MDL-46658 gradebook: Fix gradebook behat tests

This issue is a part of the MDL-25544 Epic.

7 years agoMerge branch 'wip_MDL-47303_m28_jquery' of https://github.com/skodak/moodle
Sam Hemelryk [Wed, 8 Oct 2014 01:31:40 +0000 (14:31 +1300)]
Merge branch 'wip_MDL-47303_m28_jquery' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-47301-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Wed, 8 Oct 2014 01:10:50 +0000 (14:10 +1300)]
Merge branch 'MDL-47301-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'wip-MDL-47299-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Wed, 8 Oct 2014 01:07:57 +0000 (14:07 +1300)]
Merge branch 'wip-MDL-47299-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-47470-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 7 Oct 2014 23:21:31 +0000 (12:21 +1300)]
Merge branch 'MDL-47470-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'MDL-47132' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 7 Oct 2014 23:01:42 +0000 (12:01 +1300)]
Merge branch 'MDL-47132' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-47474' of https://github.com/bostelm/moodle
Sam Hemelryk [Tue, 7 Oct 2014 22:52:17 +0000 (11:52 +1300)]
Merge branch 'MDL-47474' of https://github.com/bostelm/moodle

7 years agoMerge branch 'MDL-47481-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 7 Oct 2014 22:51:32 +0000 (11:51 +1300)]
Merge branch 'MDL-47481-master' of https://github.com/sammarshallou/moodle

7 years agoMerge branch 'MDL-47484' of git://github.com/aolley/moodle
Sam Hemelryk [Tue, 7 Oct 2014 22:40:49 +0000 (11:40 +1300)]
Merge branch 'MDL-47484' of git://github.com/aolley/moodle

7 years agoMerge branch 'MDL-47496-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 7 Oct 2014 22:37:24 +0000 (11:37 +1300)]
Merge branch 'MDL-47496-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'wip-MDL-40351-master' of https://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 7 Oct 2014 22:36:01 +0000 (11:36 +1300)]
Merge branch 'wip-MDL-40351-master' of https://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-46182' of https://github.com/NeillM/moodle
Sam Hemelryk [Tue, 7 Oct 2014 22:28:19 +0000 (11:28 +1300)]
Merge branch 'MDL-46182' of https://github.com/NeillM/moodle

7 years agoMerge branch 'MDL-47197-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 7 Oct 2014 22:16:54 +0000 (11:16 +1300)]
Merge branch 'MDL-47197-master' of git://github.com/andrewnicols/moodle

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

7 years agoMerge branch 'MDL-47476' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 7 Oct 2014 22:02:38 +0000 (11:02 +1300)]
Merge branch 'MDL-47476' of git://github.com/timhunt/moodle

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

7 years agoMerge branch 'MDL-28075' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 7 Oct 2014 21:57:15 +0000 (10:57 +1300)]
Merge branch 'MDL-28075' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-46391-master' of https://github.com/DmitryNefedov/moodle
Sam Hemelryk [Tue, 7 Oct 2014 21:45:23 +0000 (10:45 +1300)]
Merge branch 'MDL-46391-master' of https://github.com/DmitryNefedov/moodle

7 years agoRevert "MDL-46978 gradebook: Edit grade item changes visibility of category"
Sam Hemelryk [Tue, 7 Oct 2014 21:37:12 +0000 (10:37 +1300)]
Revert "MDL-46978 gradebook: Edit grade item changes visibility of category"

This reverts commit bad2c9b14f27e6d9a370ac6cff6b8b5c2dc79a17.

7 years agoMDL-3714 mod_forum: pre-integration clean up
Sam Hemelryk [Tue, 7 Oct 2014 20:39:44 +0000 (09:39 +1300)]
MDL-3714 mod_forum: pre-integration clean up

7 years agoMerge branch 'MDL-3714-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 7 Oct 2014 20:39:01 +0000 (09:39 +1300)]
Merge branch 'MDL-3714-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-45893-master-v3' of git://github.com/jethac/moodle
Dan Poltawski [Tue, 7 Oct 2014 15:52:07 +0000 (16:52 +0100)]
Merge branch 'MDL-45893-master-v3' of git://github.com/jethac/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-45893 user_menu: responsive approach; fixed minor issues
Jetha Chan [Fri, 3 Oct 2014 09:02:02 +0000 (17:02 +0800)]
MDL-45893 user_menu: responsive approach; fixed minor issues

7 years agoMerge branch 'MDL-47518' of https://github.com/rlorenzo/moodle
Dan Poltawski [Tue, 7 Oct 2014 13:32:48 +0000 (14:32 +0100)]
Merge branch 'MDL-47518' of https://github.com/rlorenzo/moodle

7 years agoMerge branch '46481-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 7 Oct 2014 13:25:06 +0000 (14:25 +0100)]
Merge branch '46481-28' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-32870' of git://github.com/jmvedrine/moodle
Marina Glancy [Tue, 7 Oct 2014 09:16:56 +0000 (17:16 +0800)]
Merge branch 'MDL-32870' of git://github.com/jmvedrine/moodle

7 years agoMerge branch 'wip-MDL-35618-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 7 Oct 2014 08:24:39 +0000 (09:24 +0100)]
Merge branch 'wip-MDL-35618-master' of git://github.com/marinaglancy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'wip-MDL-36014-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 7 Oct 2014 04:34:34 +0000 (12:34 +0800)]
Merge branch 'wip-MDL-36014-master' of git://github.com/marinaglancy/moodle

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

7 years agoMerge branch 'MDL-46284-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 7 Oct 2014 03:28:50 +0000 (16:28 +1300)]
Merge branch 'MDL-46284-master' of git://github.com/andrewnicols/moodle

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

7 years agoMerge branch 'MDL-38106-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Tue, 7 Oct 2014 02:25:29 +0000 (10:25 +0800)]
Merge branch 'MDL-38106-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'MDL-36460-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 7 Oct 2014 02:16:54 +0000 (15:16 +1300)]
Merge branch 'MDL-36460-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-31936 workshop: version bump
Marina Glancy [Tue, 7 Oct 2014 02:15:54 +0000 (10:15 +0800)]
MDL-31936 workshop: version bump

7 years agoMerge branch 'MDL-31936-master-workshop-reset' of git://github.com/mudrd8mz/moodle
Marina Glancy [Tue, 7 Oct 2014 02:08:48 +0000 (10:08 +0800)]
Merge branch 'MDL-31936-master-workshop-reset' of git://github.com/mudrd8mz/moodle

7 years agoMDL-47197 core: Private files handler
Andrew Nicols [Wed, 10 Sep 2014 08:10:02 +0000 (16:10 +0800)]
MDL-47197 core: Private files handler

This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.

7 years agoMDL-46284 core: Add e-mail fetcher from IMAP
Andrew Nicols [Wed, 16 Jul 2014 06:51:19 +0000 (14:51 +0800)]
MDL-46284 core: Add e-mail fetcher from IMAP

This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.

7 years agoMDL-3714 mod_forum: Add an inbound message handler
Andrew Nicols [Wed, 16 Jul 2014 06:52:02 +0000 (14:52 +0800)]
MDL-3714 mod_forum: Add an inbound message handler

This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.

7 years agoMDL-46284 core: Add e-mail fetcher from IMAP
Andrew Nicols [Wed, 16 Jul 2014 06:51:19 +0000 (14:51 +0800)]
MDL-46284 core: Add e-mail fetcher from IMAP

This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.

7 years agoMerge branch 'MDL-46295-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 6 Oct 2014 21:36:48 +0000 (10:36 +1300)]
Merge branch 'MDL-46295-master' of git://github.com/damyon/moodle

7 years agoMDL-31936 workshop: Improve unit tests for the course reset support
David Mudrák [Thu, 18 Sep 2014 11:52:47 +0000 (13:52 +0200)]
MDL-31936 workshop: Improve unit tests for the course reset support

7 years agoMerge branch 'MDL-46978' of https://github.com/danielneis/moodle
Sam Hemelryk [Mon, 6 Oct 2014 21:26:05 +0000 (10:26 +1300)]
Merge branch 'MDL-46978' of https://github.com/danielneis/moodle

7 years agoMDL-46576 grade: fix trailing whitespace
Dan Poltawski [Mon, 6 Oct 2014 16:48:28 +0000 (17:48 +0100)]
MDL-46576 grade: fix trailing whitespace

7 years agoMerge branch 'wip-MDL-46576-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 6 Oct 2014 17:06:13 +0000 (18:06 +0100)]
Merge branch 'wip-MDL-46576-master' of git://github.com/abgreeve/moodle

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

7 years agoMerge branch 'MDL-46054-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 6 Oct 2014 15:01:26 +0000 (16:01 +0100)]
Merge branch 'MDL-46054-master' of git://github.com/jleyva/moodle

7 years agoMDL-47547 quiz editing: minor fixes following MDL-47547
Tim Hunt [Mon, 6 Oct 2014 14:44:21 +0000 (15:44 +0100)]
MDL-47547 quiz editing: minor fixes following MDL-47547

* Remove unnecessary skip links.
* Disable shortforms for form in pop-ups.
* Remove some CSS that was hurting display of the add menu.

7 years agoMDL-38106 lesson: don't require intro when upgraded
Dan Poltawski [Mon, 6 Oct 2014 13:54:53 +0000 (14:54 +0100)]
MDL-38106 lesson: don't require intro when upgraded

7 years agoMerge branch 'MDL-45504' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 6 Oct 2014 13:00:20 +0000 (14:00 +0100)]
Merge branch 'MDL-45504' of git://github.com/stronk7/moodle

7 years agoMDL-43089 question: fix shifter build issues
Dan Poltawski [Mon, 6 Oct 2014 12:53:26 +0000 (13:53 +0100)]
MDL-43089 question: fix shifter build issues

7 years agoMerge branch 'wip_MDL-47538_m28_phpunitseq' of git://github.com/skodak/moodle
Marina Glancy [Mon, 6 Oct 2014 12:40:13 +0000 (20:40 +0800)]
Merge branch 'wip_MDL-47538_m28_phpunitseq' of git://github.com/skodak/moodle

7 years agoMerge branch 'MDL-46210-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Mon, 6 Oct 2014 12:39:09 +0000 (20:39 +0800)]
Merge branch 'MDL-46210-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'MDL-47221-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Mon, 6 Oct 2014 12:38:29 +0000 (20:38 +0800)]
Merge branch 'MDL-47221-master' of git://github.com/danpoltawski/moodle

7 years agoMDL-43089 question: fix whitespace
Dan Poltawski [Mon, 6 Oct 2014 11:56:45 +0000 (12:56 +0100)]
MDL-43089 question: fix whitespace

7 years agoMerge branch 'MDL-43089-behat-fixup' of https://github.com/timhunt/moodle
Dan Poltawski [Mon, 6 Oct 2014 11:49:55 +0000 (12:49 +0100)]
Merge branch 'MDL-43089-behat-fixup' of https://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-43089' of git://github.com/mkassaei/moodle
Dan Poltawski [Mon, 6 Oct 2014 11:11:33 +0000 (12:11 +0100)]
Merge branch 'MDL-43089' of git://github.com/mkassaei/moodle

7 years agoMerge branch 'MDL-47426' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 6 Oct 2014 07:54:09 +0000 (08:54 +0100)]
Merge branch 'MDL-47426' of git://github.com/timhunt/moodle

7 years agoMDL-47538 phpunit: fix invalid PHPUNIT_SEQUENCE_START constant
Petr Skoda [Mon, 6 Oct 2014 04:31:15 +0000 (17:31 +1300)]
MDL-47538 phpunit: fix invalid PHPUNIT_SEQUENCE_START constant

7 years agoMDL-36014 cohorts: specify exact cohort names in unittest
Marina Glancy [Mon, 6 Oct 2014 01:50:29 +0000 (09:50 +0800)]
MDL-36014 cohorts: specify exact cohort names in unittest

7 years agoMDL-40351 block_course_overview: minor corrections
Marina Glancy [Mon, 6 Oct 2014 01:36:58 +0000 (09:36 +0800)]
MDL-40351 block_course_overview: minor corrections

7 years agoMDL-40351 Blocks, My home: Course Categories on the My Home Page
Julien Boulen [Fri, 3 Oct 2014 15:58:21 +0000 (17:58 +0200)]
MDL-40351 Blocks, My home: Course Categories on the My Home Page

7 years agoMDL-46547 gradebook: Update to print_grade_page_head
Adrian Greeve [Wed, 1 Oct 2014 07:41:56 +0000 (15:41 +0800)]
MDL-46547 gradebook: Update to print_grade_page_head

Upgrade to print_grade_page_head to include help messages in the
title of the page.

7 years agoMDL-46547 gradebook: grade import plugin for drag and drop.
Adrian Greeve [Fri, 19 Sep 2014 02:02:03 +0000 (10:02 +0800)]
MDL-46547 gradebook: grade import plugin for drag and drop.

This allows information to be dragged and dropped directly into a
form to be imported into the gradebook.

7 years agoMDL-46547 gradebook: Unit tests for new class importing csv files.
Adrian Greeve [Fri, 19 Sep 2014 02:04:17 +0000 (10:04 +0800)]
MDL-46547 gradebook: Unit tests for new class importing csv files.

7 years agoMDL-46547 gradebook: Moving gradebook csv import into a class.
Adrian Greeve [Fri, 19 Sep 2014 02:05:03 +0000 (10:05 +0800)]
MDL-46547 gradebook: Moving gradebook csv import into a class.

This allows plugins such as drag and drop to use / extend the class
and saves on duplicating code.

7 years agoMDL-47536 timezones: update to 2014h (2296 rules)
Eloy Lafuente (stronk7) [Sun, 5 Oct 2014 23:53:48 +0000 (01:53 +0200)]
MDL-47536 timezones: update to 2014h (2296 rules)