moodle.git
12 years agoMerge branch 'MDL-32898-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 10 Jun 2013 22:31:55 +0000 (10:31 +1200)]
Merge branch 'MDL-32898-master' of git://github.com/ankitagarwal/moodle

12 years agoMerge branch 'wip-mdl-34508' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 10 Jun 2013 22:29:11 +0000 (10:29 +1200)]
Merge branch 'wip-mdl-34508' of git://github.com/rajeshtaneja/moodle

12 years agoMerge branch 'MDL-39947' of https://github.com/aolley/moodle
Dan Poltawski [Mon, 10 Jun 2013 08:19:56 +0000 (16:19 +0800)]
Merge branch 'MDL-39947' of https://github.com/aolley/moodle

12 years agoMerge branch 'MDL-39338_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 10 Jun 2013 08:06:22 +0000 (16:06 +0800)]
Merge branch 'MDL-39338_master' of git://github.com/lazydaisy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

12 years agoMerge branch 'm26_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile' of https://github.com...
Dan Poltawski [Mon, 10 Jun 2013 07:42:45 +0000 (15:42 +0800)]
Merge branch 'm26_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile' of https://github.com/scara/moodle

12 years agoMerge branch 'wip-mdl-39639' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 10 Jun 2013 07:28:17 +0000 (15:28 +0800)]
Merge branch 'wip-mdl-39639' of git://github.com/rajeshtaneja/moodle

12 years agoMerge branch 'MDL-40018_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 10 Jun 2013 07:00:08 +0000 (15:00 +0800)]
Merge branch 'MDL-40018_master' of git://github.com/lazydaisy/moodle

12 years agoMerge branch 'MDL-40013_master' of git://github.com/oasychev/moodle
Dan Poltawski [Mon, 10 Jun 2013 06:57:48 +0000 (14:57 +0800)]
Merge branch 'MDL-40013_master' of git://github.com/oasychev/moodle

12 years agoMerge branch 'MDL-40080-unused-hub-strings' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 10 Jun 2013 06:41:20 +0000 (14:41 +0800)]
Merge branch 'MDL-40080-unused-hub-strings' of git://github.com/mudrd8mz/moodle

12 years agoMerge branch 'MDL-40008_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 10 Jun 2013 06:25:03 +0000 (14:25 +0800)]
Merge branch 'MDL-40008_master' of https://github.com/markn86/moodle

12 years agoMerge branch 'w24_MDL-39096_m26_obfuscate' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 10 Jun 2013 05:12:11 +0000 (13:12 +0800)]
Merge branch 'w24_MDL-39096_m26_obfuscate' of git://github.com/skodak/moodle

12 years agoMerge branch 'w24_MDL-28394_m26_enrolrestore' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 10 Jun 2013 04:16:37 +0000 (12:16 +0800)]
Merge branch 'w24_MDL-28394_m26_enrolrestore' of git://github.com/skodak/moodle

12 years agoMerge branch 'master_MDL-37968' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 10 Jun 2013 04:09:47 +0000 (12:09 +0800)]
Merge branch 'master_MDL-37968' of git://github.com/danmarsden/moodle

12 years agoMDL-39016 theme_bootstrapbase: Added login info and home link to footer in both boost...
Mary Evans [Wed, 5 Jun 2013 21:48:12 +0000 (22:48 +0100)]
MDL-39016 theme_bootstrapbase: Added login info and home link to footer in both boostrapbase & clean layout/general.php

12 years agoMerge branch 'w24_MDL-37974_m26_manexpire' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 10 Jun 2013 03:59:03 +0000 (11:59 +0800)]
Merge branch 'w24_MDL-37974_m26_manexpire' of git://github.com/skodak/moodle

12 years agoMerge branch 'MDL-40009_master' of https://github.com/markn86/moodle
Sam Hemelryk [Mon, 10 Jun 2013 03:55:14 +0000 (15:55 +1200)]
Merge branch 'MDL-40009_master' of https://github.com/markn86/moodle

12 years agoMerge branch 'w24_MDL-39549_m26_cohortsearch' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 10 Jun 2013 03:49:04 +0000 (15:49 +1200)]
Merge branch 'w24_MDL-39549_m26_cohortsearch' of git://github.com/skodak/moodle

