moodle.git
9 years agoMDL-33398 Cron: fix wrong variable type in completion criterias
Frederic Massart [Thu, 31 May 2012 02:19:15 +0000 (10:19 +0800)]
MDL-33398 Cron: fix wrong variable type in completion criterias

9 years agoMerge branch 'MDL-33397-master' of https://github.com/FMCorz/moodle
Dan Poltawski [Thu, 31 May 2012 02:35:50 +0000 (10:35 +0800)]
Merge branch 'MDL-33397-master' of https://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-32329-all-plugins-ok' of git://github.com/mudrd8mz/moodle
Aparup Banerjee [Wed, 30 May 2012 08:48:23 +0000 (16:48 +0800)]
Merge branch 'MDL-32329-all-plugins-ok' of git://github.com/mudrd8mz/moodle

9 years agoMDL-32329 fixed missing phpdoc and improved coding style
David Mudrak [Wed, 30 May 2012 08:32:48 +0000 (10:32 +0200)]
MDL-32329 fixed missing phpdoc and improved coding style

Credit goes to Aparup Banerjee for spotting this during the integration
review.

9 years agoMDL-32329 improved plugin dependencies check on upgrade
David Mudrak [Fri, 25 May 2012 09:17:43 +0000 (11:17 +0200)]
MDL-32329 improved plugin dependencies check on upgrade

Previously, it was the renderer method that actually called
all_plugins_ok(). I believe that renderer methods should not be
responsible for such an important step in the install/upgrade code flow.
So dependencies are now checked by admin/index.php on upgrade, too.

9 years agoMDL-32329 check for plugin dependencies during the pre-install checking
David Mudrak [Fri, 25 May 2012 08:44:29 +0000 (10:44 +0200)]
MDL-32329 check for plugin dependencies during the pre-install checking

This follows the same path as we have in CLI installers. Plugin
dependencies are checked right after the environment checks and the
install can't continue unless all dependencies are fixed.

9 years agoMDL-32329 new plugininfo_base::is_core_dependency_satisfied() method
David Mudrak [Fri, 25 May 2012 08:38:48 +0000 (10:38 +0200)]
MDL-32329 new plugininfo_base::is_core_dependency_satisfied() method

The method's logic was previously implemented in all_plugins_ok() but we
will need to call it separately. Also make the code cleaner.

9 years agoMDL-32329 CLI install and upgrade scripts display plugins with unsatisfied dependencies
David Mudrak [Thu, 24 May 2012 12:31:13 +0000 (14:31 +0200)]
MDL-32329 CLI install and upgrade scripts display plugins with unsatisfied dependencies

9 years agoMDL-32329 plugin manager returns plugins with unsatisfied dependencies
David Mudrak [Thu, 24 May 2012 12:30:04 +0000 (14:30 +0200)]
MDL-32329 plugin manager returns plugins with unsatisfied dependencies

9 years agoMerge branch 'MDL-33184-master' of https://github.com/FMCorz/moodle
Aparup Banerjee [Wed, 30 May 2012 07:18:59 +0000 (15:18 +0800)]
Merge branch 'MDL-33184-master' of https://github.com/FMCorz/moodle

9 years agoMerge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Wed, 30 May 2012 06:22:34 +0000 (14:22 +0800)]
Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-33045-master-2' of git://git.luns.net.uk/moodle
Dan Poltawski [Wed, 30 May 2012 06:14:50 +0000 (14:14 +0800)]
Merge branch 'MDL-33045-master-2' of git://git.luns.net.uk/moodle

9 years agoRevert "Merge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle"
Sam Hemelryk [Wed, 30 May 2012 04:34:11 +0000 (16:34 +1200)]
Revert "Merge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle"

This reverts commit a09a9be81210a29a0c093ff34dc5685c86b84022, reversing
changes made to 08e0aaa1733489cee61b1c48e166a98ada4477cb.

9 years agoMerge branch 'MDL-33414' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Wed, 30 May 2012 03:45:32 +0000 (11:45 +0800)]
Merge branch 'MDL-33414' of git://github.com/netspotau/moodle-mod_assign

