moodle.git
8 years agoMDL-36622 usability: Adaptations following new icons
Frederic Massart [Thu, 15 Nov 2012 11:30:16 +0000 (19:30 +0800)]
MDL-36622 usability: Adaptations following new icons

8 years agoMDL-36622 usability: New icons on course category page
Barbara Ramiro [Thu, 15 Nov 2012 10:50:42 +0000 (18:50 +0800)]
MDL-36622 usability: New icons on course category page

8 years agoMDL-36526 calendar: Convert webcal:// to http://
Dan Poltawski [Thu, 15 Nov 2012 03:17:07 +0000 (11:17 +0800)]
MDL-36526 calendar: Convert webcal:// to http://

Curl doesn't understand webcal, so needs to use http. Also fixed some
php warnings spotted during testing.

8 years agoMerge branch 'MDL-36331_redirect' of git://github.com/andyjdavis/moodle
Dan Poltawski [Thu, 15 Nov 2012 06:40:42 +0000 (14:40 +0800)]
Merge branch 'MDL-36331_redirect' of git://github.com/andyjdavis/moodle

8 years agoMerge branch 'MDL-36061_userid' of git://github.com/andyjdavis/moodle
Dan Poltawski [Thu, 15 Nov 2012 06:32:51 +0000 (14:32 +0800)]
Merge branch 'MDL-36061_userid' of git://github.com/andyjdavis/moodle

8 years agoMerge branch 'wip-MDL-35770-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 15 Nov 2012 05:51:07 +0000 (13:51 +0800)]
Merge branch 'wip-MDL-35770-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-35770 Include file defining base class in order to work correctly in cron
Marina Glancy [Thu, 15 Nov 2012 05:25:51 +0000 (13:25 +0800)]
MDL-35770 Include file defining base class in order to work correctly in cron

8 years agoMerge branch 'w47_MDL-36524_m24_ieagain' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 15 Nov 2012 03:20:12 +0000 (11:20 +0800)]
Merge branch 'w47_MDL-36524_m24_ieagain' of git://github.com/skodak/moodle

8 years agoMDL-30643 fixed whitespace
Aparup Banerjee [Thu, 15 Nov 2012 03:16:35 +0000 (11:16 +0800)]
MDL-30643 fixed whitespace

8 years agoMerge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle
Aparup Banerjee [Thu, 15 Nov 2012 03:15:00 +0000 (11:15 +0800)]
Merge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle

Conflicts:
lib/tests/statslib_test.php

8 years agoMDL-36061 core_grade: added some unit tests related to refresh_grades()
Andrew Davis [Tue, 6 Nov 2012 03:02:18 +0000 (11:02 +0800)]
MDL-36061 core_grade: added some unit tests related to refresh_grades()

8 years agoMerge branch 'wip-MDL-35770-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 15 Nov 2012 02:59:17 +0000 (10:59 +0800)]
Merge branch 'wip-MDL-35770-master' of git://github.com/marinaglancy/moodle

Conflicts:
course/format/lib.php

8 years agoMerge branch 'MDL-36417-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 15 Nov 2012 02:39:08 +0000 (10:39 +0800)]
Merge branch 'MDL-36417-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-36526-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Thu, 15 Nov 2012 02:06:00 +0000 (10:06 +0800)]
Merge branch 'MDL-36526-master' of git://github.com/ankitagarwal/moodle

8 years agoMDL-36111 cache: remove double semicolons
Dan Poltawski [Thu, 15 Nov 2012 01:25:56 +0000 (09:25 +0800)]
MDL-36111 cache: remove double semicolons

Thanks to Matteo Scaramuccia!

8 years agoMerge branch 'wip-MDL-36576-m24' of git://github.com/amygroshek/moodle
Dan Poltawski [Thu, 15 Nov 2012 00:56:43 +0000 (08:56 +0800)]
Merge branch 'wip-MDL-36576-m24' of git://github.com/amygroshek/moodle

8 years agoMDL-36576 - change generalbox classname to generaltable to fix rounded corners on...
Amy Groshek [Tue, 13 Nov 2012 20:13:20 +0000 (14:13 -0600)]
MDL-36576 - change generalbox classname to generaltable to fix rounded corners on the table background color

