moodle.git
7 years agoMerge branch 'MDL-41644' of git://github.com/apsdehal/moodle
Sam Hemelryk [Tue, 11 Feb 2014 20:24:06 +0000 (09:24 +1300)]
Merge branch 'MDL-41644' of git://github.com/apsdehal/moodle

7 years agoMerge branch 'wip-mdl-43289' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 11 Feb 2014 20:21:54 +0000 (09:21 +1300)]
Merge branch 'wip-mdl-43289' of git://github.com/rajeshtaneja/moodle

7 years agoMerge branch '28567-27' of git://github.com/samhemelryk/moodle
Marina Glancy [Tue, 11 Feb 2014 06:42:23 +0000 (14:42 +0800)]
Merge branch '28567-27' of git://github.com/samhemelryk/moodle

7 years agoMDL-42505 whitespace correction
Marina Glancy [Tue, 11 Feb 2014 06:36:41 +0000 (14:36 +0800)]
MDL-42505 whitespace correction

7 years agoMerge branch 'MDL-42505-Feedback-Inappropriate-use-of-fieldset-tags-around-cancel...
Marina Glancy [Tue, 11 Feb 2014 06:13:39 +0000 (14:13 +0800)]
Merge branch 'MDL-42505-Feedback-Inappropriate-use-of-fieldset-tags-around-cancel-button' of git://github.com/michael-milette/moodle

7 years agoMerge branch 'MDL-43941-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 11 Feb 2014 01:10:52 +0000 (14:10 +1300)]
Merge branch 'MDL-43941-master' of git://github.com/andrewnicols/moodle

Conflicts:
course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-min.js

7 years agoMerge branch 'MDL-43338-master' of https://github.com/jamiepratt/moodle
Eloy Lafuente (stronk7) [Mon, 10 Feb 2014 23:26:29 +0000 (00:26 +0100)]
Merge branch 'MDL-43338-master' of https://github.com/jamiepratt/moodle

7 years agoMerge branch 'MDL-43994-im' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 10 Feb 2014 20:32:32 +0000 (09:32 +1300)]
Merge branch 'MDL-43994-im' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-43929' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 10 Feb 2014 19:27:35 +0000 (08:27 +1300)]
Merge branch 'MDL-43929' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-44053' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 10 Feb 2014 15:48:26 +0000 (16:48 +0100)]
Merge branch 'MDL-44053' of git://github.com/timhunt/moodle

7 years agoMerge branch '43977-27' of git://github.com/samhemelryk/moodle
Marina Glancy [Mon, 10 Feb 2014 10:15:57 +0000 (18:15 +0800)]
Merge branch '43977-27' of git://github.com/samhemelryk/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-43289 mod_assign: Creation of new submission events.
Adrian Greeve [Mon, 16 Dec 2013 05:58:03 +0000 (13:58 +0800)]
MDL-43289 mod_assign: Creation of new submission events.

New events have been created for submission plugins. This is
part of the consistancy move by adding the same type of event through
all of the modules.

AMOS BEGIN
 MOV [event_submission_updated,mod_assign],[eventsubmissionupdated,mod_assign]
AMOS END

7 years agoMerge branch 'MDL-44059-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 10 Feb 2014 02:58:36 +0000 (15:58 +1300)]
Merge branch 'MDL-44059-master' of git://github.com/ankitagarwal/moodle

7 years agoMDL-44059 libraries: Add a method to return html for row instead of just printing it
Ankit Agarwal [Fri, 17 Jan 2014 05:42:47 +0000 (13:42 +0800)]
MDL-44059 libraries: Add a method to return html for row instead of just printing it

7 years agoMerge branch 'wip_master_mdl-32724' of https://github.com/iarenaza/moodle
Sam Hemelryk [Mon, 10 Feb 2014 02:26:05 +0000 (15:26 +1300)]
Merge branch 'wip_master_mdl-32724' of https://github.com/iarenaza/moodle

7 years agoMerge branch 'MDL-43774_master' of https://github.com/totara/openbadges
Sam Hemelryk [Mon, 10 Feb 2014 02:21:41 +0000 (15:21 +1300)]
Merge branch 'MDL-43774_master' of https://github.com/totara/openbadges

7 years agoMerge branch 'MDL-43267-master-3' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 10 Feb 2014 01:53:51 +0000 (14:53 +1300)]
Merge branch 'MDL-43267-master-3' of git://github.com/andrewnicols/moodle