9 years agoMDL-32766 course view section log: fixed the forth param for restore rule specificati...
Rossiani Wijaya [Tue, 29 May 2012 06:19:35 +0000 (14:19 +0800)]
MDL-32766 course view section log: fixed the forth param for restore rule specification to use course_section

9 years agoMerge branch 'MDL-33398b' of git://github.com/srynot4sale/moodle
Dan Poltawski [Wed, 30 May 2012 03:35:56 +0000 (11:35 +0800)]
Merge branch 'MDL-33398b' of git://github.com/srynot4sale/moodle

9 years agoMerge branch 'MDL-33385' of git://github.com/netspotau/moodle-mod_assign
Sam Hemelryk [Wed, 30 May 2012 03:26:27 +0000 (15:26 +1200)]
Merge branch 'MDL-33385' of git://github.com/netspotau/moodle-mod_assign

9 years agoMerge branch 'wip-MDL-33373-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 30 May 2012 03:03:11 +0000 (11:03 +0800)]
Merge branch 'wip-MDL-33373-master' of git://github.com/marinaglancy/moodle

9 years agoMDL-33373 fixed bug in backup of files as a regression from MDL-28666
Marina Glancy [Wed, 30 May 2012 02:11:41 +0000 (10:11 +0800)]
MDL-33373 fixed bug in backup of files as a regression from MDL-28666

9 years agoMDL-33184 Filepicker: rephrased drag and drop sentence
Frederic Massart [Wed, 30 May 2012 02:05:10 +0000 (10:05 +0800)]
MDL-33184 Filepicker: rephrased drag and drop sentence

9 years agoMerge branch 'MDL-33404_resource_dnd_defaults' of https://github.com/moodler/moodle
Dan Poltawski [Wed, 30 May 2012 01:38:22 +0000 (09:38 +0800)]
Merge branch 'MDL-33404_resource_dnd_defaults' of https://github.com/moodler/moodle

9 years agoMDL-33398 completion: Fix coding error (should be arrays not objects)
Aaron Barnes [Tue, 29 May 2012 02:34:16 +0000 (14:34 +1200)]
MDL-33398 completion: Fix coding error (should be arrays not objects)

9 years agoMDL-33385: Assignment plugin settings not visible in admin tree.
Damyon Wiese [Wed, 30 May 2012 01:01:11 +0000 (09:01 +0800)]
MDL-33385: Assignment plugin settings not visible in admin tree.

* Also fixes a regression where file_submissions were not set to default for new installs.

9 years agoMDL-33414: The setting $showviewlink needs to be passed by reference
Damyon Wiese [Wed, 30 May 2012 00:37:56 +0000 (08:37 +0800)]
MDL-33414: The setting $showviewlink needs to be passed by reference

This was preventing the view full submission/feedback link from appearing
everywhere in the assignment when the submission/feedback content had been
truncated in the summary because it was too long (or too many files)

9 years agoMerge branch 'MDL-32779' of git://github.com/danpoltawski/moodle
Aparup Banerjee [Tue, 29 May 2012 09:11:11 +0000 (17:11 +0800)]
Merge branch 'MDL-32779' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-33375' of git://github.com/danpoltawski/moodle
Aparup Banerjee [Tue, 29 May 2012 09:06:19 +0000 (17:06 +0800)]
Merge branch 'MDL-33375' of git://github.com/danpoltawski/moodle

9 years agoMDL-32779 course/format: Return to correct section
Dan Poltawski [Tue, 29 May 2012 08:54:04 +0000 (16:54 +0800)]
MDL-32779 course/format: Return to correct section

When editing a single section mode item

9 years agoMerge branch 'MDL-33382-cli-install' of git://github.com/mudrd8mz/moodle
Aparup Banerjee [Tue, 29 May 2012 08:43:39 +0000 (16:43 +0800)]
Merge branch 'MDL-33382-cli-install' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'w22_MDL-33089_m23_phpunitrecover' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 29 May 2012 08:31:26 +0000 (16:31 +0800)]
Merge branch 'w22_MDL-33089_m23_phpunitrecover' of git://github.com/skodak/moodle

9 years agoMDL-27120 backup: fixed docblock and code cleanup
Rajesh Taneja [Tue, 17 Apr 2012 03:32:15 +0000 (11:32 +0800)]
MDL-27120 backup: fixed docblock and code cleanup

