moodle.git
7 years agoMDL-33064 tests: remove code_test.php
Dan Poltawski [Thu, 23 Jan 2014 07:56:27 +0000 (15:56 +0800)]
MDL-33064 tests: remove code_test.php

This test was doing work which doesn't make sense as a unit test.
Perhaps the most sensible option would be to use a git hook. Here is
a replacement David Mudrák created:

$ cat .git/hooks/pre-commit
 #!/bin/bash

FOUND=$(git diff-index --cached -U0 HEAD -- | grep DONOTCOMMIT | wc -l)

if [[ $FOUND -gt 0 ]]; then
    echo "pre-commit hook: DONOTCOMMIT detected, commit not allowed"
    exit 1
fi

7 years agoweekly release 2.7dev
Eloy Lafuente (stronk7) [Thu, 16 Jan 2014 17:50:54 +0000 (18:50 +0100)]
weekly release 2.7dev

7 years agoNOBUG: Fixed file access permissions
Eloy Lafuente (stronk7) [Thu, 16 Jan 2014 17:50:54 +0000 (18:50 +0100)]
NOBUG: Fixed file access permissions

7 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
Eloy Lafuente (stronk7) [Thu, 16 Jan 2014 17:50:44 +0000 (18:50 +0100)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install

7 years agoMerge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Thu, 16 Jan 2014 08:35:22 +0000 (16:35 +0800)]
Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle

7 years agoMDL-40056 events: Use correct course module id while fetching context
Ankit Agarwal [Thu, 16 Jan 2014 08:31:06 +0000 (16:31 +0800)]
MDL-40056 events: Use correct course module id while fetching context

7 years agoMerge branch 'MDL-33952-master-fix2' of git://github.com/damyon/moodle
Dan Poltawski [Thu, 16 Jan 2014 01:40:58 +0000 (09:40 +0800)]
Merge branch 'MDL-33952-master-fix2' of git://github.com/damyon/moodle

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 16 Jan 2014 00:43:15 +0000 (00:43 +0000)]
Automatically generated installer lang files

7 years agoMerge branch 'master_MDL-43222' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Wed, 15 Jan 2014 21:02:12 +0000 (22:02 +0100)]
Merge branch 'master_MDL-43222' of git://github.com/danmarsden/moodle

7 years agoMDL-43222 SCORM: Fix invalid sql
Dan Marsden [Wed, 15 Jan 2014 20:48:04 +0000 (09:48 +1300)]
MDL-43222 SCORM: Fix invalid sql

7 years agoMDL-33952: mod_assignment Don't hide the modules on upgrade.
Damyon Wiese [Wed, 15 Jan 2014 08:47:30 +0000 (16:47 +0800)]
MDL-33952: mod_assignment Don't hide the modules on upgrade.

7 years agoMerge branch 'MDL-43621_master' of https://github.com/totara/openbadges
Damyon Wiese [Wed, 15 Jan 2014 05:17:31 +0000 (13:17 +0800)]
Merge branch 'MDL-43621_master' of https://github.com/totara/openbadges

7 years agoMDL-28448 Assign: Add a new capability that lets teachers mess with student submissions.
Damyon Wiese [Wed, 11 Dec 2013 08:59:23 +0000 (16:59 +0800)]
MDL-28448 Assign: Add a new capability that lets teachers mess with student submissions.

7 years agoMerge branch 'MDL-40912_master' of https://github.com/markn86/moodle
Dan Poltawski [Wed, 15 Jan 2014 03:41:05 +0000 (11:41 +0800)]
Merge branch 'MDL-40912_master' of https://github.com/markn86/moodle

7 years agoMDL-43621 badges: Fix has_awards() result when deleted users are the only recipients...
Yuliya Bozhko [Wed, 15 Jan 2014 03:24:37 +0000 (16:24 +1300)]
MDL-43621 badges: Fix has_awards() result when deleted users are the only recipients of a badge