8 years agoMDL-36524 do not set meta tag for IE compatibility, header should be enough
Petr Škoda [Wed, 14 Nov 2012 18:42:24 +0000 (19:42 +0100)]
MDL-36524 do not set meta tag for IE compatibility, header should be enough

8 years agoMDL-30643 - Fixed group by for MSSQL and Oracle.
Tyler Bannister [Wed, 14 Nov 2012 14:46:50 +0000 (09:46 -0500)]
MDL-30643 - Fixed group by for MSSQL and Oracle.
          - MSSQL and Oracle don't allow column aliases to be used in group by.

8 years agoMDL-36594 Add function format_base::is_section_current()
Marina Glancy [Wed, 14 Nov 2012 07:54:13 +0000 (15:54 +0800)]
MDL-36594 Add function format_base::is_section_current()

- added function format_base::is_section_current()
- overwritten in format_weeks::is_section_current()
- deprecated function format_section_renderer_base::is_section_current()

8 years agoMDL-36446 usability: Resource icon on activity block read from page module
Frederic Massart [Wed, 14 Nov 2012 07:00:40 +0000 (15:00 +0800)]
MDL-36446 usability: Resource icon on activity block read from page module

8 years agoMDL-35770 Moved format_weeks_get_section_dates() to format_weeks::get_section_dates()
Marina Glancy [Wed, 14 Nov 2012 06:31:07 +0000 (14:31 +0800)]
MDL-35770 Moved format_weeks_get_section_dates() to format_weeks::get_section_dates()

8 years agoMerge branch 'MDL-36561-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 14 Nov 2012 06:29:48 +0000 (14:29 +0800)]
Merge branch 'MDL-36561-master-int' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-36449-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 14 Nov 2012 06:26:06 +0000 (14:26 +0800)]
Merge branch 'MDL-36449-master-int' of git://github.com/FMCorz/moodle

8 years agoMDL-36449 usability: Fixed spinner position in lightbox
Frederic Massart [Wed, 14 Nov 2012 06:24:51 +0000 (14:24 +0800)]
MDL-36449 usability: Fixed spinner position in lightbox

8 years agoMerge branch 'MDL-36565-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 14 Nov 2012 06:16:30 +0000 (14:16 +0800)]
Merge branch 'MDL-36565-master-int' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-36323-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 14 Nov 2012 06:10:49 +0000 (14:10 +0800)]
Merge branch 'MDL-36323-master-int' of git://github.com/FMCorz/moodle

8 years agoMDL-36323 usability: Final icons for i/assignroles and i/switchrole
Barbara Ramiro [Tue, 13 Nov 2012 08:49:34 +0000 (16:49 +0800)]
MDL-36323 usability: Final icons for i/assignroles and i/switchrole

8 years agoMDL-36323 usability: New icon names to assign and switch roles
Frederic Massart [Tue, 13 Nov 2012 08:48:50 +0000 (16:48 +0800)]
MDL-36323 usability: New icon names to assign and switch roles

8 years agoMDL-36323 usability: Resized icons to 16x16
Barbara Ramiro [Tue, 13 Nov 2012 07:06:30 +0000 (15:06 +0800)]
MDL-36323 usability: Resized icons to 16x16

8 years agoMDL-36323 usability: CSS for block headers
Frederic Massart [Tue, 13 Nov 2012 05:57:21 +0000 (13:57 +0800)]
MDL-36323 usability: CSS for block headers

8 years agoMDL-36323 usability: Normalising icons used in blocks
Frederic Massart [Fri, 9 Nov 2012 07:43:22 +0000 (15:43 +0800)]
MDL-36323 usability: Normalising icons used in blocks

8 years agoMDL-35770 Converted weeks format to new course formats API
Marina Glancy [Wed, 14 Nov 2012 05:48:13 +0000 (13:48 +0800)]
MDL-35770 Converted weeks format to new course formats API

8 years agoMDL-35770 Converted topics format to new course formats API
Marina Glancy [Wed, 14 Nov 2012 05:35:55 +0000 (13:35 +0800)]
MDL-35770 Converted topics format to new course formats API

8 years agoMDL-35770 Created class format_weeks as copy of format_legacy
Marina Glancy [Wed, 14 Nov 2012 04:23:07 +0000 (12:23 +0800)]
MDL-35770 Created class format_weeks as copy of format_legacy