9 years agoMerge branch 'MDL-30905-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 29 May 2012 08:20:21 +0000 (16:20 +0800)]
Merge branch 'MDL-30905-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'wip-mdl-33102' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 29 May 2012 08:10:59 +0000 (16:10 +0800)]
Merge branch 'wip-mdl-33102' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'w22_MDL-33001_m23_innodb' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 29 May 2012 07:56:28 +0000 (15:56 +0800)]
Merge branch 'w22_MDL-33001_m23_innodb' of git://github.com/skodak/moodle

9 years agoMerge branch 'wip-MDL-33377-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 29 May 2012 07:40:36 +0000 (15:40 +0800)]
Merge branch 'wip-MDL-33377-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'MDL-32824-master-2' of git://git.luns.net.uk/moodle
Dan Poltawski [Tue, 29 May 2012 07:21:55 +0000 (15:21 +0800)]
Merge branch 'MDL-32824-master-2' of git://git.luns.net.uk/moodle

Conflicts:
course/format/weeks/format.js
course/format/weeks/lib.php

9 years agoMerge branch 'MDL-30888-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 29 May 2012 07:12:38 +0000 (15:12 +0800)]
Merge branch 'MDL-30888-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 29 May 2012 07:08:46 +0000 (15:08 +0800)]
Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'MDL-33378-tiff-thumb' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 29 May 2012 07:00:21 +0000 (15:00 +0800)]
Merge branch 'MDL-33378-tiff-thumb' of git://github.com/mudrd8mz/moodle

9 years agoMDL-33397 Filepicker: cancel button always present in private files
Frederic Massart [Tue, 29 May 2012 07:00:19 +0000 (15:00 +0800)]
MDL-33397 Filepicker: cancel button always present in private files

9 years agoMerge branch 'wip-MDL-33026-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 29 May 2012 06:58:31 +0000 (14:58 +0800)]
Merge branch 'wip-MDL-33026-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'wip-MDL-33399-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 29 May 2012 06:57:05 +0000 (14:57 +0800)]
Merge branch 'wip-MDL-33399-m23' of git://github.com/samhemelryk/moodle

9 years agoMDL-27120: Cache DB operations in restore_dbops
Tony Levi [Sat, 16 Apr 2011 04:03:33 +0000 (13:33 +0930)]
MDL-27120: Cache DB operations in restore_dbops

9 years agoMDL-27120: Cache dirname transformations in progressive_parser::dirname
Tony Levi [Mon, 11 Apr 2011 06:04:02 +0000 (15:34 +0930)]
MDL-27120: Cache dirname transformations in progressive_parser::dirname

9 years agomdl-27120 Fix static cache for backup_xml_transformer::register_link_encoders()
Adam Olley [Wed, 14 Sep 2011 02:12:03 +0000 (11:42 +0930)]
mdl-27120 Fix static cache for backup_xml_transformer::register_link_encoders()

9 years agomdl-27120 Fixed incorrect variable in parameter when adding form dependencies.
Jason Ilicic [Tue, 22 Nov 2011 00:04:56 +0000 (10:34 +1030)]
mdl-27120 Fixed incorrect variable in parameter when adding form dependencies.

9 years agoMDL-27120 Add global cache to backup_xml_transformer::register_link_encoders()
Ashley Holman [Thu, 7 Apr 2011 09:06:43 +0000 (18:36 +0930)]
MDL-27120 Add global cache to backup_xml_transformer::register_link_encoders()

9 years agoMDL-27120 More efficient use of QuickForms in backup UI
Ashley Holman [Thu, 7 Apr 2011 06:08:10 +0000 (15:38 +0930)]
MDL-27120 More efficient use of QuickForms in backup UI

9 years agoMDL-27120 backup: replace sequential scan search with hash-based lookup.
Ashley Holman [Thu, 7 Apr 2011 04:46:07 +0000 (14:16 +0930)]
MDL-27120 backup: replace sequential scan search with hash-based lookup.

9 years agoRevert "Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle"
Aparup Banerjee [Tue, 29 May 2012 06:29:09 +0000 (14:29 +0800)]
Revert "Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle"
MDL-27120 backup: reverting due to phpunit failure at backup/converter/moodle1/tests/fixtures/lib_test.php test_stash_storage()

