moodle.git
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 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 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-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-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 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 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 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

9 years agoMDL-33359 - mtrace: dont output to STDOUT in unit tests
Dan Poltawski [Sat, 26 May 2012 04:15:17 +0000 (12:15 +0800)]
MDL-33359 - mtrace: dont output to STDOUT in unit tests

This allows us to use phpunit output buffering functions

9 years agoMDL-33364 automated backup: return and log each course result correctly
Eloy Lafuente (stronk7) [Mon, 28 May 2012 00:44:24 +0000 (02:44 +0200)]
MDL-33364 automated backup: return and log each course result correctly

9 years agoMerge branch 'MDL-33191' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Sun, 27 May 2012 23:22:12 +0000 (11:22 +1200)]
Merge branch 'MDL-33191' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'MDL-32766' of git://github.com/rwijaya/moodle
Sam Hemelryk [Sun, 27 May 2012 23:19:06 +0000 (11:19 +1200)]
Merge branch 'MDL-32766' of git://github.com/rwijaya/moodle

Conflicts:
version.php

9 years agoMerge branch 'MDL-33120' of git://github.com/stronk7/moodle
Sam Hemelryk [Sun, 27 May 2012 23:12:36 +0000 (11:12 +1200)]
Merge branch 'MDL-33120' of git://github.com/stronk7/moodle

9 years agoMerge branch 'dev_MDL-33147_transaction' of git://github.com/dongsheng/moodle
Sam Hemelryk [Sun, 27 May 2012 23:04:43 +0000 (11:04 +1200)]
Merge branch 'dev_MDL-33147_transaction' of git://github.com/dongsheng/moodle

9 years agoMerge branch 'MDL-33325-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 27 May 2012 22:52:24 +0000 (10:52 +1200)]
Merge branch 'MDL-33325-master' of git://github.com/ankitagarwal/moodle

9 years agoMDL-27675 - Feedback module abuses data_submitted
eLeDia GmbH (Andreas Grabs) [Wed, 9 May 2012 14:52:26 +0000 (16:52 +0200)]
MDL-27675 - Feedback module abuses data_submitted

9 years agoMDL-27675 - Feedback module abuses data_submitted
Andreas Grabs [Fri, 15 Jul 2011 00:03:21 +0000 (02:03 +0200)]
MDL-27675 - Feedback module abuses data_submitted

9 years agoMDL-27368 Clean up invalid course completion records
Dan Marsden [Mon, 19 Mar 2012 01:50:59 +0000 (14:50 +1300)]
MDL-27368 Clean up invalid course completion records
 keep oldest timestamps from all records

9 years agoMDL-33120 book: changes in code based on amended strings
Eloy Lafuente (stronk7) [Sun, 27 May 2012 15:40:50 +0000 (17:40 +0200)]
MDL-33120 book: changes in code based on amended strings

- Replace numberingoptions_help by numberingoptions_desc.
- Delete the faq code and related styles.
- Bump version to force lang/style refresh.

9 years agoMDL-33120 book: Amend module strings
Helen Foster [Sun, 27 May 2012 15:28:43 +0000 (17:28 +0200)]
MDL-33120 book: Amend module strings

Al the changes are fixes but numberingoptions_help
that is one change of string key too, hence we instruct AMOS to move it.

AMOS BEGIN
 MOV [numberingoptions_help,mod_book],[numberingoptions_desc,mod_book]
AMOS END

9 years agoMDL-33192: Prevent global DDM conflicting with others drag-drop instances.
Ruslan Kabalin [Tue, 22 May 2012 16:07:22 +0000 (17:07 +0100)]
MDL-33192: Prevent global DDM conflicting with others drag-drop instances.

9 years agoMDL-32824: Make dragdrop work correctly with section titles/links
Ruslan Kabalin [Thu, 24 May 2012 10:20:57 +0000 (11:20 +0100)]
MDL-32824: Make dragdrop work correctly with section titles/links

