moodle.git
8 years agoMerge branch 'MDL-38973-master' of https://github.com/damyon/moodle
Dan Poltawski [Wed, 10 Apr 2013 06:48:49 +0000 (14:48 +0800)]
Merge branch 'MDL-38973-master' of https://github.com/damyon/moodle

8 years agoMerge branch 'MDL-19072' of git://github.com/jmvedrine/moodle
Dan Poltawski [Wed, 10 Apr 2013 06:10:37 +0000 (14:10 +0800)]
Merge branch 'MDL-19072' of git://github.com/jmvedrine/moodle

8 years agoMDL-38973 Assignment - Attempt history not displaying for blind marking
Damyon Wiese [Wed, 10 Apr 2013 05:44:42 +0000 (13:44 +0800)]
MDL-38973 Assignment - Attempt history not displaying for blind marking

This change makes the attempt history display for teachers and students
even when there is no grade (e.g. blind marking). It also will show the previous
attempt in the grading table when a submission has been newly reopened (instead
of a blank submission).

8 years agoMDL-26649 forms: ensure that both necessary variables are set before altering calenda...
Mark Nelson [Wed, 10 Apr 2013 03:18:17 +0000 (11:18 +0800)]
MDL-26649 forms: ensure that both necessary variables are set before altering calendar image

8 years agoMerge branch 'wip-mdl-35883' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 10 Apr 2013 04:16:23 +0000 (12:16 +0800)]
Merge branch 'wip-mdl-35883' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-38254' of git://github.com/rwijaya/moodle
Dan Poltawski [Wed, 10 Apr 2013 04:08:46 +0000 (12:08 +0800)]
Merge branch 'MDL-38254' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'MDL-39041-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 10 Apr 2013 03:57:49 +0000 (11:57 +0800)]
Merge branch 'MDL-39041-master' of git://github.com/damyon/moodle

8 years agoMDL-39041 Assignment - Fix regression in "allow submission changes".
Damyon Wiese [Wed, 10 Apr 2013 03:30:41 +0000 (11:30 +0800)]
MDL-39041 Assignment - Fix regression in "allow submission changes".

A typo was introduced in the assignment attempt history feature that broke
unlock submissions. This was detected by the new behat test in MDL-38970 (yay).

8 years agoMerge branch 'MDL-38935' of git://github.com/timhunt/moodle
Damyon Wiese [Wed, 10 Apr 2013 03:17:31 +0000 (11:17 +0800)]
Merge branch 'MDL-38935' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-38030-master' of git://github.com/mouneyrac/moodle
Dan Poltawski [Wed, 10 Apr 2013 03:11:47 +0000 (11:11 +0800)]
Merge branch 'MDL-38030-master' of git://github.com/mouneyrac/moodle

8 years agoMerge branch 'MDL-38933-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 10 Apr 2013 03:09:05 +0000 (11:09 +0800)]
Merge branch 'MDL-38933-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-22153' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 10 Apr 2013 02:58:32 +0000 (10:58 +0800)]
Merge branch 'MDL-22153' of git://github.com/stronk7/moodle

8 years agoMerge branch 'MDL-39059-workshop-settype' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 10 Apr 2013 02:55:45 +0000 (10:55 +0800)]
Merge branch 'MDL-39059-workshop-settype' of git://github.com/mudrd8mz/moodle

8 years agoMerge branch 'MDL-37410-master' of git://github.com/mouneyrac/moodle
Dan Poltawski [Wed, 10 Apr 2013 02:37:29 +0000 (10:37 +0800)]
Merge branch 'MDL-37410-master' of git://github.com/mouneyrac/moodle

8 years agoMerge branch 'MDL-38999' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 10 Apr 2013 02:35:40 +0000 (10:35 +0800)]
Merge branch 'MDL-38999' of git://github.com/stronk7/moodle

8 years agoMDL-38912 fix incorrect timeout reset
Petr Škoda [Tue, 9 Apr 2013 21:48:59 +0000 (23:48 +0200)]
MDL-38912 fix incorrect timeout reset

8 years agoMerge branch 'MDL-38938_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 21:43:46 +0000 (23:43 +0200)]
Merge branch 'MDL-38938_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38950_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 21:42:59 +0000 (23:42 +0200)]
Merge branch 'MDL-38950_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38954_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 21:30:43 +0000 (23:30 +0200)]
Merge branch 'MDL-38954_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38952_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 21:30:30 +0000 (23:30 +0200)]
Merge branch 'MDL-38952_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38953_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 21:29:59 +0000 (23:29 +0200)]
Merge branch 'MDL-38953_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38942_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 21:13:44 +0000 (23:13 +0200)]
Merge branch 'MDL-38942_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38969_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 21:13:32 +0000 (23:13 +0200)]
Merge branch 'MDL-38969_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38967_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 21:13:21 +0000 (23:13 +0200)]
Merge branch 'MDL-38967_master' of git://github.com/dmonllao/moodle

