moodle.git
12 years agoMerge branch 'MDL-38141-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 26 Feb 2013 00:19:29 +0000 (01:19 +0100)]
Merge branch 'MDL-38141-m' of git://github.com/andrewnicols/moodle

12 years agoMerge branch 'wip-MDL-38110-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 25 Feb 2013 23:48:22 +0000 (00:48 +0100)]
Merge branch 'wip-MDL-38110-m25' of git://github.com/samhemelryk/moodle

12 years agoMerge branch 'MDL-38090-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 25 Feb 2013 23:33:32 +0000 (00:33 +0100)]
Merge branch 'MDL-38090-m' of git://github.com/andrewnicols/moodle

12 years agoMerge branch 'wip-MDL-38146-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 25 Feb 2013 22:52:20 +0000 (23:52 +0100)]
Merge branch 'wip-MDL-38146-master' of git://github.com/marinaglancy/moodle

12 years agoMerge branch 'MDL-38001-master' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Mon, 25 Feb 2013 22:51:20 +0000 (23:51 +0100)]
Merge branch 'MDL-38001-master' of git://github.com/mouneyrac/moodle

12 years agoMerge branch 'MDL-30098_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Mon, 25 Feb 2013 22:38:20 +0000 (23:38 +0100)]
Merge branch 'MDL-30098_master' of git://github.com/markn86/moodle

Conflicts:
course/tests/externallib_test.php

12 years agoMerge branch 'wip-MDL-36287-m25' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 25 Feb 2013 07:49:13 +0000 (15:49 +0800)]
Merge branch 'wip-MDL-36287-m25' of git://github.com/samhemelryk/moodle

12 years agoMerge branch 'wip-MDL-38145-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 25 Feb 2013 07:42:13 +0000 (15:42 +0800)]
Merge branch 'wip-MDL-38145-master' of git://github.com/marinaglancy/moodle

12 years agoMerge branch 'wip-MDL-38163-m25' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 25 Feb 2013 07:39:30 +0000 (15:39 +0800)]
Merge branch 'wip-MDL-38163-m25' of git://github.com/samhemelryk/moodle

12 years agoMDL-37641 Version number bump for js changes.
Damyon Wiese [Mon, 25 Feb 2013 07:25:01 +0000 (15:25 +0800)]
MDL-37641 Version number bump for js changes.

12 years agoMerge branch 'MDL-37641-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 25 Feb 2013 07:23:19 +0000 (15:23 +0800)]
Merge branch 'MDL-37641-master' of git://github.com/FMCorz/moodle

12 years agoMerge branch 'w08_MDL-38121_m25_plugincheck' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 25 Feb 2013 06:34:07 +0000 (14:34 +0800)]
Merge branch 'w08_MDL-38121_m25_plugincheck' of git://github.com/skodak/moodle

12 years agoMerge branch 'MDL-37770-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 25 Feb 2013 06:32:01 +0000 (14:32 +0800)]
Merge branch 'MDL-37770-master' of git://github.com/damyon/moodle

12 years agoMerge branch 'MDL-36832-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 25 Feb 2013 06:19:36 +0000 (14:19 +0800)]
Merge branch 'MDL-36832-master' of git://github.com/damyon/moodle

12 years agoMerge branch 'wip-MDL-35875-master' of git://github.com/phalacee/moodle
Damyon Wiese [Mon, 25 Feb 2013 06:09:33 +0000 (14:09 +0800)]
Merge branch 'wip-MDL-35875-master' of git://github.com/phalacee/moodle

12 years agoMDL-28692 Base theme - Version bump for css change
Damyon Wiese [Mon, 25 Feb 2013 05:50:01 +0000 (13:50 +0800)]
MDL-28692 Base theme - Version bump for css change

12 years agoMerge branch 'MDL-28692_master' of git://github.com/lazydaisy/moodle
Damyon Wiese [Mon, 25 Feb 2013 05:32:25 +0000 (13:32 +0800)]
Merge branch 'MDL-28692_master' of git://github.com/lazydaisy/moodle