7 years agoMDL-43941 Behat: Section visibility tests should not check if activities are visible
Andrew Nicols [Mon, 10 Feb 2014 01:36:03 +0000 (09:36 +0800)]
MDL-43941 Behat: Section visibility tests should not check if activities are visible

It should be possible for activities to be visible even when the section
they are in is hidden.

However, when a section is hidden, all activities in that section are also
then initially hidden. Therefore, this commit splits out the hidden test to
a new test so that the initial state of activities after hiding can still
be tested.

7 years agoMDL-43941 Course: Allow AJAX show/hide of activities in hidden and orphaned sections
Andrew Nicols [Mon, 3 Feb 2014 11:55:43 +0000 (19:55 +0800)]
MDL-43941 Course: Allow AJAX show/hide of activities in hidden and orphaned sections

7 years agoMerge branch 'MDL-40938-27' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 10 Feb 2014 01:16:12 +0000 (14:16 +1300)]
Merge branch 'MDL-40938-27' of git://github.com/lazydaisy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-43200' of git://github.com/apsdehal/moodle
Sam Hemelryk [Mon, 10 Feb 2014 01:11:25 +0000 (14:11 +1300)]
Merge branch 'MDL-43200' of git://github.com/apsdehal/moodle

7 years agoMDL-43994 Blocks: Hide the move icon when blocks are docked on Afterburner too
Andrew Nicols [Mon, 10 Feb 2014 00:50:02 +0000 (08:50 +0800)]
MDL-43994 Blocks: Hide the move icon when blocks are docked on Afterburner too

7 years agoMerge branch 'MDL-42882-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 10 Feb 2014 00:12:57 +0000 (13:12 +1300)]
Merge branch 'MDL-42882-master' of git://github.com/danpoltawski/moodle

7 years agoMDL-44056 question: added new default property to unit tests
Sam Hemelryk [Sun, 9 Feb 2014 23:56:36 +0000 (12:56 +1300)]
MDL-44056 question: added new default property to unit tests

7 years agoMerge branch 'MDL-43684-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 9 Feb 2014 22:32:13 +0000 (11:32 +1300)]
Merge branch 'MDL-43684-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-44056' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 9 Feb 2014 22:30:12 +0000 (11:30 +1300)]
Merge branch 'MDL-44056' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-43838_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Sun, 9 Feb 2014 22:27:00 +0000 (11:27 +1300)]
Merge branch 'MDL-43838_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-43969-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 9 Feb 2014 20:48:19 +0000 (09:48 +1300)]
Merge branch 'MDL-43969-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-43992-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 9 Feb 2014 20:40:13 +0000 (09:40 +1300)]
Merge branch 'MDL-43992-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-44020-MASTER' of git://github.com/jleyva/moodle
Sam Hemelryk [Sun, 9 Feb 2014 20:30:57 +0000 (09:30 +1300)]
Merge branch 'MDL-44020-MASTER' of git://github.com/jleyva/moodle

7 years agoMerge branch 'MDL-44046' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Sun, 9 Feb 2014 20:28:08 +0000 (09:28 +1300)]
Merge branch 'MDL-44046' of https://github.com/merrill-oakland/moodle

7 years agoMerge branch 'MDL-43978_master' of https://github.com/totara/openbadges
Sam Hemelryk [Sun, 9 Feb 2014 20:23:51 +0000 (09:23 +1300)]
Merge branch 'MDL-43978_master' of https://github.com/totara/openbadges

7 years agoMDL-43994 theme_bootstrapbase: consistent commenting between themes
Sam Hemelryk [Sun, 9 Feb 2014 20:10:20 +0000 (09:10 +1300)]
MDL-43994 theme_bootstrapbase: consistent commenting between themes

7 years agoMerge branch 'MDL-43994-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 9 Feb 2014 20:06:31 +0000 (09:06 +1300)]
Merge branch 'MDL-43994-master' of git://github.com/andrewnicols/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-43804 theme: amended upgrade.txt with more information
Sam Hemelryk [Sun, 9 Feb 2014 20:04:54 +0000 (09:04 +1300)]
MDL-43804 theme: amended upgrade.txt with more information