This reverts commit c70b7fd81fa8d40e453ad7f5fa1759df48ae549f, reversing
changes made to e6f55285852d7dd7dd669578934c5d5b0f7e6557.

9 years agoMDL-33404 Fix defaults for ordinary files that are drag/dropped into the course page
Martin Dougiamas [Tue, 29 May 2012 04:58:24 +0000 (12:58 +0800)]
MDL-33404 Fix defaults for ordinary files that are drag/dropped into the course page

9 years agoMDL-33399 mixed: Fixed up calls to get_area_files that used empty sorts
Sam Hemelryk [Tue, 29 May 2012 04:44:28 +0000 (16:44 +1200)]
MDL-33399 mixed: Fixed up calls to get_area_files that used empty sorts

9 years agoMDL-33399 files: Fixed up handling of empty sort in File API methods.
Sam Hemelryk [Tue, 29 May 2012 04:38:47 +0000 (16:38 +1200)]
MDL-33399 files: Fixed up handling of empty sort in File API methods.

The following three methods of file_storage have been patched:
* get_external_files
* get_area_files
* get_directory_files

9 years agoMerge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Tue, 29 May 2012 02:26:21 +0000 (10:26 +0800)]
Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-28949 upgrade: Split course completion upgrade into smaller chunks
Sam Hemelryk [Mon, 28 May 2012 20:50:45 +0000 (08:50 +1200)]
MDL-28949 upgrade: Split course completion upgrade into smaller chunks

9 years agoMerge branch 'MDL-28949d' of git://github.com/srynot4sale/moodle
Sam Hemelryk [Mon, 28 May 2012 20:49:29 +0000 (08:49 +1200)]
Merge branch 'MDL-28949d' of git://github.com/srynot4sale/moodle

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

9 years agoMerge branch 'MDL-33359' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 28 May 2012 19:25:01 +0000 (21:25 +0200)]
Merge branch 'MDL-33359' of git://github.com/danpoltawski/moodle

9 years agoMDL-33212 Course page: Eye icon should override other conditions
sam marshall [Wed, 23 May 2012 12:46:51 +0000 (13:46 +0100)]
MDL-33212 Course page: Eye icon should override other conditions

9 years agoMDL-33378 file thumbnail falls back to the default mimetype icon
David Mudrak [Mon, 28 May 2012 10:19:05 +0000 (12:19 +0200)]
MDL-33378 file thumbnail falls back to the default mimetype icon

If for some reason the thumbnail generation fails, the default core
mimetype icon for the given file is sent to the browser.

9 years agoMDL-33045: Assign: remove references to old assignment in URLs
Ruslan Kabalin [Wed, 16 May 2012 14:43:45 +0000 (15:43 +0100)]
MDL-33045: Assign: remove references to old assignment in URLs

9 years agoMDL-33045: Assign: Make get_module_name() return something
Ruslan Kabalin [Wed, 16 May 2012 14:41:55 +0000 (15:41 +0100)]
MDL-33045: Assign: Make get_module_name() return something

9 years agoMDL-33026 set default author and license in drag-n-drop upload
Marina Glancy [Mon, 28 May 2012 09:05:25 +0000 (17:05 +0800)]
MDL-33026 set default author and license in drag-n-drop upload

9 years agoMDL-33382 CLI install and upgrade scripts display hint on --allow-unstable in non...
David Mudrak [Mon, 28 May 2012 08:59:22 +0000 (10:59 +0200)]
MDL-33382 CLI install and upgrade scripts display hint on --allow-unstable in non-interactive mode

9 years agoRevert "MDL-33212 Course page: Eye icon should override other conditions"
Dan Poltawski [Mon, 28 May 2012 08:57:41 +0000 (16:57 +0800)]
Revert "MDL-33212 Course page: Eye icon should override other conditions"

This reverts commit 5d0d373733a42d1b5b25716c8d11087debd62942.

9 years agoMDL-33377 Do not allow to link to course files since reference is preferable
Marina Glancy [Mon, 28 May 2012 08:27:22 +0000 (16:27 +0800)]
MDL-33377 Do not allow to link to course files since reference is preferable