8 years agoMDL-35770 Created class format_topics as copy of format_legacy
Marina Glancy [Wed, 14 Nov 2012 04:22:55 +0000 (12:22 +0800)]
MDL-35770 Created class format_topics as copy of format_legacy

8 years agoMDL-35770 Converted social format to new course formats API
Marina Glancy [Wed, 14 Nov 2012 04:22:39 +0000 (12:22 +0800)]
MDL-35770 Converted social format to new course formats API

8 years agoMDL-35770 Converted scorm format to new course formats API
Marina Glancy [Wed, 14 Nov 2012 04:22:25 +0000 (12:22 +0800)]
MDL-35770 Converted scorm format to new course formats API

8 years agoMDL-36048 Allow course formats to add course headers and footers
Marina Glancy [Thu, 18 Oct 2012 01:38:36 +0000 (09:38 +0800)]
MDL-36048 Allow course formats to add course headers and footers

- Added functions in class format_base
- Added global functions in course/lib.php
- Added calling of course header/footer functions to the base theme
- output renderer checks if theme calls the coures content header/footer functions, if not calls them explicitly and displays a development warning

8 years agoMerge branch 'MDL-36575_modLtiGenerator' of git://github.com/moodlerooms/moodle
Dan Poltawski [Wed, 14 Nov 2012 04:22:54 +0000 (12:22 +0800)]
Merge branch 'MDL-36575_modLtiGenerator' of git://github.com/moodlerooms/moodle

8 years agoMDL-36565 mod_url: The default activity icon is the module icon
Frederic Massart [Wed, 14 Nov 2012 04:21:57 +0000 (12:21 +0800)]
MDL-36565 mod_url: The default activity icon is the module icon

8 years agoMDL-36444 themes: Fixed margin of activities on course page
Frederic Massart [Wed, 14 Nov 2012 04:05:26 +0000 (12:05 +0800)]
MDL-36444 themes: Fixed margin of activities on course page

8 years agoMDL-36449 usability: Improved renaming toolbox and alignment on course page
Frederic Massart [Mon, 12 Nov 2012 07:22:04 +0000 (15:22 +0800)]
MDL-36449 usability: Improved renaming toolbox and alignment on course page

8 years agoMDL-36449 usability: Course drag and drop field styling
Frederic Massart [Thu, 8 Nov 2012 11:40:21 +0000 (19:40 +0800)]
MDL-36449 usability: Course drag and drop field styling

8 years agoMDL-36449 usability: Normalising icons on course page
Frederic Massart [Thu, 8 Nov 2012 10:45:02 +0000 (18:45 +0800)]
MDL-36449 usability: Normalising icons on course page

8 years agoMerge branch 'w46_MDL-36457_m24_jsmin' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 14 Nov 2012 03:32:52 +0000 (11:32 +0800)]
Merge branch 'w46_MDL-36457_m24_jsmin' of git://github.com/skodak/moodle

8 years agoMerge branch 'w46_MDL-36283_m24_cohortmembers' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 14 Nov 2012 03:25:54 +0000 (11:25 +0800)]
Merge branch 'w46_MDL-36283_m24_cohortmembers' of git://github.com/skodak/moodle

8 years agoMDL-36417 course: Unit tests for section visibility
Frederic Massart [Wed, 14 Nov 2012 02:08:26 +0000 (10:08 +0800)]
MDL-36417 course: Unit tests for section visibility

8 years agoMerge branch 'MDL-35358' of git://github.com/rwijaya/moodle
Dan Poltawski [Wed, 14 Nov 2012 03:16:47 +0000 (11:16 +0800)]
Merge branch 'MDL-35358' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'wip-MDL-36267-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 14 Nov 2012 02:45:19 +0000 (10:45 +0800)]
Merge branch 'wip-MDL-36267-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-26660-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 14 Nov 2012 02:33:45 +0000 (10:33 +0800)]
Merge branch 'MDL-26660-master' of git://github.com/FMCorz/moodle

8 years agoMDL-36526 calendar: calender ical import should allow webcal:// protocols
Ankit Agarwal [Tue, 13 Nov 2012 05:54:23 +0000 (13:54 +0800)]
MDL-36526 calendar: calender ical import should allow webcal:// protocols