7 years agoMerge branch 'MDL-43804-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 9 Feb 2014 19:50:23 +0000 (08:50 +1300)]
Merge branch 'MDL-43804-master' of git://github.com/ankitagarwal/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-44029-quiz-group-delete-handler-bug' of https://github.com/mpetrowi...
Sam Hemelryk [Sun, 9 Feb 2014 19:44:39 +0000 (08:44 +1300)]
Merge branch 'MDL-44029-quiz-group-delete-handler-bug' of https://github.com/mpetrowi/moodle

7 years agoMerge branch 'MDL-43946' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Sun, 9 Feb 2014 19:42:55 +0000 (08:42 +1300)]
Merge branch 'MDL-43946' of https://github.com/merrill-oakland/moodle

7 years agoMDL-43977 theme_bootstrapbase: small fix to make custom menu work with JS disabled
Sam Hemelryk [Thu, 6 Feb 2014 22:07:39 +0000 (11:07 +1300)]
MDL-43977 theme_bootstrapbase: small fix to make custom menu work with JS disabled

7 years agoMLD-28567 calendar: improved course filter process
Sam Hemelryk [Wed, 29 Jan 2014 20:39:11 +0000 (09:39 +1300)]
MLD-28567 calendar: improved course filter process

7 years agoMDL-44053 question restore from 2.0: fix regression from MDL-43670
Tim Hunt [Fri, 7 Feb 2014 22:13:44 +0000 (22:13 +0000)]
MDL-44053 question restore from 2.0: fix regression from MDL-43670

7 years agoMDL-44056 questions: restore essay attempts from 2.0 notice.
Tim Hunt [Sun, 9 Feb 2014 17:47:39 +0000 (17:47 +0000)]
MDL-44056 questions: restore essay attempts from 2.0 notice.

7 years agoMDL-40938 theme_bootstrapbase: Fix for text fields in login block.
Mary Evans [Sun, 9 Feb 2014 00:45:46 +0000 (00:45 +0000)]
MDL-40938 theme_bootstrapbase: Fix for text fields in login block.

7 years agoMDL-43929 question manual grading: keep comment when validation fails.
Tim Hunt [Thu, 6 Feb 2014 15:00:56 +0000 (15:00 +0000)]
MDL-43929 question manual grading: keep comment when validation fails.

If the validation failed, so the manual grading page was re-displayed
with a validation error, then any comment that had just been typed in
was getting lost. This fixes that.

7 years agoMDL-44046 gradebook Reduce duplicates returned during sortorder fixing.
Eric Merrill [Fri, 7 Feb 2014 14:29:12 +0000 (09:29 -0500)]
MDL-44046 gradebook Reduce duplicates returned during sortorder fixing.

7 years agoMDL-44020 Add core_calendar_get_calendar_events function to the moodle mobile core...
Juan Leyva [Fri, 7 Feb 2014 11:23:33 +0000 (12:23 +0100)]
MDL-44020 Add core_calendar_get_calendar_events function to the moodle mobile core service

7 years agoMDL-43994 Blocks: Hide the move icon when blocks are docked
Andrew Nicols [Thu, 6 Feb 2014 06:43:16 +0000 (14:43 +0800)]
MDL-43994 Blocks: Hide the move icon when blocks are docked

7 years agoMDL-43992 Javascript: Remove <return> key listener for confirmation
Andrew Nicols [Wed, 5 Feb 2014 04:14:01 +0000 (12:14 +0800)]
MDL-43992 Javascript: Remove <return> key listener for confirmation

The listener was previously confirming, even when the cancel or 'No'
buttons were selected. However, having the default action as 'Confirm'
seems dangerous in this situation, so removing this option entirely.

7 years agoMDL-43969 Forms: Adjust ARIA attributes for short forms
Andrew Nicols [Tue, 4 Feb 2014 03:55:14 +0000 (11:55 +0800)]
MDL-43969 Forms: Adjust ARIA attributes for short forms

The aria-live="polite" attribute is incorrectly added to the fieldset,
causing the entire fieldset to be read out on change in some browsers. This
is unnecessary.
It also does not announce the current state of the fieldset (collaped or
open) and should.

7 years agoMDL-43267 Javascript: Improve focus before and after drag/drop
Andrew Nicols [Wed, 29 Jan 2014 16:36:19 +0000 (00:36 +0800)]
MDL-43267 Javascript: Improve focus before and after drag/drop