12 years agoMDL-26511 Images in Cloze multichoice
ppichet [Wed, 5 Jun 2013 03:59:11 +0000 (23:59 -0400)]
MDL-26511 Images in Cloze multichoice

vertical and horizontal answer and in feedback of all qtype answers

12 years agoMerge branch 'MDL-39971' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 10 Jun 2013 03:09:43 +0000 (15:09 +1200)]
Merge branch 'MDL-39971' of git://github.com/timhunt/moodle

12 years agoMerge branch 'wip-MDL-39824-m26' of http://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 10 Jun 2013 02:54:22 +0000 (10:54 +0800)]
Merge branch 'wip-MDL-39824-m26' of github.com/samhemelryk/moodle

12 years agoMerge branch 'MDL-39978' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 10 Jun 2013 02:48:21 +0000 (14:48 +1200)]
Merge branch 'MDL-39978' of git://github.com/timhunt/moodle

12 years agoMerge branch 'w24_MDL-32480_m26_imscp' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 10 Jun 2013 02:41:21 +0000 (14:41 +1200)]
Merge branch 'w24_MDL-32480_m26_imscp' of git://github.com/skodak/moodle

12 years agoMDL-39824 theme: tweaking upgrade note version
Sam Hemelryk [Mon, 10 Jun 2013 02:34:25 +0000 (14:34 +1200)]
MDL-39824 theme: tweaking upgrade note version

12 years agoMerge branch 'wip-MDL-39608-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 10 Jun 2013 02:26:04 +0000 (14:26 +1200)]
Merge branch 'wip-MDL-39608-master' of git://github.com/phalacee/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

12 years agoMerge branch 'MDL-36090_log2' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 10 Jun 2013 00:31:03 +0000 (12:31 +1200)]
Merge branch 'MDL-36090_log2' of git://github.com/andyjdavis/moodle

12 years agoMerge branch 'wip-MDL-40088-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 10 Jun 2013 00:14:17 +0000 (12:14 +1200)]
Merge branch 'wip-MDL-40088-master' of git://github.com/marinaglancy/moodle

12 years agoMerge branch 'wip-MDL-39227-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Sun, 9 Jun 2013 23:43:31 +0000 (11:43 +1200)]
Merge branch 'wip-MDL-39227-master' of git://github.com/phalacee/moodle

12 years agoMerge branch 'MDL-39979-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Sun, 9 Jun 2013 23:35:26 +0000 (11:35 +1200)]
Merge branch 'MDL-39979-master' of git://github.com/FMCorz/moodle

12 years agoMDL-39824 theme: changes recorded in theme/upgrade.txt
Sam Hemelryk [Sun, 9 Jun 2013 21:26:05 +0000 (09:26 +1200)]
MDL-39824 theme: changes recorded in theme/upgrade.txt

12 years agoMDL-39824 output: fixed bug when moving blocks with rtl lang
Sam Hemelryk [Sun, 9 Jun 2013 21:10:06 +0000 (09:10 +1200)]
MDL-39824 output: fixed bug when moving blocks with rtl lang

12 years agoMDL-40089 theme_clean: simplified layouts and converted to new OUTPUT API
Sam Hemelryk [Fri, 7 Jun 2013 05:24:13 +0000 (17:24 +1200)]
MDL-40089 theme_clean: simplified layouts and converted to new OUTPUT API

12 years agoMDL-39096 fix obfuscate_text() utf-8 compatibility
Petr Škoda [Fri, 7 Jun 2013 20:38:48 +0000 (22:38 +0200)]
MDL-39096 fix obfuscate_text() utf-8 compatibility

12 years agoMDL-39549 fix cohort search in course categories
Petr Škoda [Fri, 7 Jun 2013 20:07:15 +0000 (22:07 +0200)]
MDL-39549 fix cohort search in course categories

12 years agoMDL-37974 fix verbose output when expiring manual enrolments
Petr Škoda [Fri, 7 Jun 2013 19:18:54 +0000 (21:18 +0200)]
MDL-37974 fix verbose output when expiring manual enrolments