12 years agoMDL-30072 Notes webservices - Fix one parameter description and bump version.
Damyon Wiese [Mon, 25 Feb 2013 05:14:18 +0000 (13:14 +0800)]
MDL-30072 Notes webservices - Fix one parameter description and bump version.

12 years agoMerge branch 'wip-MDL-30072-master' of git://github.com/phalacee/moodle
Damyon Wiese [Mon, 25 Feb 2013 04:37:56 +0000 (12:37 +0800)]
Merge branch 'wip-MDL-30072-master' of git://github.com/phalacee/moodle

12 years agoMDL-33934 MyMobile theme - Fix white space, indenting and file permissions
Damyon Wiese [Mon, 25 Feb 2013 04:24:55 +0000 (12:24 +0800)]
MDL-33934 MyMobile theme - Fix white space, indenting and file permissions

12 years agoMerge branch 'MDL-33934_master' of git://github.com/lazydaisy/moodle
Damyon Wiese [Mon, 25 Feb 2013 04:10:06 +0000 (12:10 +0800)]
Merge branch 'MDL-33934_master' of git://github.com/lazydaisy/moodle

12 years agoMDL-37455 lang - fix trailing whitespace
Dan Poltawski [Mon, 25 Feb 2013 04:05:16 +0000 (12:05 +0800)]
MDL-37455 lang - fix trailing whitespace

12 years agoMerge branch 'wip-MDL-37455-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 25 Feb 2013 03:43:48 +0000 (11:43 +0800)]
Merge branch 'wip-MDL-37455-master' of git://github.com/marinaglancy/moodle

12 years agoMerge branch 'MDL-38052_master' of git://github.com/kordan/moodle
Damyon Wiese [Mon, 25 Feb 2013 03:38:13 +0000 (11:38 +0800)]
Merge branch 'MDL-38052_master' of git://github.com/kordan/moodle

12 years agoMDL-38113: Blind Marking grader email reveals submitters details
Tim Lock [Wed, 20 Feb 2013 02:48:11 +0000 (13:18 +1030)]
MDL-38113: Blind Marking grader email reveals submitters details

12 years agoMerge branch 'wip-MDL-38091-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 25 Feb 2013 03:00:03 +0000 (11:00 +0800)]
Merge branch 'wip-MDL-38091-master' of git://github.com/marinaglancy/moodle

12 years agoMerge branch 'w08_MDL-38042_m25_flatroles' of git://github.com/skodak/moodle
Damyon Wiese [Mon, 25 Feb 2013 02:50:38 +0000 (10:50 +0800)]
Merge branch 'w08_MDL-38042_m25_flatroles' of git://github.com/skodak/moodle

12 years agoMerge branch 'w08_MDL-38096_m25_manenrol' of git://github.com/skodak/moodle
Damyon Wiese [Mon, 25 Feb 2013 02:44:54 +0000 (10:44 +0800)]
Merge branch 'w08_MDL-38096_m25_manenrol' of git://github.com/skodak/moodle

12 years agoMerge branch 'MDL-38164_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 25 Feb 2013 02:43:52 +0000 (10:43 +0800)]
Merge branch 'MDL-38164_master' of git://github.com/dmonllao/moodle

12 years agoMerge branch 'MDL-38061-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 25 Feb 2013 02:16:29 +0000 (10:16 +0800)]
Merge branch 'MDL-38061-master' of git://github.com/damyon/moodle

12 years agoMDL-38096 use separate manual enrol and unenrol capabilities in UI
Petr Škoda [Sun, 24 Feb 2013 12:28:48 +0000 (13:28 +0100)]
MDL-38096 use separate manual enrol and unenrol capabilities in UI