7 years agoMDL-43338 quiz statistics : refactoring question statistics code
James Pratt [Wed, 11 Dec 2013 09:59:27 +0000 (16:59 +0700)]
MDL-43338 quiz statistics : refactoring question statistics code

to improve readability and maintainability.

7 years agoMDL-43267 Javascript: Remove aria drag/drop related attributes for drag/drop
Andrew Nicols [Wed, 29 Jan 2014 16:35:02 +0000 (00:35 +0800)]
MDL-43267 Javascript: Remove aria drag/drop related attributes for drag/drop

Since we provide an alternative interface rather than describing the
locations for each drop, we should not add aria-grabbed, or
aria-dropeffect.

7 years agoMDL-43267 Javascript: Improve accessibility of keyboard move
Andrew Nicols [Wed, 29 Jan 2014 16:32:25 +0000 (00:32 +0800)]
MDL-43267 Javascript: Improve accessibility of keyboard move

Change the keyboard move descriptions to allow for more detailed
descriptions such as:
* "After 'X'"; or
* "To top of section 'Y'"

7 years agoweekly release 2.7dev
Sam Hemelryk [Thu, 6 Feb 2014 22:46:00 +0000 (11:46 +1300)]
weekly release 2.7dev

7 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
Sam Hemelryk [Thu, 6 Feb 2014 22:45:55 +0000 (11:45 +1300)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install

7 years agoMDL-43978 badges: Fix lang string
Yuliya Bozhko [Thu, 6 Feb 2014 20:11:15 +0000 (09:11 +1300)]
MDL-43978 badges: Fix lang string

7 years agoMDL-44029 mod_quiz: Fixing group deleted handler so it does not remove user overrides.
Matt Petro [Thu, 6 Feb 2014 18:32:04 +0000 (13:32 -0500)]
MDL-44029 mod_quiz: Fixing group deleted handler so it does not remove user overrides.

7 years agoMDL-43687 Javascript: Correct instantiation of the question-preview
Andrew Nicols [Thu, 6 Feb 2014 05:33:41 +0000 (13:33 +0800)]
MDL-43687 Javascript: Correct instantiation of the question-preview

This addresses issues discovered during testing, including:
* inclusion of the M.core_question_preview metadata;
* inclusion of required strings; and
* correcting a function signature.

7 years agoMDL-43926 files: Unit tests cannot assume id values.
Russell Smith [Wed, 5 Feb 2014 12:23:38 +0000 (23:23 +1100)]
MDL-43926 files: Unit tests cannot assume id values.

7 years agoMerge branch 'MDL-43936' of git://github.com/timhunt/moodle
Sam Hemelryk [Wed, 5 Feb 2014 21:04:04 +0000 (10:04 +1300)]
Merge branch 'MDL-43936' of git://github.com/timhunt/moodle

7 years agoMDL-43946 gradebook upgrade Improve SQL to find duplicate sortorders.
Eric Merrill [Wed, 5 Feb 2014 14:56:34 +0000 (09:56 -0500)]
MDL-43946 gradebook upgrade Improve SQL to find duplicate sortorders.

7 years agoMDL-43936 questions: fix my lame spelling in upgrade.txt.
Tim Hunt [Wed, 5 Feb 2014 11:23:42 +0000 (11:23 +0000)]
MDL-43936 questions: fix my lame spelling in upgrade.txt.

Thanks to Mark Nelson for the suggested improvements.

7 years agoMerge branch 'MDL-42339' of git://github.com/rwijaya/moodle
Marina Glancy [Wed, 5 Feb 2014 07:56:30 +0000 (15:56 +0800)]
Merge branch 'MDL-42339' of git://github.com/rwijaya/moodle

7 years agoMDL-42339 - removed double formatting for set_title() and set_heading()
Rossiani Wijaya [Wed, 5 Feb 2014 06:47:23 +0000 (14:47 +0800)]
MDL-42339 - removed double formatting for set_title() and set_heading()

7 years agoMDL-42882 upgrade: Improvements to upgrade code
Dan Poltawski [Wed, 5 Feb 2014 06:38:39 +0000 (14:38 +0800)]
MDL-42882 upgrade: Improvements to upgrade code

Suggested by Petr:
* Don't rely on single user for upgrade
* Make the pathnamehash generation a bit clearer (and add
  a test to verify its correctly formed).

7 years agoMDL-42425 assign: bumping version for new web services to take effect
Marina Glancy [Wed, 5 Feb 2014 06:32:27 +0000 (14:32 +0800)]
MDL-42425 assign: bumping version for new web services to take effect

7 years agoMerge branch '38923-27' of git://github.com/samhemelryk/moodle
Marina Glancy [Wed, 5 Feb 2014 04:49:02 +0000 (12:49 +0800)]
Merge branch '38923-27' of git://github.com/samhemelryk/moodle

7 years agoMDL-38923 theme_bootstrapbase: pre-integration fixups
Sam Hemelryk [Tue, 4 Feb 2014 20:42:45 +0000 (09:42 +1300)]
MDL-38923 theme_bootstrapbase: pre-integration fixups

* Fixed the way we added the block class to the dock panel in dock.js
* Added a class to the h2 that is used to test dock title width
* Fixed RTL alignment issues as best I could at present
* Fixed overlap of dock + navbar on small screens
* Fixed the docked block width to be constrained to the available space
* Fixed hidden actions on docked blocks

7 years agoMerge branch 'MDL-41757-master' of https://github.com/jamiepratt/moodle
Sam Hemelryk [Tue, 4 Feb 2014 23:36:52 +0000 (12:36 +1300)]
Merge branch 'MDL-41757-master' of https://github.com/jamiepratt/moodle

7 years agoMerge branch 'MDL-41756-master' of https://github.com/jamiepratt/moodle
Sam Hemelryk [Tue, 4 Feb 2014 23:35:11 +0000 (12:35 +1300)]
Merge branch 'MDL-41756-master' of https://github.com/jamiepratt/moodle

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

7 years agoMerge branch 'MDL-42425' of https://github.com/Lightwork-Marking/moodle
Eloy Lafuente (stronk7) [Tue, 4 Feb 2014 22:56:27 +0000 (23:56 +0100)]
Merge branch 'MDL-42425' of https://github.com/Lightwork-Marking/moodle

7 years agoMerge branch 'MDL-43027-master' of git://github.com/jamiepratt/moodle
Sam Hemelryk [Tue, 4 Feb 2014 22:44:49 +0000 (11:44 +1300)]
Merge branch 'MDL-43027-master' of git://github.com/jamiepratt/moodle

7 years agoMerge branch 'MDL-43952-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 4 Feb 2014 22:29:32 +0000 (11:29 +1300)]
Merge branch 'MDL-43952-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-38923 dock: allowed for space before first time
Sam Hemelryk [Thu, 23 Jan 2014 20:42:39 +0000 (09:42 +1300)]
MDL-38923 dock: allowed for space before first time

7 years agoMDL-38923 theme_bootstrapbase: tidied up dock implementation
Sam Hemelryk [Wed, 8 Jan 2014 22:50:50 +0000 (11:50 +1300)]
MDL-38923 theme_bootstrapbase: tidied up dock implementation

Also:
* Changed to a CSS based compacting solution
* Converted dock colours to variables
* RTL fixes for the dock

7 years agoMDL-38923 theme bootstrapbase: theme clean: enable docking
Bas Brands [Fri, 25 Oct 2013 08:12:50 +0000 (10:12 +0200)]
MDL-38923 theme bootstrapbase: theme clean: enable docking

7 years agoMDL-43774 badges: Stop overriding default course navigation
Yuliya Bozhko [Tue, 4 Feb 2014 21:46:34 +0000 (10:46 +1300)]
MDL-43774 badges: Stop overriding default course navigation

7 years agoMDL-43978 badges: Display error message to guest users viewing "My Badges" page
Yuliya Bozhko [Tue, 4 Feb 2014 20:52:32 +0000 (09:52 +1300)]
MDL-43978 badges: Display error message to guest users viewing "My Badges" page

7 years agoMDL-32724: LDAP Auth function user_update() returns true even if update has failed
Iñaki Arenaza [Tue, 4 Feb 2014 18:21:45 +0000 (19:21 +0100)]
MDL-32724: LDAP Auth function user_update() returns true even if update has failed

7 years agoMDL-43200 WebServices: Reset Instance variable
apsdehal [Tue, 4 Feb 2014 14:08:34 +0000 (19:38 +0530)]
MDL-43200 WebServices: Reset Instance variable

7 years agoMerge branch 'MDL-43911-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 4 Feb 2014 09:53:17 +0000 (10:53 +0100)]
Merge branch 'MDL-43911-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'wip-MDL-41384-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 4 Feb 2014 09:11:42 +0000 (10:11 +0100)]
Merge branch 'wip-MDL-41384-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-41754-master' of git://github.com/jamiepratt/moodle
Marina Glancy [Tue, 4 Feb 2014 07:44:51 +0000 (15:44 +0800)]
Merge branch 'MDL-41754-master' of git://github.com/jamiepratt/moodle