12 years agoMDL-37974 add "Disable course enrolment" expiration action for manual enrolments
MorrisR2 [Mon, 11 Feb 2013 22:35:52 +0000 (16:35 -0600)]
MDL-37974 add "Disable course enrolment" expiration action for manual enrolments

Commit amended by Petr Skoda to match recommended coding style.

12 years agoMDL-28394 fix enrolment method restore logic
Petr Škoda [Wed, 5 Jun 2013 20:37:57 +0000 (22:37 +0200)]
MDL-28394 fix enrolment method restore logic

This patch fixes:
* missing enrolment methods after 1.9 backup restore - defaults are added
* enrolment methods are restored only when users option is enabled
* manual enrolment override option is disabled if users not available

12 years agoMDL-32480 allow external https links in IMSCP too
Petr Škoda [Mon, 3 Jun 2013 09:18:02 +0000 (11:18 +0200)]
MDL-32480 allow external https links in IMSCP too

12 years agoMDL-32480 fix display of IMS content packages with external links
Nicolas Dunand [Mon, 3 Jun 2013 06:13:19 +0000 (08:13 +0200)]
MDL-32480 fix display of IMS content packages with external links

12 years agoMDL-40089 theme_clean: moved general to columns3.php as prep
Sam Hemelryk [Fri, 7 Jun 2013 02:05:39 +0000 (14:05 +1200)]
MDL-40089 theme_clean: moved general to columns3.php as prep

12 years agoMDL-39842 js: fixed block drag and drop
Sam Hemelryk [Fri, 7 Jun 2013 01:37:21 +0000 (13:37 +1200)]
MDL-39842 js: fixed block drag and drop

12 years agoMDL-39824 theme_bootstrapbase: converted $PAGE use to new $OUTPUT methods.
Sam Hemelryk [Thu, 6 Jun 2013 22:49:24 +0000 (10:49 +1200)]
MDL-39824 theme_bootstrapbase: converted $PAGE use to new $OUTPUT methods.

12 years agoMDL-40089 theme_bootstrapbase: moved general to columns3.php as prep
Sam Hemelryk [Thu, 6 Jun 2013 22:48:18 +0000 (10:48 +1200)]
MDL-40089 theme_bootstrapbase: moved general to columns3.php as prep

12 years agoMDL-39824 output: tidied up output before bootstrap cleaning
Sam Hemelryk [Thu, 6 Jun 2013 22:38:39 +0000 (10:38 +1200)]
MDL-39824 output: tidied up output before bootstrap cleaning

12 years agoMDL-39839 renderer: new methods for calls appearing in theme layouts
Sam Hemelryk [Thu, 6 Jun 2013 22:35:38 +0000 (10:35 +1200)]
MDL-39839 renderer: new methods for  calls appearing in theme layouts

12 years agoMDL-39838 renderer: new methods for body classes and id
Sam Hemelryk [Thu, 6 Jun 2013 22:34:02 +0000 (10:34 +1200)]
MDL-39838 renderer: new methods for body classes and id

12 years agoMDL-39841 renderer: new method to renderer blocks with predictable structure
Sam Hemelryk [Thu, 6 Jun 2013 22:32:52 +0000 (10:32 +1200)]
MDL-39841 renderer: new method to renderer blocks with predictable structure

12 years agoMDL-39871 themes: can now specify regions to swap when using rtl langs
Sam Hemelryk [Thu, 6 Jun 2013 22:25:47 +0000 (10:25 +1200)]
MDL-39871 themes: can now specify regions to swap when using rtl langs

12 years agoMDL-40088 fixed bug with not visible course section
Marina Glancy [Fri, 7 Jun 2013 03:55:19 +0000 (13:55 +1000)]
MDL-40088 fixed bug with not visible course section

12 years agoMDL-37968 course_overview: add dim class to hidden courses for teachers.
Dan Marsden [Wed, 5 Jun 2013 23:57:22 +0000 (11:57 +1200)]
MDL-37968 course_overview: add dim class to hidden courses for teachers.

12 years agoMDL-39338 core_question: Make history box a .well
Mary Evans [Thu, 6 Jun 2013 21:49:27 +0000 (22:49 +0100)]
MDL-39338 core_question: Make history box a .well