8 years agoMerge branch 'wip-MDL-36048-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 14 Nov 2012 01:58:27 +0000 (09:58 +0800)]
Merge branch 'wip-MDL-36048-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-34520-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Wed, 14 Nov 2012 01:55:51 +0000 (09:55 +0800)]
Merge branch 'MDL-34520-master' of git://github.com/ankitagarwal/moodle

8 years agoMDL-36267 corrected phpdocs for get_fast_modinfo()
Marina Glancy [Wed, 14 Nov 2012 01:52:52 +0000 (09:52 +0800)]
MDL-36267 corrected phpdocs for get_fast_modinfo()

8 years agoMDL-36540 - Survey language pack typo
Amy Groshek [Wed, 14 Nov 2012 01:44:42 +0000 (09:44 +0800)]
MDL-36540 - Survey language pack typo

8 years agoMDL-24736 anotating tinymce changes to readme
Aparup Banerjee [Wed, 14 Nov 2012 01:40:59 +0000 (09:40 +0800)]
MDL-24736 anotating tinymce changes to readme

8 years agoMDL-36417 course: Toggling section visibility update module visibility
Frederic Massart [Wed, 7 Nov 2012 07:13:07 +0000 (15:13 +0800)]
MDL-36417 course: Toggling section visibility update module visibility

8 years agoMerge branch 'master_MDL-36467' of git://github.com/danmarsden/moodle
Dan Poltawski [Wed, 14 Nov 2012 01:30:59 +0000 (09:30 +0800)]
Merge branch 'master_MDL-36467' of git://github.com/danmarsden/moodle

8 years agoMDL-36048 advise theme developers to output course header/footer
Marina Glancy [Wed, 14 Nov 2012 01:29:54 +0000 (09:29 +0800)]
MDL-36048 advise theme developers to output course header/footer

8 years agoMerge branch 'MDL-36369' of git://github.com/timhunt/moodle
Dan Poltawski [Wed, 14 Nov 2012 01:29:51 +0000 (09:29 +0800)]
Merge branch 'MDL-36369' of git://github.com/timhunt/moodle

8 years agoMerge branch 'wip-MDL-36413-master' of https://github.com/nicolasconnault/moodle
Dan Poltawski [Wed, 14 Nov 2012 01:18:27 +0000 (09:18 +0800)]
Merge branch 'wip-MDL-36413-master' of https://github.com/nicolasconnault/moodle

8 years agoMerge branch 'wip_master_mdl-25736_tinymce_spellchecker_frech_issues' of https:/...
Aparup Banerjee [Wed, 14 Nov 2012 01:12:28 +0000 (09:12 +0800)]
Merge branch 'wip_master_mdl-25736_tinymce_spellchecker_frech_issues' of https://github.com/iarenaza/moodle

8 years agoMDL-34762 course Hide system archetypes from mod chooser
Michael Aherne [Mon, 29 Oct 2012 15:18:21 +0000 (15:18 +0000)]
MDL-34762 course Hide system archetypes from mod chooser

8 years agoMerge branch 'MDL-36494-invalid-update-debugging' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 14 Nov 2012 00:31:29 +0000 (08:31 +0800)]
Merge branch 'MDL-36494-invalid-update-debugging' of git://github.com/mudrd8mz/moodle

8 years agoMDL-36575: Adding mod_lti_generator
Mark Nielsen [Tue, 13 Nov 2012 17:56:13 +0000 (09:56 -0800)]
MDL-36575: Adding mod_lti_generator

This adds the hook for LTI module generation
for unit tests.

8 years agoMDL-36369 qtypes and qbehaviour settings permissions.
Tim Hunt [Tue, 13 Nov 2012 16:07:28 +0000 (16:07 +0000)]
MDL-36369 qtypes and qbehaviour settings permissions.

The correct policy is that users with moodle/question:config can set the
default settings for particular qtypes. However, it requires
moodle/site:config in order to do manage qbehaviours or manage qtypes.

8 years agoMDL-30643 - Improved error reporting for daily stats tests.
Tyler Bannister [Tue, 13 Nov 2012 15:37:25 +0000 (10:37 -0500)]
MDL-30643 - Improved error reporting for daily stats tests.

