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
Sam Hemelryk [Mon, 10 Jun 2013 03:55:14 +0000 (15:55 +1200)]
Merge branch 'MDL-40009_master' of https://github.com/markn86/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
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
Sam Hemelryk [Mon, 10 Jun 2013 03:09:43 +0000 (15:09 +1200)]
Merge branch 'MDL-39971' of git://github.com/timhunt/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
Sam Hemelryk [Mon, 10 Jun 2013 02:48:21 +0000 (14:48 +1200)]
Merge branch 'MDL-39978' of git://github.com/timhunt/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
Sam Hemelryk [Mon, 10 Jun 2013 02:34:25 +0000 (14:34 +1200)]
MDL-39824 theme: tweaking upgrade note version
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
Sam Hemelryk [Mon, 10 Jun 2013 00:31:03 +0000 (12:31 +1200)]
Merge branch 'MDL-36090_log2' of git://github.com/andyjdavis/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
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
Sam Hemelryk [Sun, 9 Jun 2013 23:35:26 +0000 (11:35 +1200)]
Merge branch 'MDL-39979-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Sun, 9 Jun 2013 21:26:05 +0000 (09:26 +1200)]
MDL-39824 theme: changes recorded in theme/upgrade.txt
Sam Hemelryk [Sun, 9 Jun 2013 21:10:06 +0000 (09:10 +1200)]
MDL-39824 output: fixed bug when moving blocks with rtl lang
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
Petr Škoda [Fri, 7 Jun 2013 20:07:15 +0000 (22:07 +0200)]
MDL-39549 fix cohort search in course categories
Petr Škoda [Fri, 7 Jun 2013 19:18:54 +0000 (21:18 +0200)]
MDL-37974 fix verbose output when expiring 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.
Petr Škoda [Mon, 3 Jun 2013 09:18:02 +0000 (11:18 +0200)]
MDL-32480 allow external https links in IMSCP too
Nicolas Dunand [Mon, 3 Jun 2013 06:13:19 +0000 (08:13 +0200)]
MDL-32480 fix display of IMS content packages with external links
Sam Hemelryk [Fri, 7 Jun 2013 02:05:39 +0000 (14:05 +1200)]
MDL-40089 theme_clean: moved general to columns3.php as prep
Sam Hemelryk [Fri, 7 Jun 2013 01:37:21 +0000 (13:37 +1200)]
MDL-39842 js: fixed block drag and drop
Sam Hemelryk [Thu, 6 Jun 2013 22:49:24 +0000 (10:49 +1200)]
MDL-39824 theme_bootstrapbase: converted $PAGE use to new $OUTPUT methods.
Sam Hemelryk [Thu, 6 Jun 2013 22:48:18 +0000 (10:48 +1200)]
MDL-40089 theme_bootstrapbase: moved general to columns3.php as prep
Sam Hemelryk [Thu, 6 Jun 2013 22:38:39 +0000 (10:38 +1200)]
MDL-39824 output: tidied up output before bootstrap cleaning
Sam Hemelryk [Thu, 6 Jun 2013 22:35:38 +0000 (10:35 +1200)]
MDL-39839 renderer: new methods for calls appearing in theme layouts
Sam Hemelryk [Thu, 6 Jun 2013 22:34:02 +0000 (10:34 +1200)]
MDL-39838 renderer: new methods for body classes and id
Sam Hemelryk [Thu, 6 Jun 2013 22:32:52 +0000 (10:32 +1200)]
MDL-39841 renderer: new method to renderer blocks with predictable structure
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
Marina Glancy [Fri, 7 Jun 2013 03:55:19 +0000 (13:55 +1000)]
MDL-40088 fixed bug with not visible course section
Frederic Massart [Tue, 4 Jun 2013 03:49:26 +0000 (11:49 +0800)]
MDL-39979 navigation: Remove the use of an undefined variable
Dan Poltawski [Thu, 6 Jun 2013 03:58:39 +0000 (11:58 +0800)]
weekly on-sync release 2.6dev
Dan Poltawski [Thu, 6 Jun 2013 03:54:47 +0000 (11:54 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
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
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
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
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
Marina Glancy [Wed, 5 Jun 2013 08:06:56 +0000 (18:06 +1000)]
MDL-21097 Correctly check capabilities for frontpage editing mode
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
Marina Glancy [Wed, 5 Jun 2013 04:25:13 +0000 (14:25 +1000)]
MDL-21097 corrected course editing roles
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
Marina Glancy [Wed, 5 Jun 2013 02:02:33 +0000 (12:02 +1000)]
MDL-38773 Purge coursecat cache on course restore
Andrew Davis [Mon, 28 Jan 2013 04:03:59 +0000 (12:03 +0800)]
MDL-36090 core_grade: added logging of overriding of student grades
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
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
AMOS bot [Wed, 5 Jun 2013 00:39:44 +0000 (00:39 +0000)]
Automatically generated installer lang files
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
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
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
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
Yuliya Bozhko [Tue, 28 May 2013 21:42:11 +0000 (09:42 +1200)]
MDL-39790 Add badges block to the course page
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
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).
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
Mark Nelson [Tue, 4 Jun 2013 09:59:24 +0000 (17:59 +0800)]
MDL-40009 notes: corrected the form element names passed to setType
Dan Poltawski [Tue, 4 Jun 2013 07:53:56 +0000 (15:53 +0800)]
Merge branch 'MDL-39945' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 4 Jun 2013 06:44:35 +0000 (14:44 +0800)]
Merge branch 'MDL-39835_M26' of github.com:lazydaisy/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
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
Dan Poltawski [Tue, 4 Jun 2013 06:08:28 +0000 (14:08 +0800)]
MDL-39931 less: recompile with whitespace removed
Dan Poltawski [Tue, 4 Jun 2013 05:31:34 +0000 (13:31 +0800)]
Merge branch 'MDL-39931' of github.com:lazydaisy/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
Frederic Massart [Fri, 31 May 2013 08:11:17 +0000 (16:11 +0800)]
MDL-39536 completion: Unit tests for get_activities and has_activities
Frederic Massart [Fri, 31 May 2013 06:25:21 +0000 (14:25 +0800)]
MDL-39536 completion: Prevent DB call when fetching activities
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
Dan Poltawski [Tue, 4 Jun 2013 03:29:38 +0000 (11:29 +0800)]
Merge branch 'wip-mdl-39827' of git://github.com/rajeshtaneja/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
Dan Poltawski [Tue, 4 Jun 2013 03:03:39 +0000 (11:03 +0800)]
Merge branch 'MDL-39743-master' of git://github.com/damyon/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
AMOS bot [Tue, 4 Jun 2013 00:46:34 +0000 (00:46 +0000)]
Automatically generated installer lang files
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
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 23:41:58 +0000 (01:41 +0200)]
MDL-39764 style: phpdoc changed to inline comments
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
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
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 23:14:09 +0000 (01:14 +0200)]
Merge branch 'MDL-39821-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 22:50:15 +0000 (00:50 +0200)]
MDL-39465 Show env. info instead of part twice.
Gareth J Barnard [Mon, 3 Jun 2013 22:36:32 +0000 (23:36 +0100)]
MDL-39764 course_format: Allow courses to have numsections > maxsections.
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 22:04:12 +0000 (00:04 +0200)]
Merge branch 'MDL-39936-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 21:59:12 +0000 (23:59 +0200)]
Merge branch 'w23_MDL-39465_m26_environment' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 21:51:22 +0000 (23:51 +0200)]
Merge branch 'MDL-39166-m25' of https://github.com/jfilip/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 21:18:55 +0000 (23:18 +0200)]
Merge branch 'wip-MDL-39710-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 17:10:00 +0000 (19:10 +0200)]
Merge branch 'MDL-39932_master' of git://github.com/grabs/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 17:03:15 +0000 (19:03 +0200)]
Merge branch 'MDL-39487_master' of https://github.com/IOC/moodle
Eloy Lafuente (stronk7) [Mon, 3 Jun 2013 14:20:41 +0000 (16:20 +0200)]
Merge branch 'MDL-39987_master' of git://github.com/lazydaisy/moodle
Mary Evans [Sun, 2 Jun 2013 22:04:17 +0000 (23:04 +0100)]
MDL-39987 theme_bootstrapbase: Fixed menunode text in renderers/core_renderer.php.
Petr Škoda [Sun, 2 Jun 2013 11:30:02 +0000 (13:30 +0200)]
MDL-39416 do not try to get detailed perflog info before PAGE int
Petr Škoda [Sun, 2 Jun 2013 08:35:15 +0000 (10:35 +0200)]
MDL-39588 require MOODLELIB Oracle package
Previously it was kind of optional, but it is now required. We also attempt to install it automatically now.
Mary Evans [Sat, 1 Jun 2013 20:36:58 +0000 (21:36 +0100)]
MDL-39835 theme_sky_high: Fix for footer to display correctly in higher resolutions.
Mary Evans [Sat, 1 Jun 2013 17:42:09 +0000 (18:42 +0100)]
MDL-39977 theme_bootstrapbase: Changes the way Clean theme's login takes its navbar styles from Bootstrapbase.
Gareth J Barnard [Fri, 31 May 2013 21:30:26 +0000 (22:30 +0100)]
MDL-39819 theme_bootstrapbase: Fix icon alignment in filepicker.
Petr Škoda [Fri, 31 May 2013 20:02:34 +0000 (22:02 +0200)]
MDL-39465 detect environment problems in tests
This should help explain why something else fails.
Tim Hunt [Fri, 31 May 2013 19:47:26 +0000 (20:47 +0100)]
MDL-39978 Essays with files break each attempt builds on last
Petr Škoda [Fri, 31 May 2013 19:25:27 +0000 (21:25 +0200)]
MDL-39503 tell robots to not index login and signup page
This should partially prevent people from googling moodle sites that allow signup. Please note you can not use login block if because it would still disclose the signup link.
Tim Hunt [Fri, 31 May 2013 19:24:50 +0000 (20:24 +0100)]
MDL-39971 each attempt builds on last broken for previews.
Petr Škoda [Fri, 31 May 2013 19:09:05 +0000 (21:09 +0200)]
MDL-39882 add required behat settings to config-dist
Dan Poltawski [Fri, 31 May 2013 05:11:07 +0000 (13:11 +0800)]
MDL-39968 bootstrapbase: uses non-standard browser sniffing
Also theme_clean does the same sniffing, but is not necessary as its
included by bootstrapbase
Marina Glancy [Fri, 31 May 2013 06:09:21 +0000 (16:09 +1000)]
MDL-39710 Don't display rubric and guide preview unless option checked
Russell Boyatt [Wed, 29 May 2013 14:32:48 +0000 (15:32 +0100)]
Fixing MDL-39710: setting to limit student access to rubric now checked.