8 years agoMDL-39059 Set explicit boolean type of a hidden field in workshop random allocator...
David Mudrák [Tue, 9 Apr 2013 19:46:18 +0000 (21:46 +0200)]
MDL-39059 Set explicit boolean type of a hidden field in workshop random allocator form

8 years agoMerge branch 'MDL-38945_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 18:24:17 +0000 (20:24 +0200)]
Merge branch 'MDL-38945_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38944_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 18:23:38 +0000 (20:23 +0200)]
Merge branch 'MDL-38944_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38943_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 18:22:59 +0000 (20:22 +0200)]
Merge branch 'MDL-38943_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38822_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 18:00:34 +0000 (20:00 +0200)]
Merge branch 'MDL-38822_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38820_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 17:59:45 +0000 (19:59 +0200)]
Merge branch 'MDL-38820_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-39012_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 17:55:29 +0000 (19:55 +0200)]
Merge branch 'MDL-39012_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38965_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 17:40:39 +0000 (19:40 +0200)]
Merge branch 'MDL-38965_master' of git://github.com/dmonllao/moodle

8 years agoMDL-26649 forms: temp disable problematic call
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 17:37:08 +0000 (19:37 +0200)]
MDL-26649 forms: temp disable problematic call

The new version of the dateselector is causing JS to stop
working completely in a lot of forms, so I've disabled
temporarily the ofending call to allow other stuff to be
integrated and tested.

8 years agoMerge branch 'MDL-39056-download-api-version' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 15:36:57 +0000 (17:36 +0200)]
Merge branch 'MDL-39056-download-api-version' of git://github.com/mudrd8mz/moodle

8 years agoMDL-39056 Use new version of API when fetching available updates info
David Mudrák [Tue, 9 Apr 2013 15:07:30 +0000 (17:07 +0200)]
MDL-39056 Use new version of API when fetching available updates info

8 years agoMerge branch 'MDL-38792' of https://github.com/ppichet/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 12:33:31 +0000 (14:33 +0200)]
Merge branch 'MDL-38792' of https://github.com/ppichet/moodle

8 years agoMDL-38887 block nav: reshifter module
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 08:28:24 +0000 (10:28 +0200)]
MDL-38887 block nav: reshifter module

8 years agoMDL-38938 behat: New test
David Monllao [Tue, 9 Apr 2013 08:02:16 +0000 (16:02 +0800)]
MDL-38938 behat: New test

According to MDLQA-38, a teacher can
choose whether to allow duplicate
entries in a glossary.

8 years agoMDL-38938 behat: Step definition to add glossary entries
David Monllao [Tue, 9 Apr 2013 08:01:43 +0000 (16:01 +0800)]
MDL-38938 behat: Step definition to add glossary entries

8 years agoMerge branch 'wip-MDL-38442-m25' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 9 Apr 2013 07:39:57 +0000 (15:39 +0800)]
Merge branch 'wip-MDL-38442-m25' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-26649_master' of https://github.com/markn86/moodle
Damyon Wiese [Tue, 9 Apr 2013 07:13:21 +0000 (15:13 +0800)]
Merge branch 'MDL-26649_master' of https://github.com/markn86/moodle

8 years agoMDL-38950 behat: New tests
David Monllao [Tue, 9 Apr 2013 07:02:11 +0000 (15:02 +0800)]
MDL-38950 behat: New tests

According to MDLQA-1765, a selected
file can be cancelled. Also adding
a test for repository_recent.

8 years agoMDL-38950 behat: Step definition to add files from recent files repo
David Monllao [Tue, 9 Apr 2013 07:01:16 +0000 (15:01 +0800)]
MDL-38950 behat: Step definition to add files from recent files repo

8 years agoMDL-38950 behat: File manager elements contextual menu
David Monllao [Tue, 9 Apr 2013 06:59:31 +0000 (14:59 +0800)]
MDL-38950 behat: File manager elements contextual menu

Modified to work with both file manager elements
and file/folder elements inside modal windows.