12 years agoMDL-37963 do request flatfile role mapping when adding new roles
Petr Škoda [Sun, 24 Feb 2013 11:17:16 +0000 (12:17 +0100)]
MDL-37963 do request flatfile role mapping when adding new roles

12 years agoMDL-38121 tell admins when plugin installed into wrong dir
Petr Škoda [Sat, 23 Feb 2013 17:16:42 +0000 (18:16 +0100)]
MDL-38121 tell admins when plugin installed into wrong dir

12 years agoMDL-33934 theme_mymobile: Updates to CSS & Javascript - including MDL-38072 removing...
Mary Evans [Sat, 23 Feb 2013 15:46:05 +0000 (15:46 +0000)]
MDL-33934 theme_mymobile: Updates to CSS & Javascript - including MDL-38072 removing css/js for collapsed topic.

The following comments is a mash of commits for reference only:

Squashed commit of the following:

commit a6ab42de71e41c0760d6d99dec7a3ec6ef8b7e52
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sat Feb 23 15:34:12 2013 +0000

    MDL-33934 theme_mymobile: fixing whitspace and undoing some previous confict changes fixing where broken.

commit a5abe86fad012f2face9dbd98826583499f46b88
Merge: 89c04c2 13c3ee1
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sat Feb 23 15:18:17 2013 +0000

    Merge branch 'wip-MDL-33934_master' of github.com:lazydaisy/moodle into wip-MDL-33934_master

    Conflicts:
        theme/mymobile/javascript/custom.js
        theme/mymobile/style/core.css

commit 89c04c2bee75938ba5e6f6b54f43ff866c6119b6
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sat Feb 23 15:01:43 2013 +0000

    MDL-33934 theme_mymobile: Removed collapsed topic contributed plugin css/js from style/core.css & javascript/custom.js