7 years agoMDL-40912 coursecat: replaced 'hide' and 'show' add_to_log calls with an event
Mark Nelson [Tue, 31 Dec 2013 22:53:34 +0000 (14:53 -0800)]
MDL-40912 coursecat: replaced 'hide' and 'show' add_to_log calls with an event

7 years agoMDL-40912 coursecat: replaced 'move' add_to_log calls with an event
Mark Nelson [Tue, 31 Dec 2013 02:04:40 +0000 (18:04 -0800)]
MDL-40912 coursecat: replaced 'move' add_to_log calls with an event

7 years agoMDL-40912 coursecat: replaced 'update' add_to_log call with an event
Mark Nelson [Tue, 31 Dec 2013 00:47:57 +0000 (16:47 -0800)]
MDL-40912 coursecat: replaced 'update' add_to_log call with an event

7 years agoMDL-40912 coursecat: replaced 'add' add_to_log call with an event
Mark Nelson [Tue, 31 Dec 2013 00:03:21 +0000 (16:03 -0800)]
MDL-40912 coursecat: replaced 'add' add_to_log call with an event

7 years agoMerge branch 'MDL-43439_master-dateformat' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 15 Jan 2014 02:59:51 +0000 (03:59 +0100)]
Merge branch 'MDL-43439_master-dateformat' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-43461_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Wed, 15 Jan 2014 01:39:03 +0000 (09:39 +0800)]
Merge branch 'MDL-43461_master' of git://github.com/dmonllao/moodle

7 years agoMDL-43439 behat: Dir date without - separators
David Monllao [Wed, 15 Jan 2014 01:17:44 +0000 (09:17 +0800)]
MDL-43439 behat: Dir date without - separators

7 years agoMerge branch 'MDL-43619-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Wed, 15 Jan 2014 00:19:49 +0000 (08:19 +0800)]
Merge branch 'MDL-43619-master' of git://github.com/sammarshallou/moodle

7 years agoMerge branch 'MDL-43439_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 23:03:34 +0000 (00:03 +0100)]
Merge branch 'MDL-43439_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'w02_MDL-43524_m27_textcaching' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 21:08:46 +0000 (22:08 +0100)]
Merge branch 'w02_MDL-43524_m27_textcaching' of https://github.com/skodak/moodle

7 years agoMerge branch 'wip-MDL-31597-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 21:03:02 +0000 (22:03 +0100)]
Merge branch 'wip-MDL-31597-master' of git://github.com/abgreeve/moodle

Conflicts:
grade/tests/behat/behat_grade.php
grade/tests/behat/grade_view.feature

7 years agoMDL-43621 badges: Don't display deleted users in badge recipients list
Yuliya Bozhko [Thu, 9 Jan 2014 20:00:01 +0000 (09:00 +1300)]
MDL-43621 badges: Don't display deleted users in badge recipients list

7 years agoMerge branch 'MDL-43332_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 15:48:22 +0000 (16:48 +0100)]
Merge branch 'MDL-43332_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'master_MDL-43222' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 15:44:11 +0000 (16:44 +0100)]
Merge branch 'master_MDL-43222' of git://github.com/danmarsden/moodle

7 years agoMerge branch '35597-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 15:39:00 +0000 (16:39 +0100)]
Merge branch '35597-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'w02_MDL-43537_m27_env' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 15:01:27 +0000 (16:01 +0100)]
Merge branch 'w02_MDL-43537_m27_env' of https://github.com/skodak/moodle

7 years agoMDL-43619 Roles: reset_role_capabilities unit test, cache fix
sam marshall [Tue, 14 Jan 2014 13:44:17 +0000 (13:44 +0000)]
MDL-43619 Roles: reset_role_capabilities unit test, cache fix

7 years agoMDL-43619 Roles: reset_role_capabilities function destroys overrides
sam marshall [Wed, 8 Jan 2014 17:11:10 +0000 (17:11 +0000)]
MDL-43619 Roles: reset_role_capabilities function destroys overrides

