Sam Hemelryk [Mon, 9 Jul 2012 05:14:08 +0000 (17:14 +1200)]
Merge branch 'wip-MDL-33795-master' of https://github.com/barbararamiro/moodle
Dan Poltawski [Mon, 9 Jul 2012 05:05:25 +0000 (13:05 +0800)]
Merge branch 'wip-MDL-34143-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 9 Jul 2012 05:00:52 +0000 (17:00 +1200)]
MDL-32119 Fixed messy merge in upgrade code
Sam Hemelryk [Mon, 9 Jul 2012 04:27:30 +0000 (16:27 +1200)]
Merge branch 'MDL-33702-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 9 Jul 2012 04:01:54 +0000 (16:01 +1200)]
Merge branch 'MDL-32119' of git://github.com/srynot4sale/moodle
Conflicts:
lib/db/upgrade.php
version.php
Dan Poltawski [Mon, 9 Jul 2012 03:34:46 +0000 (11:34 +0800)]
Merge branch 'wip-mdl-33943' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 9 Jul 2012 03:29:38 +0000 (11:29 +0800)]
Merge branch 'MDL-27831-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Fri, 29 Jun 2012 06:50:40 +0000 (14:50 +0800)]
MDL-27831 calendar: Removing reduntand control icons in delete.php
Ankit Agarwal [Thu, 28 Jun 2012 06:53:32 +0000 (14:53 +0800)]
MDL-33702 scorm: refactoring interraction report to use '2004 SCORM' score elements
Ankit Agarwal [Thu, 28 Jun 2012 06:49:47 +0000 (14:49 +0800)]
MDL-33702 scorm: Adding support for '2004 SCORM' progress status elements
Ankit Agarwal [Thu, 28 Jun 2012 06:25:46 +0000 (14:25 +0800)]
MDL-33702 scorm: Adding support for '2004 SCORM' objectives status elements
Ankit Agarwal [Thu, 28 Jun 2012 03:51:06 +0000 (11:51 +0800)]
MDL-33702 scorm: Adding suppport for '2004 SCORM standard' score elements
Dan Poltawski [Mon, 9 Jul 2012 02:31:47 +0000 (10:31 +0800)]
Merge branch 'MDL-33885-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 9 Jul 2012 02:02:13 +0000 (10:02 +0800)]
Merge branch 'MDL-33890-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 9 Jul 2012 00:37:22 +0000 (12:37 +1200)]
MDL-29538 condition: Fixed up phpunit tests after addition of user field conditions
Sam Hemelryk [Sun, 8 Jul 2012 23:45:44 +0000 (11:45 +1200)]
MDL-29538 condition: Tidied up user field condition code post merge
Sam Hemelryk [Sun, 8 Jul 2012 23:44:39 +0000 (11:44 +1200)]
Merge branch 'MDL-29538_usercond' of git://github.com/markn86/moodle
Sam Hemelryk [Sun, 8 Jul 2012 22:56:14 +0000 (10:56 +1200)]
MDL-33575 choice module: add label to checkbox element when privacy of results is set to publish full results
Sam Hemelryk [Sun, 8 Jul 2012 22:45:14 +0000 (10:45 +1200)]
Merge branch 'MDL-30816' of git://github.com/rwijaya/moodle
Sam Hemelryk [Sun, 8 Jul 2012 22:22:06 +0000 (10:22 +1200)]
Merge branch 'MDL-33514' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Sun, 8 Jul 2012 22:19:50 +0000 (10:19 +1200)]
Merge branch 'MDL-31033_message_deprecated' of git://github.com/andyjdavis/moodle
Ruslan Kabalin [Fri, 22 Jun 2012 14:50:49 +0000 (15:50 +0100)]
MDL-33890 Make course blocks less theme dependant
This fix checks that the empty block region is actaually the standard one, so
it can be hidden. The blocks move operating area is not resticted to page
content any more.
Frederic Massart [Fri, 6 Jul 2012 05:14:52 +0000 (13:14 +0800)]
MDL-33885 Blog: Added maxlength rule to subject field
David Balch [Wed, 4 Jul 2012 01:24:23 +0000 (09:24 +0800)]
MDL-34143 Add file type information for .mdb .accdb (MS Access databases)
Sam Hemelryk [Thu, 5 Jul 2012 22:03:44 +0000 (10:03 +1200)]
weekly release 2.4dev
Sam Hemelryk [Thu, 5 Jul 2012 21:50:41 +0000 (09:50 +1200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Thu, 5 Jul 2012 21:21:34 +0000 (23:21 +0200)]
Revert "MDL-33303 Filepicker: resized to match HTML editor and made resizable"
This reverts commit
c947ea3e3fee2e0ecf6b4cd386e04a768a18e662.
Eloy Lafuente (stronk7) [Thu, 5 Jul 2012 16:34:27 +0000 (18:34 +0200)]
Merge branch 'wip-MDL-34063-master' of git://github.com/marinaglancy/moodle
David Mudrák [Fri, 22 Jun 2012 13:22:27 +0000 (15:22 +0200)]
MDL-33453 Make it clear what search_references() and search_references_count() are good for
Initially it was not clear enough that these two methods are supposed to
be used for looking for references to a stored_file only. So the docs
comments are improved and unittests added to illustrate the usage.
The patch also removes the unittest for get_references_by_storedfile()
as its usage is already covered in other test methods.
Eloy Lafuente (stronk7) [Thu, 5 Jul 2012 14:09:43 +0000 (16:09 +0200)]
Revert "MDL-30912 - lib - A tidy up of the submit url jump functions for greater ease with accessability."
This reverts commit
82203a1e4e34a1e36309cd5952304b68946d9b42.
Eloy Lafuente (stronk7) [Thu, 5 Jul 2012 12:19:06 +0000 (14:19 +0200)]
Merge branch 'wip-MDL-33746-master' of git://github.com/marinaglancy/moodle
Tim Hunt [Wed, 27 Jun 2012 16:59:29 +0000 (17:59 +0100)]
MDL-34065 questions: also fix two typos in comments.
Amended to change 2 accordin => according
Tim Hunt [Wed, 27 Jun 2012 14:27:50 +0000 (15:27 +0100)]
MDL-34065 lib: improve two debugging messages.
If the string passed to get_string is empty, say that. Don't say that it
contains illegal characters.
When relying on the __call magic in plugin_renderer_base, when the
method cannot be found, include the right class name in the error
message.
Marina Glancy [Thu, 5 Jul 2012 08:50:46 +0000 (16:50 +0800)]
MDL-33746 make folder view look like filemanager tree view
Rossiani Wijaya [Thu, 5 Jul 2012 04:16:30 +0000 (12:16 +0800)]
MDL-30816 Choice module: add format_string() for choice name.
Rossiani Wijaya [Thu, 1 Mar 2012 05:51:53 +0000 (13:51 +0800)]
MDL-30816 choice module: fixed accessibility for responses table and make it easier for screenreader to read it
Eloy Lafuente (stronk7) [Thu, 5 Jul 2012 01:40:44 +0000 (03:40 +0200)]
Merge branch 'MDL-34145' of git://github.com/timhunt/moodle
AMOS bot [Thu, 5 Jul 2012 00:31:12 +0000 (00:31 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Wed, 4 Jul 2012 21:22:12 +0000 (09:22 +1200)]
MDL-33770 webservices: Fixed error with core_group_create_groups when no enrolment key provided
Tim Hunt [Wed, 4 Jul 2012 09:47:03 +0000 (10:47 +0100)]
MDL-32062 question engine: fixup tests that this change broke.
The test data was wrong, and was triggering the work-around code that
MDL-32062 introduced. I fixed the test data.
Also, I fixed one of the tests, that had been broken.
Dan Poltawski [Wed, 4 Jul 2012 02:37:47 +0000 (10:37 +0800)]
MDL-34035 - fix typo in comment
Thanks Sam!
Dan Poltawski [Wed, 4 Jul 2012 02:34:22 +0000 (10:34 +0800)]
Merge branch 'MDL-34035' of git://github.com/timhunt/moodle
Barbara Ramiro [Wed, 4 Jul 2012 02:11:48 +0000 (10:11 +0800)]
MDL-33542, MDL-33542 Select dialogue details aligned
And loading gif smaller
Eloy Lafuente (stronk7) [Wed, 4 Jul 2012 02:15:47 +0000 (04:15 +0200)]
Merge branch 'w27_MDL-33876_m24_delenrol' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 4 Jul 2012 01:51:25 +0000 (09:51 +0800)]
Merge branch 'wip-MDL-34047-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Wed, 4 Jul 2012 01:30:58 +0000 (13:30 +1200)]
Merge branch 'MDL-32614' of git://github.com/stronk7/moodle
AMOS bot [Wed, 4 Jul 2012 00:31:59 +0000 (00:31 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 4 Jul 2012 00:01:21 +0000 (02:01 +0200)]
MDL-32614 lti: on restore, clean any typeid to convert the tool to selfcontained.
This is known to be imperfect, awaiting for MDL-34161 to fix the whole thing. Also,
unrelated, there are some basiclti => lti replacements.
Chris Scribner [Wed, 13 Jun 2012 18:19:35 +0000 (14:19 -0400)]
MDL-32614: Removing code which disassociated LTI instances from their tool types upon restore.
Sam Hemelryk [Tue, 3 Jul 2012 22:07:54 +0000 (10:07 +1200)]
Merge branch 'MDL-31692' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 3 Jul 2012 21:54:06 +0000 (09:54 +1200)]
Merge branch 'MDL-32062' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 3 Jul 2012 21:37:38 +0000 (09:37 +1200)]
Merge branch 'MDL-33466-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 3 Jul 2012 21:32:45 +0000 (09:32 +1200)]
Merge branch 'MDL-27125_master_2' of git://git.catalyst.net.nz/moodle-r2
Sam Hemelryk [Tue, 3 Jul 2012 20:33:14 +0000 (08:33 +1200)]
Merge branch 'wip-MDL-33749-master' of https://github.com/kwiliarty/moodle
Sam Hemelryk [Tue, 3 Jul 2012 20:26:14 +0000 (08:26 +1200)]
Merge branch 'wip-mdl-32787' of git://github.com/rajeshtaneja/moodle
Kevin Wiliarty [Tue, 19 Jun 2012 18:14:49 +0000 (14:14 -0400)]
MDL-33749 follow redirects for URL downloader
Eloy Lafuente (stronk7) [Tue, 3 Jul 2012 14:17:36 +0000 (16:17 +0200)]
Merge branch 'wip-MDL-33303-m24' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 3 Jul 2012 14:08:03 +0000 (16:08 +0200)]
Merge branch 'MDL-33426-master' of git://github.com/sammarshallou/moodle
sam marshall [Wed, 13 Jun 2012 15:45:42 +0000 (16:45 +0100)]
MDL-33426 Completion: Multilang activity names wrong in alt/title
Rajesh Taneja [Tue, 15 May 2012 17:53:09 +0000 (21:53 +0400)]
MDL-32787 user: rule required for custom profile fields applies to all users editing own profile
Sam Hemelryk [Tue, 3 Jul 2012 04:35:32 +0000 (16:35 +1200)]
Merge branch 'MDL-33828-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 3 Jul 2012 04:29:57 +0000 (12:29 +0800)]
Merge branch 'MDL-33937-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 3 Jul 2012 04:19:07 +0000 (12:19 +0800)]
Merge branch 'master_MDL-33938' of git://github.com/danmarsden/moodle
Conflicts:
mod/scorm/db/upgrade.php
Dan Poltawski [Tue, 3 Jul 2012 04:11:48 +0000 (12:11 +0800)]
Merge branch 'wip-MDL-30912-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 3 Jul 2012 03:51:04 +0000 (11:51 +0800)]
Merge branch 'MDL-30903-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 3 Jul 2012 03:47:15 +0000 (11:47 +0800)]
Merge branch 'MDL-34008' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 3 Jul 2012 03:40:08 +0000 (11:40 +0800)]
Merge branch 'w27_MDL-34036_m24_bulkrole' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 3 Jul 2012 03:15:07 +0000 (15:15 +1200)]
Merge branch 'w27_MDL-34115_m24_arrayofarrayssort' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 3 Jul 2012 03:01:39 +0000 (11:01 +0800)]
Merge branch 'MDL-30883' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 3 Jul 2012 02:57:41 +0000 (14:57 +1200)]
Merge branch 'wip-MDL-33957-master' of git://github.com/phalacee/moodle
Dan Poltawski [Tue, 3 Jul 2012 02:39:12 +0000 (10:39 +0800)]
Merge branch 'w27_MDL-34123_m24_newpasslang' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 3 Jul 2012 02:24:26 +0000 (10:24 +0800)]
Merge branch 'wip-MDL-33837-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 3 Jul 2012 02:14:31 +0000 (14:14 +1200)]
Merge branch 'MDL-33987_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Tue, 3 Jul 2012 01:45:12 +0000 (09:45 +0800)]
Merge branch 'MDL-33757-master' of git://github.com/ankitagarwal/moodle
Frederic Massart [Tue, 26 Jun 2012 09:28:03 +0000 (17:28 +0800)]
MDL-33828 Portfolio: prevent notices while exporting to portfolios
ISHIKAWA Takayuki [Thu, 14 Jun 2012 12:29:33 +0000 (21:29 +0900)]
MDL-33757 gradebook: Adding support to sort userlist by email address
AMOS bot [Tue, 3 Jul 2012 00:31:27 +0000 (00:31 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Tue, 3 Jul 2012 00:15:57 +0000 (02:15 +0200)]
Merge branch 'MDL-33499' of git://github.com/netspotau/moodle-mod_assign
Eloy Lafuente (stronk7) [Mon, 2 Jul 2012 23:58:48 +0000 (01:58 +0200)]
Merge branch 'wip-MDL-33521-m24' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Mon, 2 Jul 2012 23:48:43 +0000 (11:48 +1200)]
Merge branch 'MDL-33770' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 2 Jul 2012 23:36:01 +0000 (11:36 +1200)]
Merge branch 'MDL-33814-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jul 2012 23:04:47 +0000 (01:04 +0200)]
Merge branch 'MDL-33796-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 2 Jul 2012 22:55:29 +0000 (10:55 +1200)]
Merge branch 'MDL-34029_upgrade_documentation' of git://github.com/davosmith/moodle
Sam Hemelryk [Mon, 2 Jul 2012 22:47:07 +0000 (10:47 +1200)]
Merge branch 'MDL-9214' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 2 Jul 2012 22:41:17 +0000 (10:41 +1200)]
Merge branch 'MDL-32286' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 2 Jul 2012 22:36:57 +0000 (10:36 +1200)]
Merge branch 'MDL-33990' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 2 Jul 2012 22:34:13 +0000 (10:34 +1200)]
MDL-34014 cssoptimiser: Fixed some aweful spelling
Sam Hemelryk [Mon, 2 Jul 2012 22:32:37 +0000 (10:32 +1200)]
Merge branch 'MDL-34014' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 2 Jul 2012 22:30:30 +0000 (10:30 +1200)]
Merge branch 'MDL-34022' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 2 Jul 2012 22:27:16 +0000 (10:27 +1200)]
Merge branch 'MDL-34033' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 2 Jul 2012 22:20:56 +0000 (10:20 +1200)]
Merge branch 'MDL-33848' of git://github.com/netspotau/moodle-mod_assign
Sam Hemelryk [Mon, 2 Jul 2012 22:13:12 +0000 (10:13 +1200)]
Merge branch 'MDL-28151' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jul 2012 21:50:39 +0000 (23:50 +0200)]
Merge branch 'MDL-23813' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 2 Jul 2012 21:42:08 +0000 (09:42 +1200)]
Merge branch 'MDL-23254' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jul 2012 19:05:08 +0000 (21:05 +0200)]
Merge branch 'mssql-case-sensitive' of git://github.com/danpoltawski/moodle
Tim Hunt [Thu, 21 Jun 2012 21:03:09 +0000 (22:03 +0100)]
MDL-23813 glossary filter: add missing YUI dependency
Fix found by Huy Hoang. I am just making a commit.
Eloy Lafuente (stronk7) [Mon, 2 Jul 2012 16:15:47 +0000 (18:15 +0200)]
MDL-34121 bump versions to efectively get the upgrade performed.
Eloy Lafuente (stronk7) [Mon, 2 Jul 2012 16:12:57 +0000 (18:12 +0200)]
Merge branch 'w27_MDL-34121_m24_killbackupmess' of git://github.com/skodak/moodle
Tim Hunt [Mon, 2 Jul 2012 15:14:28 +0000 (16:14 +0100)]
MDL-34145 postgres driver: fix get_tables perf on <= 9.0
The query of the information_schema view seems to be painfully slow on
older versions of postgres (2000ms instead of 20ms). Therefore, it is
worth detecting that case, and using a more postgres specific feedback.
This is particularly important for 2.3+ unit tests.
Thanks to Petr Skoda for his help with this.
Dan Poltawski [Mon, 2 Jul 2012 09:44:01 +0000 (17:44 +0800)]
Merge branch 'wip-MDL-33948-master' of git://github.com/marinaglancy/moodle