12 years agoMDL-39832 Files: Fixed ETag format according with RFC2616.
Matteo Scaramuccia [Sat, 1 Jun 2013 10:34:40 +0000 (12:34 +0200)]
MDL-39832 Files: Fixed ETag format according with RFC2616.

ETag must be double quoted,
http://tools.ietf.org/html/rfc2616#section-3.11:

      entity-tag = [ weak ] opaque-tag
      weak       = "W/"
      opaque-tag = quoted-string

12 years agoMDL-39832 Files: Revert MDL-39688 commit, f111746140fe80a821ae69e3bf518d950bf188a1
Matteo Scaramuccia [Sat, 1 Jun 2013 10:21:29 +0000 (12:21 +0200)]
MDL-39832 Files: Revert MDL-39688 commit, f111746140fe80a821ae69e3bf518d950bf188a1

MDL-39688 has been successful in providing a solution for the issue but further
investigations done in MDL-39832 have got the evidence that the given solution
is more likely a workaround.

12 years agoMDL-40013 Easier to override saving question hints
Oleg Sychev [Wed, 5 Jun 2013 17:51:57 +0000 (20:51 +0300)]
MDL-40013 Easier to override saving question hints

This adds 3 new methods, called from question_type::save_hints,
to make it easier for different question types to overload this
functionality without duplicating code.

Question types that will benefit from this change include
oumultiresponse, ddmarker, preg and correctwriting.

12 years agoMDL-40080 Remove unused strings from the core_hub subsystem
David Mudrák [Thu, 6 Jun 2013 10:44:13 +0000 (12:44 +0200)]
MDL-40080 Remove unused strings from the core_hub subsystem

12 years agoMDL-39979 navigation: Remove the use of an undefined variable
Frederic Massart [Tue, 4 Jun 2013 03:49:26 +0000 (11:49 +0800)]
MDL-39979 navigation: Remove the use of an undefined variable

12 years agoweekly on-sync release 2.6dev
Dan Poltawski [Thu, 6 Jun 2013 03:58:39 +0000 (11:58 +0800)]
weekly on-sync release 2.6dev

12 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Dan Poltawski [Thu, 6 Jun 2013 03:54:47 +0000 (11:54 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

12 years agoMerge branch 'wip-MDL-38773-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 17:31:53 +0000 (19:31 +0200)]
Merge branch 'wip-MDL-38773-master' of git://github.com/marinaglancy/moodle

12 years agoMerge branch 'w23_MDL-39588_m26_ociinstall' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 14:22:58 +0000 (16:22 +0200)]
Merge branch 'w23_MDL-39588_m26_ociinstall' of git://github.com/skodak/moodle

12 years agoMerge branch 'w23_MDL-39503_m26_signup' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 14:10:39 +0000 (16:10 +0200)]
Merge branch 'w23_MDL-39503_m26_signup' of git://github.com/skodak/moodle

12 years agoMerge branch 'wip-MDL-21097-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 08:36:16 +0000 (10:36 +0200)]
Merge branch 'wip-MDL-21097-master' of git://github.com/marinaglancy/moodle

12 years agoMDL-21097 Correctly check capabilities for frontpage editing mode
Marina Glancy [Wed, 5 Jun 2013 08:06:56 +0000 (18:06 +1000)]
MDL-21097 Correctly check capabilities for frontpage editing mode

12 years agoMerge branch 'wip-MDL-21097-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 5 Jun 2013 05:10:12 +0000 (13:10 +0800)]
Merge branch 'wip-MDL-21097-master' of git://github.com/marinaglancy/moodle

12 years agoMDL-21097 corrected course editing roles
Marina Glancy [Wed, 5 Jun 2013 04:25:13 +0000 (14:25 +1000)]
MDL-21097 corrected course editing roles

12 years agoMerge branch 'MDL-39977' of git://github.com/lazydaisy/moodle
Dan Poltawski [Wed, 5 Jun 2013 02:11:42 +0000 (10:11 +0800)]
Merge branch 'MDL-39977' of git://github.com/lazydaisy/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

12 years agoMDL-38773 Purge coursecat cache on course restore
Marina Glancy [Wed, 5 Jun 2013 02:02:33 +0000 (12:02 +1000)]
MDL-38773 Purge coursecat cache on course restore