Initially, the default section title was swapped within the course format
javascript functions. Though some section titles may be custom and does not
require swapping, in addition they may have links to single section view. This
introduces some callback functions for define what needs to be done in
sections libs and js files.

9 years agoon-demand release 2.3dev
Dan Poltawski [Fri, 25 May 2012 10:07:10 +0000 (18:07 +0800)]
on-demand release 2.3dev

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Dan Poltawski [Fri, 25 May 2012 10:04:43 +0000 (18:04 +0800)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMerge branch 'w21_MDL-33075_m23_phpunitclassreflex' of git://github.com/skodak/moodle
Dan Poltawski [Fri, 25 May 2012 07:25:30 +0000 (15:25 +0800)]
Merge branch 'w21_MDL-33075_m23_phpunitclassreflex' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-33196' of git://github.com/rwijaya/moodle
Aparup Banerjee [Fri, 25 May 2012 06:13:21 +0000 (14:13 +0800)]
Merge branch 'MDL-33196' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'MDL-33307' of git://github.com/danpoltawski/moodle
Aparup Banerjee [Fri, 25 May 2012 04:08:03 +0000 (12:08 +0800)]
Merge branch 'MDL-33307' of git://github.com/danpoltawski/moodle

9 years agoMDL-33324 Filepicker : fixed syntax.
Aparup Banerjee [Fri, 25 May 2012 03:44:04 +0000 (11:44 +0800)]
MDL-33324 Filepicker : fixed syntax.

9 years agoMDL-33324 Filepicker : removed redundant parantheses.
Aparup Banerjee [Fri, 25 May 2012 03:25:57 +0000 (11:25 +0800)]
MDL-33324 Filepicker : removed redundant parantheses.

9 years agoMerge branch 'wip-MDL-33324-master' of git://github.com/marinaglancy/moodle
Aparup Banerjee [Fri, 25 May 2012 03:25:25 +0000 (11:25 +0800)]
Merge branch 'wip-MDL-33324-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'MDL-29924-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Fri, 25 May 2012 03:14:22 +0000 (11:14 +0800)]
Merge branch 'MDL-29924-master' of git://github.com/FMCorz/moodle

9 years agoMDL-28557 - calendar: fix trivial whitespace issue
Dan Poltawski [Fri, 25 May 2012 03:08:14 +0000 (11:08 +0800)]
MDL-28557 - calendar: fix trivial whitespace issue

9 years agoMerge branch 'MDL-28557' of git://github.com/bostelm/moodle
Dan Poltawski [Fri, 25 May 2012 03:07:14 +0000 (11:07 +0800)]
Merge branch 'MDL-28557' of git://github.com/bostelm/moodle

9 years agoMerge branch 'w22_MDL-33114_m23_tinymce3511' of git://github.com/skodak/moodle
Dan Poltawski [Fri, 25 May 2012 03:00:53 +0000 (11:00 +0800)]
Merge branch 'w22_MDL-33114_m23_tinymce3511' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-33135-master-3' of git://git.luns.net.uk/moodle
Dan Poltawski [Fri, 25 May 2012 02:55:49 +0000 (10:55 +0800)]
Merge branch 'MDL-33135-master-3' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'w21_MDL-27575_m23_skype' of git://github.com/skodak/moodle
Dan Poltawski [Fri, 25 May 2012 02:44:47 +0000 (10:44 +0800)]
Merge branch 'w21_MDL-27575_m23_skype' of git://github.com/skodak/moodle

9 years agoMerge branch 'w21_MDL-33034_m23_roletests' of git://github.com/skodak/moodle
Dan Poltawski [Fri, 25 May 2012 02:37:48 +0000 (10:37 +0800)]
Merge branch 'w21_MDL-33034_m23_roletests' of git://github.com/skodak/moodle

9 years agoMDL-29836 webservice: version bump to pickup new string
Dan Poltawski [Fri, 25 May 2012 02:36:43 +0000 (10:36 +0800)]
MDL-29836 webservice: version bump to pickup new string