7 years agoMerge branch 'MDL-43664-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 14 Jan 2014 08:50:07 +0000 (16:50 +0800)]
Merge branch 'MDL-43664-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-43584_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Tue, 14 Jan 2014 08:21:21 +0000 (16:21 +0800)]
Merge branch 'MDL-43584_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'm27_MDL-43577_Incorrect_Variable_Expansion' of https://github.com/scara...
Dan Poltawski [Tue, 14 Jan 2014 07:57:05 +0000 (15:57 +0800)]
Merge branch 'm27_MDL-43577_Incorrect_Variable_Expansion' of https://github.com/scara/moodle

7 years agoMerge branch 'MDL-43642_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 14 Jan 2014 07:48:49 +0000 (15:48 +0800)]
Merge branch 'MDL-43642_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'm27_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com...
Dan Poltawski [Tue, 14 Jan 2014 07:36:58 +0000 (15:36 +0800)]
Merge branch 'm27_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com/scara/moodle

7 years agoMerge branch 'MDL-43178_forum' of https://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 14 Jan 2014 07:26:52 +0000 (15:26 +0800)]
Merge branch 'MDL-43178_forum' of https://github.com/andyjdavis/moodle

7 years agoMerge branch 'MDL-43531-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 14 Jan 2014 07:18:37 +0000 (15:18 +0800)]
Merge branch 'MDL-43531-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-43439 behat: Save the screenshots to the specified location
David Monllao [Mon, 6 Jan 2014 08:33:11 +0000 (16:33 +0800)]
MDL-43439 behat: Save the screenshots to the specified location

7 years agoMerge branch 'master_MDL-41577' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 14 Jan 2014 07:00:11 +0000 (15:00 +0800)]
Merge branch 'master_MDL-41577' of git://github.com/danmarsden/moodle

7 years agoMerge branch 'w02_MDL-43529_m27_globals' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 14 Jan 2014 06:46:55 +0000 (14:46 +0800)]
Merge branch 'w02_MDL-43529_m27_globals' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-40918_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 14 Jan 2014 06:43:45 +0000 (14:43 +0800)]
Merge branch 'MDL-40918_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'w02_MDL-43511_m27_bankcache' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 14 Jan 2014 06:29:58 +0000 (14:29 +0800)]
Merge branch 'w02_MDL-43511_m27_bankcache' of https://github.com/skodak/moodle

7 years agoMDL-40313 question: build shifter after js changes
Dan Poltawski [Tue, 14 Jan 2014 06:28:15 +0000 (14:28 +0800)]
MDL-40313 question: build shifter after js changes

7 years agoMerge branch 'MDL-43302-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 14 Jan 2014 06:23:06 +0000 (14:23 +0800)]
Merge branch 'MDL-43302-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-40313' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 14 Jan 2014 06:21:06 +0000 (14:21 +0800)]
Merge branch 'MDL-40313' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-43371-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 14 Jan 2014 05:59:26 +0000 (13:59 +0800)]
Merge branch 'MDL-43371-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-43460-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 14 Jan 2014 05:25:44 +0000 (13:25 +0800)]
Merge branch 'MDL-43460-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'w02_MDL-43488_m27_signreq' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 14 Jan 2014 05:18:16 +0000 (13:18 +0800)]
Merge branch 'w02_MDL-43488_m27_signreq' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 14 Jan 2014 05:14:09 +0000 (13:14 +0800)]
Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle

7 years agoMDL-43461 testing: Avoid switching to .bat files when running MinGW
David Monllao [Wed, 8 Jan 2014 03:05:08 +0000 (11:05 +0800)]
MDL-43461 testing: Avoid switching to .bat files when running MinGW