8 years agoMerge branch 'w14_MDL-38927_m25_rolelocalisation' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 9 Apr 2013 06:58:47 +0000 (14:58 +0800)]
Merge branch 'w14_MDL-38927_m25_rolelocalisation' of git://github.com/skodak/moodle

8 years agoMerge branch 'w14_MDL-39004_m25_roledocs' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 9 Apr 2013 06:57:08 +0000 (14:57 +0800)]
Merge branch 'w14_MDL-39004_m25_roledocs' of git://github.com/skodak/moodle

8 years agoMDL-26649 forms: added a calendar icon that will display the calendar pop-up when...
Mark Nelson [Thu, 4 Apr 2013 07:33:16 +0000 (15:33 +0800)]
MDL-26649 forms: added a calendar icon that will display the calendar pop-up when clicked rather than the select boxes triggering the event

8 years agoMerge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 9 Apr 2013 06:49:07 +0000 (14:49 +0800)]
Merge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-38927 use role->localname to get real role name
Petr Škoda [Tue, 9 Apr 2013 06:31:25 +0000 (08:31 +0200)]
MDL-38927 use role->localname to get real role name

8 years agoMerge branch 'w14_MDL-38798_m25_php55' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 9 Apr 2013 06:30:52 +0000 (14:30 +0800)]
Merge branch 'w14_MDL-38798_m25_php55' of git://github.com/skodak/moodle

8 years agoMerge branch 'wip-MDL-38887-m25' of git://github.com/marinaglancy/moodle
Aparup Banerjee [Tue, 9 Apr 2013 06:21:22 +0000 (14:21 +0800)]
Merge branch 'wip-MDL-38887-m25' of git://github.com/marinaglancy/moodle

8 years agoMDL-38682 removed auto page type, created issue MDL-39045 to address this
Marina Glancy [Tue, 9 Apr 2013 06:16:21 +0000 (16:16 +1000)]
MDL-38682 removed auto page type, created issue MDL-39045 to address this

8 years agoMDL-31969 Grader report - bump version for capabilities and settings.
Damyon Wiese [Tue, 9 Apr 2013 06:09:27 +0000 (14:09 +0800)]
MDL-31969 Grader report - bump version for capabilities and settings.

8 years agoMerge branch 'wip-mdl-31969' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 9 Apr 2013 06:09:14 +0000 (14:09 +0800)]
Merge branch 'wip-mdl-31969' of git://github.com/rajeshtaneja/moodle

Conflicts:
version.php

8 years agoMDL-31969 grades: Added user preference to show/hide/export suspended users.
Rajesh Taneja [Wed, 27 Mar 2013 02:14:10 +0000 (10:14 +0800)]
MDL-31969 grades: Added user preference to show/hide/export suspended users.

User with course:viewsuspendedusers capability can now show/hide/export
enrolled users whose enrolment is suspended or enrolment time is expired.

8 years agoMDL-35608 Completion status block - use html_writer::link
Damyon Wiese [Tue, 9 Apr 2013 05:55:18 +0000 (13:55 +0800)]
MDL-35608 Completion status block - use html_writer::link

Just changing 2 calls from html_writer::tag to html_writer::link.

8 years agoMerge branch 'wip-MDL-35608-master' of git://github.com/phalacee/moodle
Damyon Wiese [Tue, 9 Apr 2013 05:59:45 +0000 (13:59 +0800)]
Merge branch 'wip-MDL-35608-master' of git://github.com/phalacee/moodle

8 years agoMerge branch 'MDL-39005' of git://github.com/stronk7/moodle
Dan Poltawski [Tue, 9 Apr 2013 05:49:09 +0000 (13:49 +0800)]
Merge branch 'MDL-39005' of git://github.com/stronk7/moodle

8 years agoMerge branch 'MDL-38508-m' of git://github.com/andrewnicols/moodle
Aparup Banerjee [Tue, 9 Apr 2013 05:27:56 +0000 (13:27 +0800)]
Merge branch 'MDL-38508-m' of git://github.com/andrewnicols/moodle

8 years agoMDL-38865 Completion report: Version bump for css changes.
Damyon Wiese [Tue, 9 Apr 2013 05:19:42 +0000 (13:19 +0800)]
MDL-38865 Completion report: Version bump for css changes.

8 years agoMerge branch 'MDL-38865-master' of https://github.com/mackensen/moodle
Damyon Wiese [Tue, 9 Apr 2013 05:20:52 +0000 (13:20 +0800)]
Merge branch 'MDL-38865-master' of https://github.com/mackensen/moodle