commit ddee12ebd2083af0ebebd747e867957d46a10af7
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Feb 19 11:05:35 2013 +0000

    MDL-33934 theme-mymobile: un-commenting $(document).ready(function() in javascript/custom.js.

commit 365bb2d9772f9fd2cb55139f728fa9611dac7b4d
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sun Feb 17 17:41:47 2013 +0000

    MDL-33934 theme_mymobile: updates to javascript and css

commit 13c3ee133945ce0e2a55dd54e0c8b8e2a35f76c5
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Feb 19 11:05:35 2013 +0000

    MDL-33934 theme-mymobile: un-commenting $(document).ready(function() in javascript/custom.js.

commit c9e626adf810e3d8d3f776b99d648017033fdb39
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sun Feb 17 17:41:47 2013 +0000

    MDL-33934 theme_mymobile: updates to javascript and css

12 years agoMDL-38146 fixing navigation when adding/editing course category
Marina Glancy [Thu, 21 Feb 2013 01:47:14 +0000 (12:47 +1100)]
MDL-38146 fixing navigation when adding/editing course category

12 years agoMDL-38145 conditionlib_test calls API functions to create course and category
Marina Glancy [Thu, 21 Feb 2013 01:25:54 +0000 (12:25 +1100)]
MDL-38145 conditionlib_test calls API functions to create course and category

12 years agoMDL-38091 fixed bug with SQL query on Oracle
Marina Glancy [Wed, 20 Feb 2013 01:52:33 +0000 (12:52 +1100)]
MDL-38091 fixed bug with SQL query on Oracle

12 years agoMDL-37455 mod_folder can display content inline. Coding style corrections
Marina Glancy [Fri, 15 Feb 2013 09:12:31 +0000 (20:12 +1100)]
MDL-37455 mod_folder can display content inline. Coding style corrections

12 years agoMDL-37455 Performance improvement in mod_folder
Marina Glancy [Thu, 24 Jan 2013 01:39:26 +0000 (12:39 +1100)]
MDL-37455 Performance improvement in mod_folder

We cache and store additional data in cm_info::customdata and do not
query DB every time the folder is displayed on a course page

12 years agoMDL-37455 Allow mod_folder to display the content inline on course page instead of...
Marina Glancy [Wed, 23 Jan 2013 04:53:29 +0000 (15:53 +1100)]
MDL-37455 Allow mod_folder to display the content inline on course page instead of on separate page

12 years agoMDL-35175 - Lesson shows no attempts if associated with a grouping
Rex Lorenzo [Wed, 16 Jan 2013 21:40:00 +0000 (13:40 -0800)]
MDL-35175 - Lesson shows no attempts if associated with a grouping

12 years agoMDL-38090 JavaScript Make forms JS more resilient
Andrew Robert Nicols [Mon, 18 Feb 2013 15:02:38 +0000 (15:02 +0000)]
MDL-38090 JavaScript Make forms JS more resilient

This issue also corrects the way in which Y.one is called. Previously it
was called as constructor rather than as a static method so it always
returned a Y.Node, regardless of whether a node was found.

Additionally, this adds a config setting to the YUI configuration such that
debug messages are not shown in the JS console when debugging is disabled.

12 years agoMDL-35816 - User - Modify the profile page to use semantic HTML rather than tables...
Jason Fowler [Thu, 10 Jan 2013 05:11:38 +0000 (13:11 +0800)]
MDL-35816 - User - Modify the profile page to use semantic HTML rather than tables for layout

12 years agoMDL-30072 - Notes, Webservices - adding Webservices for notes
Jason Fowler [Mon, 7 Jan 2013 04:01:22 +0000 (12:01 +0800)]
MDL-30072 - Notes, Webservices - adding Webservices for notes

12 years agoMDL-38164 behat: No switch completely if it is false
David Monllao [Fri, 22 Feb 2013 03:37:47 +0000 (11:37 +0800)]
MDL-38164 behat: No switch completely if it is false

12 years agoweekly release 2.5dev
Damyon Wiese [Fri, 22 Feb 2013 02:55:48 +0000 (10:55 +0800)]
weekly release 2.5dev

12 years agoFix permissions
Damyon Wiese [Fri, 22 Feb 2013 02:53:47 +0000 (10:53 +0800)]
Fix permissions

12 years agoMDL-38061 Assignment - Use $CFG->showuseridentity to add extra fields to the assignme...
Damyon Wiese [Fri, 22 Feb 2013 02:12:20 +0000 (10:12 +0800)]
MDL-38061 Assignment - Use $CFG->showuseridentity to add extra fields to the assignment grading table/user summary.

12 years agoMDL-38162 config_cache: fixed issue with empty values array
Sam Hemelryk [Fri, 22 Feb 2013 01:26:34 +0000 (14:26 +1300)]
MDL-38162 config_cache: fixed issue with empty values array

12 years agoMDL-36287 block_navigation: ajax loading events are now delegated
Sam Hemelryk [Mon, 18 Feb 2013 21:34:42 +0000 (10:34 +1300)]
MDL-36287 block_navigation: ajax loading events are now delegated

12 years agoMDL-38052 theme_formal_white: allowed the overlap between headermenu and header logo
kordan [Thu, 21 Feb 2013 17:11:32 +0000 (18:11 +0100)]
MDL-38052 theme_formal_white: allowed the overlap between headermenu and header logo

12 years agoMerge branch 'MDL-33996-forum-advanced-timestamp' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Thu, 21 Feb 2013 14:11:37 +0000 (22:11 +0800)]
Merge branch 'MDL-33996-forum-advanced-timestamp' of git://github.com/mudrd8mz/moodle

12 years agoMDL-33996 Remove the nopostscontaining string from the forum module
David Mudrák [Thu, 21 Feb 2013 13:50:15 +0000 (14:50 +0100)]
MDL-33996 Remove the nopostscontaining string from the forum module

After Mark's improvements at the search results display page, the string
is not needed any more.

12 years agoMDL-33996 Forum search. Stop displaying raw search strings to users
Mark Johnson [Thu, 21 Feb 2013 12:55:45 +0000 (12:55 +0000)]
MDL-33996 Forum search. Stop displaying raw search strings to users

12 years agoMDL-37770 Assignment submission comments do not work without javascript.
Damyon Wiese [Thu, 21 Feb 2013 03:51:21 +0000 (11:51 +0800)]
MDL-37770 Assignment submission comments do not work without javascript.

This is mostly fixed by MDL-36832 which correctly sets the $PAGE->url.

This patch hides the submit and textareas from submission comments in the grading table when
javascript is disabled and quickgrading is enabled. This particular combination results in a form
nested in a form which does not work (and cannot be fixed in a reasonable amount of time).

12 years agoMDL-36832 Assignment Fix issues found by unit tests with previous patch
Damyon Wiese [Thu, 21 Feb 2013 03:22:06 +0000 (11:22 +0800)]
MDL-36832 Assignment Fix issues found by unit tests with previous patch

12 years agoMDL-36832 Assignment - Use MUC for caching the useridlist and change all pages to...
Damyon Wiese [Thu, 21 Feb 2013 03:01:38 +0000 (11:01 +0800)]
MDL-36832 Assignment - Use MUC for caching the useridlist and change all pages to redirect after post.

This means that the $PAGE->url is properly set for all pages and is required to fix some edge cases with the comments api when
javascript is disabled. It also means logging in after a timeout will work nicely and other Good Things (tm).

12 years agoMerge branch 'MDL-37997-muc-stats-display' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Thu, 21 Feb 2013 01:38:05 +0000 (09:38 +0800)]
Merge branch 'MDL-37997-muc-stats-display' of git://github.com/mudrd8mz/moodle