MinGW can not execute .bat files (http://sourceforge.net/p/mingw/bugs/1902)
so we should not switch to .bat files when running MinGW.

7 years agoMDL-43461 behat: Using linux-style directory separators when using cygwin
David Monllao [Wed, 8 Jan 2014 01:40:11 +0000 (09:40 +0800)]
MDL-43461 behat: Using linux-style directory separators when using cygwin

7 years agoMerge branch 'MDL-35423-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 14 Jan 2014 05:06:54 +0000 (13:06 +0800)]
Merge branch 'MDL-35423-master' of git://github.com/andrewnicols/moodle

Conflicts:
course/yui/build/moodle-course-modchooser/moodle-course-modchooser-min.js
course/yui/dragdrop/dragdrop.js

7 years agoMDL-40056 events: Replace old add_to_log calls with new events
Ankit Agarwal [Tue, 7 Jan 2014 06:10:20 +0000 (14:10 +0800)]
MDL-40056 events: Replace old add_to_log calls with new events

7 years agoMDL-40056 events: Add unit tests for new events
Ankit Agarwal [Tue, 7 Jan 2014 06:09:43 +0000 (14:09 +0800)]
MDL-40056 events: Add unit tests for new events

7 years agoMDL-40056 events: Created Event classes to replace add_to_log() - mod_scorm
Ankit Agarwal [Tue, 7 Jan 2014 06:06:26 +0000 (14:06 +0800)]
MDL-40056 events: Created Event classes to replace add_to_log() - mod_scorm

Created attempt_deleted event
Created interactions_viewed event
Created report_viewed event
Created sco_launched event
Created tracks_viewed event
Created user_report_viewed event
Created course module related events

7 years agoMDL-31597 gradebook: Update to gradebook behat tests to include testing grade weightings.
Adrian Greeve [Thu, 9 Jan 2014 08:03:57 +0000 (16:03 +0800)]
MDL-31597 gradebook: Update to gradebook behat tests to include testing grade weightings.

7 years agoMDL-31597 gradebook: Removed the percentage symbol from weights in the gradebook.
Adrian Greeve [Thu, 9 Jan 2014 08:03:16 +0000 (16:03 +0800)]
MDL-31597 gradebook: Removed the percentage symbol from weights in the gradebook.

7 years agoMDL-43332 core_grades: automated basic grade viewing functionality performed in MDLQA-317
Mark Nelson [Mon, 30 Dec 2013 22:20:06 +0000 (14:20 -0800)]
MDL-43332 core_grades: automated basic grade viewing functionality performed in MDLQA-317

7 years agoMerge branch 'MDL-43610-m' of git://github.com/micaherne/moodle
Damyon Wiese [Tue, 14 Jan 2014 03:57:09 +0000 (11:57 +0800)]
Merge branch 'MDL-43610-m' of git://github.com/micaherne/moodle

7 years agoMerge branch 'master_MDL-42792' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 14 Jan 2014 03:28:39 +0000 (11:28 +0800)]
Merge branch 'master_MDL-42792' of git://github.com/danmarsden/moodle

7 years agoMDL-34347 remove all problematic global text caching
Petr Škoda [Tue, 31 Dec 2013 07:33:59 +0000 (15:33 +0800)]
MDL-34347 remove all problematic global text caching

Instead we will create new MUC caches inside each filter plugin.
Please note that all cache filters should work with local caches
without the need of strict cache invalidation.

7 years agoMerge branch 'MDL-43412' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 14 Jan 2014 02:46:22 +0000 (10:46 +0800)]
Merge branch 'MDL-43412' of git://github.com/timhunt/moodle

7 years agoMDL-43664 Javascript: Use YUI indexOf for pending_js tracking
Andrew Nicols [Mon, 13 Jan 2014 06:44:18 +0000 (14:44 +0800)]
MDL-43664 Javascript: Use YUI indexOf for pending_js tracking

Some old browsers do not support indexOf and so cannot determine whether JS
script is in progress. The YUI Y.Array module polyfills the indexOf
functionality when it does not exist.