8 years agoMDL-36369 Question types and behaviour settings should not require moodle/site:config
Marina Glancy [Fri, 9 Nov 2012 04:30:32 +0000 (12:30 +0800)]
MDL-36369 Question types and behaviour settings should not require moodle/site:config

8 years agoMDL-30545 messaging - remove DISTINCT from union statement
Dan Poltawski [Tue, 13 Nov 2012 14:34:36 +0000 (22:34 +0800)]
MDL-30545 messaging - remove DISTINCT from union statement

8 years agoMDL-36494 Do not display a debugging message about invalid update info
David Mudrák [Tue, 13 Nov 2012 10:24:55 +0000 (11:24 +0100)]
MDL-36494 Do not display a debugging message about invalid update info

It turned out that this well-meant debugging message just caused a lot
of false alarm with no good reason. It seems to be better just ignore it
at the moment.

8 years agoMDL-36561 chat: Chat does not use calendar icons
Frederic Massart [Tue, 13 Nov 2012 09:40:04 +0000 (17:40 +0800)]
MDL-36561 chat: Chat does not use calendar icons

8 years agoMDL-30545 - messagelib: use $DB->sql_concat()
Dan Poltawski [Tue, 13 Nov 2012 07:09:14 +0000 (15:09 +0800)]
MDL-30545 - messagelib: use $DB->sql_concat()

8 years agoMDL-30643 - Fixed timezone problems in test cases.
Tyler Bannister [Tue, 13 Nov 2012 03:46:30 +0000 (22:46 -0500)]
MDL-30643 - Fixed timezone problems in test cases.

resolved integration time changes conflict.
Conflicts:
lib/tests/statslib_test.php

8 years agoMerge branch 'w46_MDL-36169_m24_enrolsort' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 13 Nov 2012 05:40:18 +0000 (13:40 +0800)]
Merge branch 'w46_MDL-36169_m24_enrolsort' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-30545' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 13 Nov 2012 05:21:50 +0000 (13:21 +0800)]
Merge branch 'MDL-30545' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-36509' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Tue, 13 Nov 2012 05:04:14 +0000 (13:04 +0800)]
Merge branch 'MDL-36509' of git://github.com/netspotau/moodle-mod_assign

8 years agoMerge branch 'wip-MDL-36398-master' of git://github.com/barbararamiro/moodle
Dan Poltawski [Tue, 13 Nov 2012 04:57:30 +0000 (12:57 +0800)]
Merge branch 'wip-MDL-36398-master' of git://github.com/barbararamiro/moodle

8 years agoMDL-30643 - Fixed timezone problems in test cases.
Tyler Bannister [Tue, 13 Nov 2012 03:46:30 +0000 (22:46 -0500)]
MDL-30643 - Fixed timezone problems in test cases.

8 years agoMDL-30643 - Added fifth table to speed up enrolment look ups.
Tyler Bannister [Tue, 4 Sep 2012 14:11:16 +0000 (10:11 -0400)]
MDL-30643 - Added fifth table to speed up enrolment look ups.

8 years agoMDL-36509: Assignment grading table rownum offset is wrong by one.
Damyon Wiese [Tue, 13 Nov 2012 00:51:00 +0000 (08:51 +0800)]
MDL-36509: Assignment grading table rownum offset is wrong by one.

8 years agoMDL-36467 SCORM: remove old debugging superceded by full scorm debugger
Dan Marsden [Mon, 12 Nov 2012 20:02:43 +0000 (09:02 +1300)]
MDL-36467 SCORM: remove old debugging superceded by full scorm debugger

8 years agoMDL-30643 statslib test - remove using $CFG->timezone=99 for unit test as it clashes...
Aparup Banerjee [Mon, 12 Nov 2012 16:49:21 +0000 (00:49 +0800)]
MDL-30643 statslib test - remove using $CFG->timezone=99 for unit test as it clashes with test data in other tz

8 years agoMDL-30643 added tables to upgrade script
Aparup Banerjee [Mon, 12 Nov 2012 07:50:19 +0000 (15:50 +0800)]
MDL-30643 added tables to upgrade script