12 years agoMDL-38141 JavaScript: Remove unused dependency in module chooser
Andrew Robert Nicols [Wed, 20 Feb 2013 21:37:37 +0000 (21:37 +0000)]
MDL-38141 JavaScript: Remove unused dependency in module chooser

12 years agoMDL-38110 cache: increased ttl unit test value to avoid timing issues
Sam Hemelryk [Wed, 20 Feb 2013 20:52:21 +0000 (09:52 +1300)]
MDL-38110 cache: increased ttl unit test value to avoid timing issues

12 years agoMDL-37224 backup-import: better handling of search button
Sam Hemelryk [Wed, 20 Feb 2013 19:23:58 +0000 (08:23 +1300)]
MDL-37224 backup-import: better handling of search button

12 years agoMDL-37997 Yet more CSS improvements to display MUC caches usage
David Mudrák [Wed, 20 Feb 2013 16:00:57 +0000 (17:00 +0100)]
MDL-37997 Yet more CSS improvements to display MUC caches usage

12 years agoRevert "MDL-36380 stats: No more duplicated entries when viewing monthly stats"
Dan Poltawski [Wed, 20 Feb 2013 09:04:33 +0000 (17:04 +0800)]
Revert "MDL-36380 stats: No more duplicated entries when viewing monthly stats"

This reverts commit 304baba01a8c1de6bf32f98f7c188e12b72a9a99.

12 years agoMerge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 20 Feb 2013 06:27:27 +0000 (14:27 +0800)]
Merge branch 'MDL-35622-master' of git://github.com/FMCorz/moodle

12 years agoMDL-37329 Navigation: Enrolled courses in category should be added only.
Rajesh Taneja [Wed, 20 Feb 2013 03:12:11 +0000 (11:12 +0800)]
MDL-37329 Navigation: Enrolled courses in category should be added only.

12 years agoMDL-35622 files: Fixed typo in galleryitem extension
Frederic Massart [Wed, 20 Feb 2013 04:23:18 +0000 (12:23 +0800)]
MDL-35622 files: Fixed typo in galleryitem extension

12 years agoMDL-38001 rename the download button into install button
Jerome Mouneyrac [Wed, 20 Feb 2013 03:39:47 +0000 (11:39 +0800)]
MDL-38001 rename the download button into install button