12 years agoMDL-36090 core_grade: added logging of overriding of student grades
Andrew Davis [Mon, 28 Jan 2013 04:03:59 +0000 (12:03 +0800)]
MDL-36090 core_grade: added logging of overriding of student grades

12 years agoMerge branch 'master-MDL-39409-auth-cas-use-moodle-web-proxy' of https://github.com...
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 00:45:37 +0000 (02:45 +0200)]
Merge branch 'master-MDL-39409-auth-cas-use-moodle-web-proxy' of https://github.com/brki/moodle

12 years agoMerge branch 'w23_MDL-39416_m26_pagelog' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 00:43:21 +0000 (02:43 +0200)]
Merge branch 'w23_MDL-39416_m26_pagelog' of git://github.com/skodak/moodle

12 years agoAutomatically generated installer lang files
AMOS bot [Wed, 5 Jun 2013 00:39:44 +0000 (00:39 +0000)]
Automatically generated installer lang files

12 years agoMerge branch 'MDL-39968-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 00:32:29 +0000 (02:32 +0200)]
Merge branch 'MDL-39968-master' of git://github.com/danpoltawski/moodle

12 years agoMerge branch 'MDL-38731-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 00:29:43 +0000 (02:29 +0200)]
Merge branch 'MDL-38731-master' of git://github.com/danpoltawski/moodle

12 years agoMerge branch 'MDL-37332-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 00:27:08 +0000 (02:27 +0200)]
Merge branch 'MDL-37332-master' of git://github.com/danpoltawski/moodle

12 years agoMerge branch 'm25_MDL-38545_PHP_Strict_error' of https://github.com/scara/moodle
Eloy Lafuente (stronk7) [Wed, 5 Jun 2013 00:22:22 +0000 (02:22 +0200)]
Merge branch 'm25_MDL-38545_PHP_Strict_error' of https://github.com/scara/moodle

12 years agoMDL-39790 Add badges block to the course page
Yuliya Bozhko [Tue, 28 May 2013 21:42:11 +0000 (09:42 +1200)]
MDL-39790 Add badges block to the course page

12 years agoMerge branch 'wip-MDL-21097-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 4 Jun 2013 23:43:03 +0000 (01:43 +0200)]
Merge branch 'wip-MDL-21097-master' of git://github.com/marinaglancy/moodle

12 years agoMDL-40018 theme_sky_high: Fixed footer in admin pages.
Mary Evans [Tue, 4 Jun 2013 22:36:38 +0000 (23:36 +0100)]
MDL-40018 theme_sky_high: Fixed footer in admin pages.

12 years agoMDL-39723 prevent update_courses() bad habits.
Eloy Lafuente (stronk7) [Tue, 4 Jun 2013 19:45:15 +0000 (21:45 +0200)]
MDL-39723 prevent update_courses() bad habits.

All the external functions end calling require_login() that is
always in charge of setting the $COURSE global. This is not a
problem, but in the case of core_course_external::update_courses()
testing, where we are, in the same "request", both setting and getting
the $COURSE information and it's clearly outdated, so the test fails.

Alternative solution would be to modify the external function to ensure
that, after updating a course, $COURSE is also updated with the changes
but it does not seem to be necessary for "normal" usage (both UI/WS POVs).

12 years agoMerge branch 'MDL-39723-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 4 Jun 2013 15:47:45 +0000 (17:47 +0200)]
Merge branch 'MDL-39723-master' of git://github.com/sammarshallou/moodle

12 years agoMDL-40009 notes: corrected the form element names passed to setType
Mark Nelson [Tue, 4 Jun 2013 09:59:24 +0000 (17:59 +0800)]
MDL-40009 notes: corrected the form element names passed to setType

12 years agoMerge branch 'MDL-39945' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 4 Jun 2013 07:53:56 +0000 (15:53 +0800)]
Merge branch 'MDL-39945' of git://github.com/timhunt/moodle

12 years agoMerge branch 'MDL-39835_M26' of github.com:lazydaisy/moodle
Dan Poltawski [Tue, 4 Jun 2013 06:44:35 +0000 (14:44 +0800)]
Merge branch 'MDL-39835_M26' of github.com:lazydaisy/moodle