7 years agoMDL-33952 Assignment: Remove behat tests for mod_assignment - it is not a real activi...
Damyon Wiese [Tue, 14 Jan 2014 01:57:05 +0000 (09:57 +0800)]
MDL-33952 Assignment: Remove behat tests for mod_assignment - it is not a real activity anymore.

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 14 Jan 2014 00:45:37 +0000 (00:45 +0000)]
Automatically generated installer lang files

7 years agoMDL-43332 core_grades: automated basic grade viewing functionality performed in MDLQA-317
Mark Nelson [Mon, 30 Dec 2013 22:20:06 +0000 (14:20 -0800)]
MDL-43332 core_grades: automated basic grade viewing functionality performed in MDLQA-317

7 years agoMerge branch 'MDL-43109' of https://github.com/mdikih/moodle
Eloy Lafuente (stronk7) [Mon, 13 Jan 2014 20:51:27 +0000 (21:51 +0100)]
Merge branch 'MDL-43109' of https://github.com/mdikih/moodle

7 years agoMDL-43575 Libraries Google_CurlIO ext, typo in the overridden setOption().
Matteo Scaramuccia [Mon, 30 Dec 2013 17:51:25 +0000 (18:51 +0100)]
MDL-43575 Libraries Google_CurlIO ext, typo in the overridden setOption().

7 years agoMDL-43577 Messages Incorrect variable expansion in the message template.
Matteo Scaramuccia [Sun, 5 Jan 2014 12:42:12 +0000 (13:42 +0100)]
MDL-43577 Messages Incorrect variable expansion in the message template.

7 years agoMerge branch 'MDL-43395-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 13 Jan 2014 18:10:13 +0000 (19:10 +0100)]
Merge branch 'MDL-43395-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'MDL-33600-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Mon, 13 Jan 2014 15:31:00 +0000 (16:31 +0100)]
Merge branch 'MDL-33600-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-40849-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 13 Jan 2014 07:38:22 +0000 (15:38 +0800)]
Merge branch 'MDL-40849-master' of git://github.com/FMCorz/moodle

7 years agoMDL-40849 gradingform_guide: Fixed CSS issues with Bootstrapbase
Frederic Massart [Tue, 7 Jan 2014 10:29:39 +0000 (11:29 +0100)]
MDL-40849 gradingform_guide: Fixed CSS issues with Bootstrapbase

7 years agoMerge branch 'MDL-33952-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 13 Jan 2014 04:55:36 +0000 (12:55 +0800)]
Merge branch 'MDL-33952-master' of git://github.com/damyon/moodle

Conflicts:
mod/assignment/lang/en/assignment.php

7 years agoMerge branch '43598-43262-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 13 Jan 2014 04:42:13 +0000 (12:42 +0800)]
Merge branch '43598-43262-27' of git://github.com/samhemelryk/moodle

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

7 years agoMerge branch 'MDL-39603-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 13 Jan 2014 04:34:53 +0000 (12:34 +0800)]
Merge branch 'MDL-39603-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-43262-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 13 Jan 2014 04:11:17 +0000 (12:11 +0800)]
Merge branch 'MDL-43262-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch '41226-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 13 Jan 2014 03:11:10 +0000 (11:11 +0800)]
Merge branch '41226-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '40821-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 13 Jan 2014 03:02:18 +0000 (11:02 +0800)]
Merge branch '40821-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '40693-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 13 Jan 2014 02:07:53 +0000 (10:07 +0800)]
Merge branch '40693-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-41152-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 13 Jan 2014 02:03:51 +0000 (10:03 +0800)]
Merge branch 'MDL-41152-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-40205 theme: fixed overflow of block headers
Sam Hemelryk [Wed, 8 Jan 2014 01:24:16 +0000 (14:24 +1300)]
MDL-40205 theme: fixed overflow of block headers