8 years agoMDL-30643 fixed statslib test start timestamp
Aparup Banerjee [Mon, 12 Nov 2012 06:43:55 +0000 (14:43 +0800)]
MDL-30643 fixed statslib test start timestamp

8 years agoMerge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle
Aparup Banerjee [Mon, 12 Nov 2012 06:29:45 +0000 (14:29 +0800)]
Merge branch 'MDL-30643_master-log-speed' of git://github.com/tbannister/moodle

8 years agoMDL-36331 core_grade: fixed up 2 incorrect default return URLs
Andrew Davis [Thu, 8 Nov 2012 08:38:16 +0000 (16:38 +0800)]
MDL-36331 core_grade: fixed up 2 incorrect default return URLs

8 years agoMDL-36061 gradebook: grade_item->refresh_grades doesn't propagate $userid
Matt Switlik [Fri, 19 Oct 2012 13:23:43 +0000 (09:23 -0400)]
MDL-36061 gradebook: grade_item->refresh_grades doesn't propagate $userid

8 years agoMDL-35260 - fix trailing whitespace
Dan Poltawski [Mon, 12 Nov 2012 03:07:19 +0000 (11:07 +0800)]
MDL-35260 - fix trailing whitespace

8 years agoMerge branch 'wip-MDL-35260-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 12 Nov 2012 03:04:23 +0000 (11:04 +0800)]
Merge branch 'wip-MDL-35260-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-35422-workshop-submit-button' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 12 Nov 2012 02:36:16 +0000 (10:36 +0800)]
Merge branch 'MDL-35422-workshop-submit-button' of git://github.com/mudrd8mz/moodle

8 years agoMerge branch 'w46_MDL-36487_m24_ieheaders' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 12 Nov 2012 02:30:36 +0000 (10:30 +0800)]
Merge branch 'w46_MDL-36487_m24_ieheaders' of git://github.com/skodak/moodle

8 years agoMerge branch 'wip-MDL-36111-m24' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 12 Nov 2012 02:26:29 +0000 (10:26 +0800)]
Merge branch 'wip-MDL-36111-m24' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'w46_MDL-36481_m24_intranetie' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 12 Nov 2012 02:17:34 +0000 (10:17 +0800)]
Merge branch 'w46_MDL-36481_m24_intranetie' of git://github.com/skodak/moodle

8 years agoMerge branch 'wip-MDL-36450-master' of git://github.com/barbararamiro/moodle
Dan Poltawski [Mon, 12 Nov 2012 02:10:30 +0000 (10:10 +0800)]
Merge branch 'wip-MDL-36450-master' of git://github.com/barbararamiro/moodle

Conflicts:
pix/help.png
pix/help.svg
pix/i/outcomes.png
pix/i/outcomes.svg

8 years agoMDL-36111 cache: Fixed up typo's and trivial issues
Sam Hemelryk [Sun, 11 Nov 2012 21:36:53 +0000 (10:36 +1300)]
MDL-36111 cache: Fixed up typo's and trivial issues

8 years agoMDL-36283 use accesscontext when assigning cohort members
Petr Škoda [Sat, 10 Nov 2012 19:43:35 +0000 (20:43 +0100)]
MDL-36283 use accesscontext when assigning cohort members

8 years agoMDL-25736 TinyMce Spellchecker French issues
Iñaki Arenaza [Sun, 4 Sep 2011 21:03:12 +0000 (23:03 +0200)]
MDL-25736 TinyMce Spellchecker French issues

GoogleSpell checker already returns data un UTF8, so there's no need
to use utf8_encode (in fact, using it completely mangles the string).

All credit goes to David Quintal for finding the issue and proposing
the fix.

8 years agoMDL-36487 do not use IE=edge header on pages that have custom X-UA-Compatible
Petr Škoda [Sat, 10 Nov 2012 10:47:09 +0000 (11:47 +0100)]
MDL-36487 do not use IE=edge header on pages that have custom X-UA-Compatible

Thanks Dan Poltawski for spotting this regression!

8 years agoMDL-36048 Modify themes to add course headers and footers provided by course format
Marina Glancy [Thu, 1 Nov 2012 08:13:21 +0000 (16:13 +0800)]
MDL-36048 Modify themes to add course headers and footers provided by course format