12 years agoMerge branch 'wip-MDL-39819_master' of git://github.com/gjb2048/moodle
Dan Poltawski [Tue, 4 Jun 2013 06:37:55 +0000 (14:37 +0800)]
Merge branch 'wip-MDL-39819_master' of git://github.com/gjb2048/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

12 years agoMerge branch 'wip-MDL-39870-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 4 Jun 2013 06:14:18 +0000 (14:14 +0800)]
Merge branch 'wip-MDL-39870-master' of git://github.com/marinaglancy/moodle

12 years agoMDL-39931 less: recompile with whitespace removed
Dan Poltawski [Tue, 4 Jun 2013 06:08:28 +0000 (14:08 +0800)]
MDL-39931 less: recompile with whitespace removed

12 years agoMerge branch 'MDL-39931' of github.com:lazydaisy/moodle
Dan Poltawski [Tue, 4 Jun 2013 05:31:34 +0000 (13:31 +0800)]
Merge branch 'MDL-39931' of github.com:lazydaisy/moodle

12 years agoMerge branch 'MDL-39536-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 4 Jun 2013 05:18:49 +0000 (13:18 +0800)]
Merge branch 'MDL-39536-master' of git://github.com/FMCorz/moodle

12 years agoMDL-39536 completion: Unit tests for get_activities and has_activities
Frederic Massart [Fri, 31 May 2013 08:11:17 +0000 (16:11 +0800)]
MDL-39536 completion: Unit tests for get_activities and has_activities

12 years agoMDL-39536 completion: Prevent DB call when fetching activities
Frederic Massart [Fri, 31 May 2013 06:25:21 +0000 (14:25 +0800)]
MDL-39536 completion: Prevent DB call when fetching activities

12 years agoMerge branch 'MDL-39939-scorm-basic-report-name' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 4 Jun 2013 04:27:30 +0000 (12:27 +0800)]
Merge branch 'MDL-39939-scorm-basic-report-name' of git://github.com/mudrd8mz/moodle

12 years agoMDL-40008 forms: fixed ordering of the calendar icon and enable checkbox for the...
Mark Nelson [Tue, 4 Jun 2013 03:55:48 +0000 (11:55 +0800)]
MDL-40008 forms: fixed ordering of the calendar icon and enable checkbox for the date selector element

12 years agoMerge branch 'wip-mdl-39827' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 4 Jun 2013 03:29:38 +0000 (11:29 +0800)]
Merge branch 'wip-mdl-39827' of git://github.com/rajeshtaneja/moodle

12 years agoMerge branch 'MDL-39317-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 4 Jun 2013 03:26:28 +0000 (11:26 +0800)]
Merge branch 'MDL-39317-master' of git://github.com/damyon/moodle

12 years agoMerge branch 'MDL-39743-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 4 Jun 2013 03:03:39 +0000 (11:03 +0800)]
Merge branch 'MDL-39743-master' of git://github.com/damyon/moodle

12 years agoMerge branch 'wip_master_mdl-34085' of https://github.com/iarenaza/moodle
Dan Poltawski [Tue, 4 Jun 2013 02:42:45 +0000 (10:42 +0800)]
Merge branch 'wip_master_mdl-34085' of https://github.com/iarenaza/moodle

12 years agoAutomatically generated installer lang files
AMOS bot [Tue, 4 Jun 2013 00:46:34 +0000 (00:46 +0000)]
Automatically generated installer lang files

12 years agoMerge branch 'wip-MDL-39801-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 23:51:10 +0000 (01:51 +0200)]
Merge branch 'wip-MDL-39801-master' of git://github.com/marinaglancy/moodle

12 years agoMDL-39764 style: phpdoc changed to inline comments
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 23:41:58 +0000 (01:41 +0200)]
MDL-39764 style: phpdoc changed to inline comments

12 years agoMerge branch 'wip-MDL-39764_master_3' of git://github.com/gjb2048/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 23:36:16 +0000 (01:36 +0200)]
Merge branch 'wip-MDL-39764_master_3' of git://github.com/gjb2048/moodle

12 years agoMerge branch 'w23_MDL-39882_m26_behatconfig' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 23:31:54 +0000 (01:31 +0200)]
Merge branch 'w23_MDL-39882_m26_behatconfig' of git://github.com/skodak/moodle