8 years agoMerge branch 'MDL-38981' of git://github.com/jmvedrine/moodle
Dan Poltawski [Tue, 9 Apr 2013 05:19:10 +0000 (13:19 +0800)]
Merge branch 'MDL-38981' of git://github.com/jmvedrine/moodle

8 years agoMerge branch 'wip-MDL-34346-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 9 Apr 2013 05:09:57 +0000 (13:09 +0800)]
Merge branch 'wip-MDL-34346-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-34346 fixed missing string and correct instantiating of repositories in tests
Marina Glancy [Tue, 9 Apr 2013 04:40:15 +0000 (14:40 +1000)]
MDL-34346 fixed missing string and correct instantiating of repositories in tests

8 years agoMerge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 9 Apr 2013 03:49:55 +0000 (11:49 +0800)]
Merge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'wip-MDL-38593-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 9 Apr 2013 03:46:27 +0000 (11:46 +0800)]
Merge branch 'wip-MDL-38593-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-38682 Allow configuring blocks for courses lists pages
Marina Glancy [Thu, 28 Mar 2013 05:18:54 +0000 (16:18 +1100)]
MDL-38682 Allow configuring blocks for courses lists pages

Also fixed block configuration form error when pagetype string does not exist (for course- pages)

8 years agoMDL-34346 - bump version
Dan Poltawski [Tue, 9 Apr 2013 03:17:58 +0000 (11:17 +0800)]
MDL-34346 - bump version

8 years agoMerge branch 'wip-MDL-34346-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 9 Apr 2013 02:57:50 +0000 (10:57 +0800)]
Merge branch 'wip-MDL-34346-master' of git://github.com/marinaglancy/moodle

8 years agoMDL-38593 Argument 'id' renamed to 'categoryid' in course/manage.php
Marina Glancy [Tue, 9 Apr 2013 02:55:50 +0000 (12:55 +1000)]
MDL-38593 Argument 'id' renamed to 'categoryid' in course/manage.php

8 years agoMDL-38967 behat: New test
David Monllao [Tue, 9 Apr 2013 02:50:29 +0000 (10:50 +0800)]
MDL-38967 behat: New test

According to MDLQA-58, in an assignment
students can upload files for assessment.

8 years agoMerge branch 'MDL-38766/master' of github.com:kemitix/moodle
Dan Poltawski [Tue, 9 Apr 2013 02:37:23 +0000 (10:37 +0800)]
Merge branch 'MDL-38766/master' of github.com:kemitix/moodle

8 years agoMDL-38969 behat: New test
David Monllao [Tue, 9 Apr 2013 02:32:05 +0000 (10:32 +0800)]
MDL-38969 behat: New test

According to MDLQA-59, in an assignment
students can add and edit text online.

8 years agoMDL-38593 Merge code from /course/category.php into /course/index.php
Marina Glancy [Tue, 9 Apr 2013 02:21:05 +0000 (12:21 +1000)]
MDL-38593 Merge code from /course/category.php into /course/index.php

8 years agoMDL-35608 - Blocks - Updating the Completion Status block to use HTML Writer
Jason Fowler [Fri, 28 Sep 2012 03:10:21 +0000 (11:10 +0800)]
MDL-35608 - Blocks - Updating the Completion Status block to use HTML Writer

8 years agoMerge branch 'wip-MDL-38541-m25' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 9 Apr 2013 01:47:47 +0000 (09:47 +0800)]
Merge branch 'wip-MDL-38541-m25' of git://github.com/marinaglancy/moodle

8 years agoMDL-38541 Make sure course cache is cleared properly during upgrade
Marina Glancy [Tue, 9 Apr 2013 01:09:47 +0000 (11:09 +1000)]
MDL-38541 Make sure course cache is cleared properly during upgrade

- Core upgrade MUST NOT call rebuild_course_cache() at all - update DB directly instead
- Plugins MUST call rebuild_course_cache(.., TRUE) for clearing the course cache and can not update DB directly
- Plugins MUST NOT call rebuild_course_cache() unless for clearing the cache
- Created function upgrade_ensure_not_running() to be included in other functions that can not be used during upgrade

8 years agoMerge branch 'MDL-38934-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 00:47:51 +0000 (02:47 +0200)]
Merge branch 'MDL-38934-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'w14_MDL-38750_m25_ocierrors' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 00:26:49 +0000 (02:26 +0200)]
Merge branch 'w14_MDL-38750_m25_ocierrors' of git://github.com/skodak/moodle

8 years agoMerge branch 'w14_MDL-38753_m25_ocicount' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 00:25:12 +0000 (02:25 +0200)]
Merge branch 'w14_MDL-38753_m25_ocicount' of git://github.com/skodak/moodle