9 years agoMDL-29836 webservices: use individual string
Vadim Dvorovenko [Wed, 16 May 2012 11:03:09 +0000 (18:03 +0700)]
MDL-29836 webservices: use individual string

To allow accurate transalation

9 years agoMerge branch 'MDL-33028' of git://github.com/mouneyrac/moodle
Dan Poltawski [Fri, 25 May 2012 02:22:35 +0000 (10:22 +0800)]
Merge branch 'MDL-33028' of git://github.com/mouneyrac/moodle

9 years agoMerge branch 'MDL-33060' of git://github.com/mouneyrac/moodle
Dan Poltawski [Fri, 25 May 2012 02:16:12 +0000 (10:16 +0800)]
Merge branch 'MDL-33060' of git://github.com/mouneyrac/moodle

9 years agoMerge branch 'MDL-33020' of git://github.com/timhunt/moodle
Dan Poltawski [Fri, 25 May 2012 02:14:17 +0000 (10:14 +0800)]
Merge branch 'MDL-33020' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-32339-css-updates' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Fri, 25 May 2012 02:13:19 +0000 (10:13 +0800)]
Merge branch 'MDL-32339-css-updates' of git://github.com/mudrd8mz/moodle

9 years agoMDL-33139 mod_forum: fix minor whitespace problem
Dan Poltawski [Fri, 25 May 2012 02:09:09 +0000 (10:09 +0800)]
MDL-33139 mod_forum: fix minor whitespace problem

9 years agoMerge branch 'MDL-33139-master' of https://github.com/mackensen/moodle
Dan Poltawski [Fri, 25 May 2012 02:08:33 +0000 (10:08 +0800)]
Merge branch 'MDL-33139-master' of https://github.com/mackensen/moodle

9 years agoMDL-33173 files: correct @package name
Dan Poltawski [Fri, 25 May 2012 02:03:33 +0000 (10:03 +0800)]
MDL-33173 files: correct @package name

9 years agoMerge branch 'MDL-33173-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Fri, 25 May 2012 01:57:35 +0000 (09:57 +0800)]
Merge branch 'MDL-33173-master' of git://github.com/FMCorz/moodle

9 years agoMDL-33173 Filepicker: renamed private files edit page to main page
Frederic Massart [Thu, 24 May 2012 08:05:30 +0000 (16:05 +0800)]
MDL-33173 Filepicker: renamed private files edit page to main page

9 years agoAutomatically generated installer lang files
AMOS bot [Fri, 25 May 2012 00:31:16 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMDL-33172: Fixed whitespace
Sam Hemelryk [Thu, 24 May 2012 23:37:07 +0000 (11:37 +1200)]
MDL-33172: Fixed whitespace

9 years agoMDL-33172 - filestorage: Fix oracle incompatibilites
Dan Poltawski [Thu, 24 May 2012 05:35:13 +0000 (01:35 -0400)]
MDL-33172 - filestorage: Fix oracle incompatibilites

Fixes the following problems:

* When we select from two tables with the same named fields (id)
  and ask to sort by that field, Oracle doesn't know which table to
  sort frm unless that field is named in the SELECT. Here we do that
  by explicitly naming the fields. This keeps compatibility with before
  the reference table was added.

* Text comparisong without sql_compare_text

9 years agoMDL-33172 - filestorage: Add unit test for breaking oracle functions
Dan Poltawski [Wed, 23 May 2012 05:19:10 +0000 (13:19 +0800)]
MDL-33172 - filestorage: Add unit test for breaking oracle functions

9 years agoMDL-33114 import TinyMCE 3.5.1.1 and fix preview
Petr Skoda [Thu, 24 May 2012 21:15:52 +0000 (23:15 +0200)]
MDL-33114 import TinyMCE 3.5.1.1 and fix preview

9 years agoMerge branch 'wip-MDL-33329-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 24 May 2012 15:30:23 +0000 (23:30 +0800)]
Merge branch 'wip-MDL-33329-master' of git://github.com/marinaglancy/moodle