12 years agoMerge branch 'wip-mdl-37329-new' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Wed, 20 Feb 2013 00:54:57 +0000 (08:54 +0800)]
Merge branch 'wip-mdl-37329-new' of git://github.com/rajeshtaneja/moodle

12 years agoMDL-37641 files: Tests for draftfile_exists and get_unused_filename
Frederic Massart [Thu, 14 Feb 2013 03:24:28 +0000 (11:24 +0800)]
MDL-37641 files: Tests for draftfile_exists and get_unused_filename

12 years agoMDL-37641 files: Improve file name suggestion and performance
Frederic Massart [Thu, 14 Feb 2013 03:24:01 +0000 (11:24 +0800)]
MDL-37641 files: Improve file name suggestion and performance

12 years agoMDL-37894 Amend tests with new openclose rule.
Eloy Lafuente (stronk7) [Wed, 20 Feb 2013 00:36:20 +0000 (01:36 +0100)]
MDL-37894 Amend tests with new openclose rule.

12 years agoMerge branch 'wip-MDL-37224-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 23:48:12 +0000 (00:48 +0100)]
Merge branch 'wip-MDL-37224-m25' of git://github.com/samhemelryk/moodle

12 years agoMerge branch 'wip-MDL-34298-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 23:45:50 +0000 (00:45 +0100)]
Merge branch 'wip-MDL-34298-m25' of git://github.com/samhemelryk/moodle

12 years agoMerge branch 'MDL-38093' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 23:44:54 +0000 (00:44 +0100)]
Merge branch 'MDL-38093' of git://github.com/timhunt/moodle

12 years agoMerge branch 'MDL-37894' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 23:39:44 +0000 (00:39 +0100)]
Merge branch 'MDL-37894' of git://github.com/timhunt/moodle

12 years agoMerge branch 'MDL-37967' of git://github.com/jmvedrine/moodle
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 23:32:19 +0000 (00:32 +0100)]
Merge branch 'MDL-37967' of git://github.com/jmvedrine/moodle

12 years agoMerge branch 'wip-MDL-37987-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 23:10:35 +0000 (00:10 +0100)]
Merge branch 'wip-MDL-37987-master' of git://github.com/marinaglancy/moodle

12 years agoMerge branch 'wip-MDL-38075-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 23:07:17 +0000 (00:07 +0100)]
Merge branch 'wip-MDL-38075-m25' of git://github.com/samhemelryk/moodle

12 years agoMerge branch 'MDL-37982_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 23:01:47 +0000 (00:01 +0100)]
Merge branch 'MDL-37982_master' of git://github.com/dmonllao/moodle

12 years agoMerge branch 'MDL-37872-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 22:26:09 +0000 (23:26 +0100)]
Merge branch 'MDL-37872-m' of git://github.com/andrewnicols/moodle

12 years agoMDL-32620 whitespace + comment fixes.
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 12:21:18 +0000 (13:21 +0100)]
MDL-32620 whitespace + comment fixes.

12 years agoMerge branch 'MDL-32620' of git://github.com/scriby/moodle
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 12:13:43 +0000 (13:13 +0100)]
Merge branch 'MDL-32620' of git://github.com/scriby/moodle

12 years agoMerge branch 'MDL-36541' of https://github.com/Lightwork-Marking/moodle
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 12:02:56 +0000 (13:02 +0100)]
Merge branch 'MDL-36541' of https://github.com/Lightwork-Marking/moodle

12 years agoMerge branch 'MDL-35750' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 11:57:10 +0000 (12:57 +0100)]
Merge branch 'MDL-35750' of git://github.com/danpoltawski/moodle

Conflicts:
lib/db/upgrade.php
version.php

12 years agoMerge branch 'MDL-38031-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 11:46:36 +0000 (12:46 +0100)]
Merge branch 'MDL-38031-master' of git://github.com/FMCorz/moodle