7 years agoMDL-43805 assign: Prevent behat fail on ci - editpdf is not available there
Damyon Wiese [Tue, 4 Feb 2014 05:37:06 +0000 (13:37 +0800)]
MDL-43805 assign: Prevent behat fail on ci - editpdf is not available there

Ghostscript is not setup on the ci servers, so the editpdf feature will be automatically
disabled. This means that I cannot click on "Hide Annotate PDF".

7 years agoMerge branch 'MDL-43369-master' of git://github.com/jamiepratt/moodle
Sam Hemelryk [Tue, 4 Feb 2014 02:50:48 +0000 (15:50 +1300)]
Merge branch 'MDL-43369-master' of git://github.com/jamiepratt/moodle

7 years agoMDL-42428 Javascript: Switch M.util.show_confirm_dialog to use moodle-core-notification
Andrew Nicols [Tue, 28 Jan 2014 06:59:21 +0000 (14:59 +0800)]
MDL-42428 Javascript: Switch M.util.show_confirm_dialog to use moodle-core-notification

7 years agoMerge branch 'MDL-43538-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 4 Feb 2014 01:17:39 +0000 (14:17 +1300)]
Merge branch 'MDL-43538-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-43952 Javascript: Support invalidation of browser caches for YUI patching
Andrew Nicols [Mon, 3 Feb 2014 03:59:26 +0000 (11:59 +0800)]
MDL-43952 Javascript: Support invalidation of browser caches for YUI patching

This will also force files loaded from the CDN to instead come from the
local distribution since those patches will not be included in the CDN
release.

Please see the documentation at http://docs.moodle.org/dev/YUI/Patching for
important on using these changes.

7 years agoMDL-42456: add Mercurial vcs support to plugin_external_source
Oleg Sychev [Fri, 24 Jan 2014 23:41:01 +0000 (02:41 +0300)]
MDL-42456: add Mercurial vcs support to plugin_external_source

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 4 Feb 2014 00:42:01 +0000 (00:42 +0000)]
Automatically generated installer lang files

7 years agoMerge branch 'MDL-33064-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 3 Feb 2014 23:59:58 +0000 (00:59 +0100)]
Merge branch 'MDL-33064-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'MDL-43885-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 3 Feb 2014 23:41:00 +0000 (12:41 +1300)]
Merge branch 'MDL-43885-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-43687' of https://github.com/mkassaei/moodle
Eloy Lafuente (stronk7) [Mon, 3 Feb 2014 23:16:48 +0000 (00:16 +0100)]
Merge branch 'MDL-43687' of https://github.com/mkassaei/moodle

7 years agoMerge branch 'wip-MDL-43821-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 3 Feb 2014 23:11:20 +0000 (00:11 +0100)]
Merge branch 'wip-MDL-43821-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'wip-MDL-43828-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 3 Feb 2014 22:58:07 +0000 (23:58 +0100)]
Merge branch 'wip-MDL-43828-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-43886-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 3 Feb 2014 22:14:11 +0000 (11:14 +1300)]
Merge branch 'MDL-43886-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js

7 years agoMerge branch 'MDL-43892' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 3 Feb 2014 21:57:26 +0000 (10:57 +1300)]
Merge branch 'MDL-43892' of git://github.com/timhunt/moodle

7 years agoMerge branch 'wip-MDL-33920-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 3 Feb 2014 21:47:00 +0000 (10:47 +1300)]
Merge branch 'wip-MDL-33920-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-43893-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 3 Feb 2014 21:23:24 +0000 (10:23 +1300)]
Merge branch 'MDL-43893-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'w04_MDL-43903_m27_mssqltests' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 3 Feb 2014 21:22:42 +0000 (10:22 +1300)]
Merge branch 'w04_MDL-43903_m27_mssqltests' of https://github.com/skodak/moodle