8 years agoMerge branch 'w14_MDL-39038_m25_oracleconcat' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 00:23:36 +0000 (02:23 +0200)]
Merge branch 'w14_MDL-39038_m25_oracleconcat' of git://github.com/skodak/moodle

8 years agoMerge branch 'w14_MDL-39027_m25_sqlsrvdatatype' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 00:19:41 +0000 (02:19 +0200)]
Merge branch 'w14_MDL-39027_m25_sqlsrvdatatype' of git://github.com/skodak/moodle

8 years agoMerge branch 'w14_MDL-39028_m25_sqlsrconcat' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 00:17:56 +0000 (02:17 +0200)]
Merge branch 'w14_MDL-39028_m25_sqlsrconcat' of git://github.com/skodak/moodle

8 years agoMDL-38442 navigation: set_expansion_limit now only hides structural nodes
Sam Hemelryk [Tue, 9 Apr 2013 00:06:26 +0000 (12:06 +1200)]
MDL-38442 navigation: set_expansion_limit now only hides structural nodes

8 years agoMerge branch 'w14_MDL-39019_m25_mssqldatatype' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 00:01:04 +0000 (02:01 +0200)]
Merge branch 'w14_MDL-39019_m25_mssqldatatype' of git://github.com/skodak/moodle

8 years agoMDL-38792 Update question/type in-line comments to codechecker standards
ppichet [Mon, 8 Apr 2013 23:59:51 +0000 (19:59 -0400)]
MDL-38792 Update question/type in-line comments to codechecker standards

Correct bad formated infiles in question/type directories

8 years agoMerge branch 'w14_MDL-39024_m25_mssqlseek' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:58:20 +0000 (01:58 +0200)]
Merge branch 'w14_MDL-39024_m25_mssqlseek' of git://github.com/skodak/moodle

8 years agoMerge branch 'w14_MDL-39022_m25_mssqlconcat' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:53:57 +0000 (01:53 +0200)]
Merge branch 'w14_MDL-39022_m25_mssqlconcat' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-38618_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:44:58 +0000 (01:44 +0200)]
Merge branch 'MDL-38618_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38912' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:36:20 +0000 (01:36 +0200)]
Merge branch 'MDL-38912' of git://github.com/timhunt/moodle

8 years agoMerge branch 'w14_MDL-38786_m25_yui391' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:32:35 +0000 (01:32 +0200)]
Merge branch 'w14_MDL-38786_m25_yui391' of git://github.com/skodak/moodle

8 years agoMDL-34222 simplepie: fix permissions.
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:28:06 +0000 (01:28 +0200)]
MDL-34222 simplepie: fix permissions.

8 years agoMerge branch 'w14_MDL-34222_m25_simplepie131' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:24:08 +0000 (01:24 +0200)]
Merge branch 'w14_MDL-34222_m25_simplepie131' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-38744-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:13:57 +0000 (01:13 +0200)]
Merge branch 'MDL-38744-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-38907-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 22:58:02 +0000 (00:58 +0200)]
Merge branch 'MDL-38907-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-38849' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 22:52:27 +0000 (00:52 +0200)]
Merge branch 'MDL-38849' of git://github.com/timhunt/moodle

8 years agoMDL-39027 make sure sqlsrv does not return non-string data types
Petr Škoda [Mon, 8 Apr 2013 10:43:50 +0000 (12:43 +0200)]
MDL-39027 make sure sqlsrv does not return non-string data types

8 years agoMDL-39038 nasty workaround for Oracle NULL concats
Petr Škoda [Mon, 8 Apr 2013 21:16:55 +0000 (23:16 +0200)]
MDL-39038 nasty workaround for Oracle NULL concats

8 years agoMDL 38508 JavaScript: Split out AJAX and non-AJAX help
Andrew Robert Nicols [Sat, 16 Mar 2013 01:29:05 +0000 (01:29 +0000)]
MDL 38508 JavaScript: Split out AJAX and non-AJAX help

We need to keep these two separate as scripts which define AJAX_SCRIPT
before loading config.php will use a different default renderer and will
return appropriate exceptions which can be parsed by M.core.exception and
M.core.ajaxException correctly.

This also addresses an issue whereby a missing heading could break the
tooltip.

8 years agoMerge branch 'MDL-39023-parentlang' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 14:57:38 +0000 (16:57 +0200)]
Merge branch 'MDL-39023-parentlang' of git://github.com/mudrd8mz/moodle