9 years agoMDL-33001 improve error handling in mysql engine conversion tool and add listing...
Petr Skoda [Sat, 19 May 2012 19:24:21 +0000 (21:24 +0200)]
MDL-33001 improve error handling in mysql engine conversion tool and add listing of engines

9 years agoMDL-33089 flag test database as soon as possible in PHPUnit init
Petr Skoda [Fri, 25 May 2012 08:21:12 +0000 (10:21 +0200)]
MDL-33089 flag test database as soon as possible in PHPUnit init

9 years agoMDL-33089 detect more problems when initialising PHPUnit test environment
Petr Skoda [Sun, 20 May 2012 11:19:27 +0000 (13:19 +0200)]
MDL-33089 detect more problems when initialising PHPUnit test environment

9 years agoMerge branch 'wip-MDL-33321-master' of git://github.com/kwiliarty/moodle
Dan Poltawski [Mon, 28 May 2012 08:10:16 +0000 (16:10 +0800)]
Merge branch 'wip-MDL-33321-master' of git://github.com/kwiliarty/moodle

9 years agoMerge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 28 May 2012 08:03:03 +0000 (16:03 +0800)]
Merge branch 'MDL-33212-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'wip-MDL-33338-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 28 May 2012 07:43:33 +0000 (15:43 +0800)]
Merge branch 'wip-MDL-33338-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'wip-MDL-33356-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 28 May 2012 07:37:31 +0000 (15:37 +0800)]
Merge branch 'wip-MDL-33356-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'MDL-31393' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 28 May 2012 07:23:01 +0000 (15:23 +0800)]
Merge branch 'MDL-31393' of git://github.com/timhunt/moodle

9 years agoMDL-33338 recognising the mimetype for uploaded files
Marina Glancy [Mon, 28 May 2012 07:19:41 +0000 (15:19 +0800)]
MDL-33338 recognising the mimetype for uploaded files

- when file is uploaded in php, the tmpname does not have initial extension and mimetype recognition by extension fails
- another issue is that import form for questions fails with fatal error when it should just say that field is required

9 years agoMerge branch 'wip-MDL-32199-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 28 May 2012 07:18:51 +0000 (15:18 +0800)]
Merge branch 'wip-MDL-32199-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'MDL-33194-master' of https://github.com/mackensen/moodle
Dan Poltawski [Mon, 28 May 2012 06:58:56 +0000 (14:58 +0800)]
Merge branch 'MDL-33194-master' of https://github.com/mackensen/moodle

9 years agoMerge branch 'MDL-32860_user_iterator' of git://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 28 May 2012 06:56:48 +0000 (14:56 +0800)]
Merge branch 'MDL-32860_user_iterator' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-33110_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 28 May 2012 06:54:23 +0000 (14:54 +0800)]
Merge branch 'MDL-33110_master' of git://github.com/lazydaisy/moodle

9 years agoMDL-33375 course: set anchor after changing sections
Dan Poltawski [Mon, 28 May 2012 06:43:30 +0000 (14:43 +0800)]
MDL-33375 course: set anchor after changing sections

So scrolling isn't required

9 years agoMerge branch 'master_MDL-27368' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 28 May 2012 06:32:16 +0000 (14:32 +0800)]
Merge branch 'master_MDL-27368' of git://github.com/danmarsden/moodle

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

9 years agoMDL-33356 fixed a regression after function form_filemanager_redner() was deleted
Marina Glancy [Mon, 28 May 2012 05:52:32 +0000 (13:52 +0800)]
MDL-33356 fixed a regression after function form_filemanager_redner() was deleted

9 years agoAlteration to the code to hide the body of the post / discussion
Adrian Greeve [Mon, 14 May 2012 03:47:20 +0000 (11:47 +0800)]
Alteration to the code to hide the body of the post / discussion

9 years agoMDL-32199 Ensure that forum RSS feeds don't leak posts and discussions
Andrew Robert Nicols [Tue, 27 Mar 2012 10:57:46 +0000 (11:57 +0100)]
MDL-32199 Ensure that forum RSS feeds don't leak posts and discussions