7 years agoMerge branch 'MDL-40705-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 13 Jan 2014 01:35:50 +0000 (09:35 +0800)]
Merge branch 'MDL-40705-master' of git://github.com/FMCorz/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-39661-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 13 Jan 2014 00:54:22 +0000 (08:54 +0800)]
Merge branch 'MDL-39661-master' of git://github.com/FMCorz/moodle

7 years agoMDL-43395 dml: warn about invalid limit params
Dan Poltawski [Mon, 16 Dec 2013 05:05:20 +0000 (13:05 +0800)]
MDL-43395 dml: warn about invalid limit params

Help developers to find bugs by throwing a DEBUG_DEVELOPER message
rather than ignoring this case completely.

7 years agoMDL-43598 dialogue: fixed bug with render procedure
Sam Hemelryk [Tue, 7 Jan 2014 22:47:47 +0000 (11:47 +1300)]
MDL-43598 dialogue: fixed bug with render procedure

7 years agoMDL-43262 JavaScript: Correct use of centered attribute override
Andrew Nicols [Sun, 8 Dec 2013 15:26:59 +0000 (23:26 +0800)]
MDL-43262 JavaScript: Correct use of centered attribute override

This should be done using an attribute modification, rather than at the
constructor level.

7 years agoMDL-43262 JavaScript: Correct visible attribute override
Andrew Nicols [Sun, 8 Dec 2013 14:54:58 +0000 (22:54 +0800)]
MDL-43262 JavaScript: Correct visible attribute override

This should be done using an attribute modification, rather than at the
constructor level.

7 years agoMDL-43262 JavaScript: Correct width attribute override
Andrew Nicols [Sun, 8 Dec 2013 14:49:13 +0000 (22:49 +0800)]
MDL-43262 JavaScript: Correct width attribute override

This should be done using an attribute modification, rather than at the
constructor level.

7 years agoMDL-40821 theme_bootstrapbase: fixed positioning of profile controls
Sam Hemelryk [Tue, 7 Jan 2014 04:52:59 +0000 (17:52 +1300)]
MDL-40821 theme_bootstrapbase: fixed positioning of profile controls

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMDL-40821 theme_bootstrapbase: show the current lang in the menu
Sam Hemelryk [Tue, 7 Jan 2014 04:40:28 +0000 (17:40 +1300)]
MDL-40821 theme_bootstrapbase: show the current lang in the menu

7 years agoMDL-40693 theme_bootstrapbase: changed navbar separator to official separator
Sam Hemelryk [Tue, 7 Jan 2014 05:07:07 +0000 (18:07 +1300)]
MDL-40693 theme_bootstrapbase: changed navbar separator to official separator

7 years agoMDL-35597 admin-plugins: are now sorted alphabetically
Sam Hemelryk [Wed, 11 Dec 2013 21:02:22 +0000 (10:02 +1300)]
MDL-35597 admin-plugins: are now sorted alphabetically

7 years agoMDL-35597 admin: categories now support localised alphabetical sorting
Sam Hemelryk [Wed, 27 Nov 2013 21:57:14 +0000 (10:57 +1300)]
MDL-35597 admin: categories now support localised alphabetical sorting

7 years agoMDL-43488 remoe city and country requirement from signup
Petr Škoda [Sun, 29 Dec 2013 08:17:52 +0000 (16:17 +0800)]
MDL-43488 remoe city and country requirement from signup

This was supposed to be part of MDL-28558.

7 years agoMDL-43511 do not cache the MUC cache in question code
Petr Škoda [Sun, 29 Dec 2013 07:46:50 +0000 (15:46 +0800)]
MDL-43511 do not cache the MUC cache in question code

7 years agoMDL-43537 drop some more unused ancient admin strings
Petr Škoda [Thu, 2 Jan 2014 06:06:37 +0000 (14:06 +0800)]
MDL-43537 drop some more unused ancient admin strings