12 years agoMerge branch 'MDL-38033_dnd_uppercase_extn' of git://github.com/davosmith/moodle
Eloy Lafuente (stronk7) [Tue, 19 Feb 2013 11:23:41 +0000 (12:23 +0100)]
Merge branch 'MDL-38033_dnd_uppercase_extn' of git://github.com/davosmith/moodle

12 years agoMerge branch 'master_MDL-37660' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 19 Feb 2013 07:04:56 +0000 (15:04 +0800)]
Merge branch 'master_MDL-37660' of git://github.com/danmarsden/moodle

12 years agoMerge branch 'w07_MDL-38059_m25_cachedir' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 19 Feb 2013 06:07:13 +0000 (14:07 +0800)]
Merge branch 'w07_MDL-38059_m25_cachedir' of git://github.com/skodak/moodle

12 years agoMerge branch 'MDL-37217-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 19 Feb 2013 05:54:52 +0000 (13:54 +0800)]
Merge branch 'MDL-37217-master' of git://github.com/FMCorz/moodle

Conflicts:
    version.php
    repository/googledocs/version.php

12 years agoMerge branch 'wip-MDL-38000-m25' of git://github.com/samhemelryk/moodle
Damyon Wiese [Tue, 19 Feb 2013 05:48:12 +0000 (13:48 +0800)]
Merge branch 'wip-MDL-38000-m25' of git://github.com/samhemelryk/moodle

12 years agoMerge branch 'MDL-38048-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 19 Feb 2013 05:44:15 +0000 (13:44 +0800)]
Merge branch 'MDL-38048-master' of git://github.com/FMCorz/moodle

12 years agoMerge branch 'm25_MDL-37449_Reports_ORA-00918_column_ambiguously_defined' of https...
Dan Poltawski [Tue, 19 Feb 2013 05:41:45 +0000 (13:41 +0800)]
Merge branch 'm25_MDL-37449_Reports_ORA-00918_column_ambiguously_defined' of https://github.com/scara/moodle

12 years agoMDL-37217 repository: Google Docs repository uses Google SDK
Frederic Massart [Tue, 8 Jan 2013 09:11:40 +0000 (17:11 +0800)]
MDL-37217 repository: Google Docs repository uses Google SDK

12 years agoMDL-37217 repository: Adding Google API PHP SDK
Frederic Massart [Tue, 8 Jan 2013 09:11:09 +0000 (17:11 +0800)]
MDL-37217 repository: Adding Google API PHP SDK

12 years agoMDL-37217 files: Stricter type check for curl options
Fred [Tue, 19 Feb 2013 05:01:21 +0000 (13:01 +0800)]
MDL-37217 files: Stricter type check for curl options

12 years agoMerge branch 'MDL-38047-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 19 Feb 2013 05:31:11 +0000 (13:31 +0800)]
Merge branch 'MDL-38047-master' of git://github.com/damyon/moodle

12 years agoMerge branch 'wip-MDL-33774-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 19 Feb 2013 04:36:40 +0000 (12:36 +0800)]
Merge branch 'wip-MDL-33774-master' of git://github.com/marinaglancy/moodle

12 years agoMDL-31636 Comments - Call display callback when adding a new comment.
Damyon Wiese [Tue, 19 Feb 2013 03:11:40 +0000 (11:11 +0800)]
MDL-31636 Comments - Call display callback when adding a new comment.

12 years agoMDL-31636 Added strftimeformat to comment object being passed through to xxx_comment_...
Aparup Banerjee [Mon, 18 Feb 2013 08:43:15 +0000 (16:43 +0800)]
MDL-31636 Added strftimeformat to comment object being passed through to xxx_comment_display() for further time format changes.

12 years agoMDL-31636 redirect debugging to error log for ajax
Aparup Banerjee [Mon, 18 Feb 2013 08:40:22 +0000 (16:40 +0800)]
MDL-31636 redirect debugging to error log for ajax