9 years agoMerge branch 'w21_MDL-32972_m23_avatargifs' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 28 May 2012 05:05:10 +0000 (17:05 +1200)]
Merge branch 'w21_MDL-32972_m23_avatargifs' of git://github.com/skodak/moodle

9 years agoMerge branch 'wip-mdl-33347' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 28 May 2012 05:01:44 +0000 (13:01 +0800)]
Merge branch 'wip-mdl-33347' of git://github.com/rajeshtaneja/moodle

9 years agoMDL-18763 Fixed up typo in comments of new pic size
Sam Hemelryk [Mon, 28 May 2012 04:52:53 +0000 (16:52 +1200)]
MDL-18763 Fixed up typo in comments of new pic size

9 years agoMerge branch 'w21_MDL-18763_m23_avatar512' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 28 May 2012 04:50:46 +0000 (16:50 +1200)]
Merge branch 'w21_MDL-18763_m23_avatar512' of git://github.com/skodak/moodle

9 years agoMDL-32766: course view section log: fixed typo for course_sections table
Rossiani Wijaya [Mon, 28 May 2012 03:58:37 +0000 (11:58 +0800)]
MDL-32766: course view section log: fixed typo for course_sections table

Conflicts:

version.php

9 years agoRevert "MDL-29173 grade: altered the definiton of round() in /lib/evalmath/evalmath...
Dan Poltawski [Mon, 28 May 2012 04:37:50 +0000 (12:37 +0800)]
Revert "MDL-29173 grade: altered the definiton of round() in /lib/evalmath/evalmath.class.php"

Breaking unit tests.

This reverts commit 4be0947bbe63f32f38aa1698d4bbb9068d7a9dc9.

9 years agoMerge branch 'MDL-29173_calc' of git://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 28 May 2012 04:16:12 +0000 (12:16 +0800)]
Merge branch 'MDL-29173_calc' of git://github.com/andyjdavis/moodle

9 years agoMDL-28949 course completion: Database structure fixes
Aaron Barnes [Mon, 28 May 2012 03:14:28 +0000 (15:14 +1200)]
MDL-28949 course completion: Database structure fixes

9 years agoMerge branch 'MDL-33192-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Mon, 28 May 2012 03:47:22 +0000 (11:47 +0800)]
Merge branch 'MDL-33192-master-1' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-32752-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 28 May 2012 02:56:06 +0000 (14:56 +1200)]
Merge branch 'MDL-32752-master-1' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-33331-master' of git://github.com/micaherne/moodle
Sam Hemelryk [Mon, 28 May 2012 02:52:47 +0000 (14:52 +1200)]
Merge branch 'MDL-33331-master' of git://github.com/micaherne/moodle

9 years agoMerge branch 'MDL-32879' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 28 May 2012 02:49:12 +0000 (14:49 +1200)]
Merge branch 'MDL-32879' of git://github.com/lazydaisy/moodle

Conflicts:
theme/magazine/config.php

9 years agoMerge branch 'MDL-33084_strict_calc' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 28 May 2012 02:07:59 +0000 (14:07 +1200)]
Merge branch 'MDL-33084_strict_calc' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-32380_master' of git://github.com/kordan/moodle
Sam Hemelryk [Mon, 28 May 2012 02:03:20 +0000 (14:03 +1200)]
Merge branch 'MDL-32380_master' of git://github.com/kordan/moodle

9 years agoMDL-33347 course: section move is visible without ajax
Rajesh Taneja [Fri, 25 May 2012 08:19:08 +0000 (16:19 +0800)]
MDL-33347 course: section move is visible without ajax

9 years agoMerge branch 'MDL-33364' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 28 May 2012 01:51:22 +0000 (13:51 +1200)]
Merge branch 'MDL-33364' of git://github.com/stronk7/moodle

9 years agoMDL-27675 mod_feedback: Tidy up of phpdocs and scope within feedback mod
Sam Hemelryk [Mon, 28 May 2012 01:38:36 +0000 (13:38 +1200)]
MDL-27675 mod_feedback: Tidy up of phpdocs and scope within feedback mod

9 years agoMerge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle
Sam Hemelryk [Mon, 28 May 2012 01:37:59 +0000 (13:37 +1200)]
Merge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle