moodle.git
10 years agoMerge branch 'w13_MDL-26951_21_archetypes' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 28 Mar 2011 17:38:48 +0000 (19:38 +0200)]
Merge branch 'w13_MDL-26951_21_archetypes' of git://github.com/skodak/moodle

10 years agoMerge branch 'w13_MDL-26991_21_legacy' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 28 Mar 2011 17:25:03 +0000 (19:25 +0200)]
Merge branch 'w13_MDL-26991_21_legacy' of git://github.com/skodak/moodle

10 years agoMDL-26991 use archetypes instead of deprecated 'legacy' when defining roles in enrol...
Petr Skoda [Sun, 27 Mar 2011 18:44:50 +0000 (20:44 +0200)]
MDL-26991 use archetypes instead of deprecated 'legacy' when defining roles in enrol plugins

10 years agoMerge branch 'w13_MDL-26966_21_urlparsing' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 28 Mar 2011 17:05:07 +0000 (19:05 +0200)]
Merge branch 'w13_MDL-26966_21_urlparsing' of git://github.com/skodak/moodle

10 years agoMerge branch 'w13_MDL-26985_21_branching' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 28 Mar 2011 16:09:29 +0000 (18:09 +0200)]
Merge branch 'w13_MDL-26985_21_branching' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-26425' of git://github.com/timhunt/moodle
Petr Skoda [Mon, 28 Mar 2011 14:49:49 +0000 (16:49 +0200)]
Merge branch 'MDL-26425' of git://github.com/timhunt/moodle

10 years agoMerge branch 'master' of git.moodle.org:/git/integration
Eloy Lafuente (stronk7) [Mon, 28 Mar 2011 14:21:11 +0000 (16:21 +0200)]
Merge branch 'master' of git.moodle.org:/git/integration

10 years agoMerge branch 'w13_MDL-26990_21_missingrebuild' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 28 Mar 2011 14:07:20 +0000 (16:07 +0200)]
Merge branch 'w13_MDL-26990_21_missingrebuild' of git://github.com/skodak/moodle

10 years agoMerge branch 'MDL-26335' of github.com:mouneyrac/moodle
Petr Skoda [Mon, 28 Mar 2011 13:15:23 +0000 (15:15 +0200)]
Merge branch 'MDL-26335' of github.com:mouneyrac/moodle

10 years agoMerge branch 'MDL-26804-langlistcache_master' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 28 Mar 2011 12:48:38 +0000 (14:48 +0200)]
Merge branch 'MDL-26804-langlistcache_master' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 's8_MDL-26213_wiki_rewrite_file_url' of git://github.com/dongsheng/moodle
Eloy Lafuente (stronk7) [Mon, 28 Mar 2011 09:48:58 +0000 (11:48 +0200)]
Merge branch 's8_MDL-26213_wiki_rewrite_file_url' of git://github.com/dongsheng/moodle

10 years agoMOD-WIKI MDL-26213
Dongsheng Cai [Mon, 28 Mar 2011 09:31:01 +0000 (17:31 +0800)]
MOD-WIKI MDL-26213

1. Rewrite the image urls in diff.php and viewdiff.php
2. Fxied image urls in search.php
3. Add modcontext variable to avoid using duplicated
get_context_instance calls

10 years agoMerge branch 'MDL-26932' of git://github.com/jennymgray/moodle
Eloy Lafuente (stronk7) [Mon, 28 Mar 2011 09:03:44 +0000 (11:03 +0200)]
Merge branch 'MDL-26932' of git://github.com/jennymgray/moodle

10 years agoMerge branch 'm20_MDL-26939_plagiarism_restore' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 28 Mar 2011 08:48:45 +0000 (10:48 +0200)]
Merge branch 'm20_MDL-26939_plagiarism_restore' of git://github.com/danmarsden/moodle

10 years agoMerge branch 's8_MDL-26916_filepicker_paging' of git://github.com/dongsheng/moodle
Sam Hemelryk [Mon, 28 Mar 2011 08:12:55 +0000 (16:12 +0800)]
Merge branch 's8_MDL-26916_filepicker_paging' of git://github.com/dongsheng/moodle

10 years agoMerge branch 'm20_MDL-26957_forum_overview' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 28 Mar 2011 08:10:39 +0000 (16:10 +0800)]
Merge branch 'm20_MDL-26957_forum_overview' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'MDL-26906-2' of git://github.com/epsd/moodle
Sam Hemelryk [Mon, 28 Mar 2011 08:03:15 +0000 (16:03 +0800)]
Merge branch 'MDL-26906-2' of git://github.com/epsd/moodle

10 years agoMerge branch 'MDL-26077_message_strip_brackets2' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 28 Mar 2011 07:59:25 +0000 (15:59 +0800)]
Merge branch 'MDL-26077_message_strip_brackets2' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 's8_MDL-26798_dropbox_repo' of git://github.com/dongsheng/moodle
Sam Hemelryk [Mon, 28 Mar 2011 07:52:21 +0000 (15:52 +0800)]
Merge branch 's8_MDL-26798_dropbox_repo' of git://github.com/dongsheng/moodle

10 years agoMerge branch 'w13_MDL-26992_21_uploadtemplates' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 28 Mar 2011 06:29:50 +0000 (14:29 +0800)]
Merge branch 'w13_MDL-26992_21_uploadtemplates' of git://github.com/skodak/moodle

10 years agoMerge branch 'w13_MDL-26989_21_enrolroles' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 28 Mar 2011 06:10:44 +0000 (14:10 +0800)]
Merge branch 'w13_MDL-26989_21_enrolroles' of git://github.com/skodak/moodle

10 years agoMerge branch 'w13_MDL-26795_21_emailchange' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 28 Mar 2011 05:54:39 +0000 (13:54 +0800)]
Merge branch 'w13_MDL-26795_21_emailchange' of git://github.com/skodak/moodle

10 years agoMDL-26992 fix broken upload users templates
Petr Skoda [Sun, 27 Mar 2011 21:48:41 +0000 (23:48 +0200)]
MDL-26992 fix broken upload users templates

10 years agoMDL-26425 change all table subclasses to use parent::__construct
Tim Hunt [Fri, 18 Feb 2011 12:28:21 +0000 (12:28 +0000)]
MDL-26425 change all table subclasses to use parent::__construct

10 years agoMDL-26425 tablelib more cleanup, mostly to PHPdocs, following sam's comments.
Tim Hunt [Wed, 16 Feb 2011 13:06:29 +0000 (13:06 +0000)]
MDL-26425 tablelib more cleanup, mostly to PHPdocs, following sam's comments.

10 years agoMDL-26425 tablelib use html_writer when outputting rows and headers.
Tim Hunt [Wed, 16 Feb 2011 12:00:30 +0000 (12:00 +0000)]
MDL-26425 tablelib use html_writer when outputting rows and headers.

This includes refactoring to extract methods like sort_icon and show_hide_link which I think makes the code easier to read.

Note also the change to make_styles_string that makes it usable with html_writer. (Perhpas we need a css_writer classe ;-))

10 years agoMDL-26425 tablelib change print_initials_bar to remove duplication, and to use html_w...
Tim Hunt [Wed, 16 Feb 2011 11:55:12 +0000 (11:55 +0000)]
MDL-26425 tablelib change print_initials_bar to remove duplication, and to use html_writer.

10 years agoMDL-26425 tablelib ability for table_sql to add a class to the row based on the data.
Tim Hunt [Wed, 16 Feb 2011 11:47:54 +0000 (11:47 +0000)]
MDL-26425 tablelib ability for table_sql to add a class to the row based on the data.

10 years agoMDL-26425 tablelib change col_username to use html_writer and moodle_url.
Tim Hunt [Wed, 16 Feb 2011 11:46:48 +0000 (11:46 +0000)]
MDL-26425 tablelib change col_username to use html_writer and moodle_url.

10 years agoMDL-26425 tablelib better validation of the sort code, also some cleanup.
Tim Hunt [Wed, 16 Feb 2011 11:42:33 +0000 (11:42 +0000)]
MDL-26425 tablelib better validation of the sort code, also some cleanup.

You may think that the extra validation is unnecessary, since the sort fields are already validated when the URL parameters are parsed, however that overlooks an important point. There may be other options that affect which columns are in the SQL, for example the quiz show individual question grades setting. These other options can cause a column that was in the table, and being sorted on, to disappear. Therefore, it is necessary to re-validate the sort columns when they are used, to make sure they are still present, otherwise you can get ORDER BY sql that refers to non-existant columns, which then causes DB errors.

10 years agoMDL-26425 tablelib clean up setup and URL handling code.
Tim Hunt [Wed, 16 Feb 2011 11:37:40 +0000 (11:37 +0000)]
MDL-26425 tablelib clean up setup and URL handling code.

Note that this change removes ->reseturl, This was supposed to be a way to reset all the session stuff relating to a table automatically in some situations, but from using Moodle and reading the code, I don't beleive it was working. The code was horrible and not easily fixible, and has been broken for years, so I just removed it.

10 years agoMDL-26425 tablelib rename constructors to PHP5 __construct
Tim Hunt [Wed, 16 Feb 2011 11:33:31 +0000 (11:33 +0000)]
MDL-26425 tablelib rename constructors to PHP5 __construct

and add depreacted functions with the old name so that legacy code does not break.

10 years agoMDL-26425 tablelib clean up constant definitions.
Tim Hunt [Wed, 16 Feb 2011 11:31:23 +0000 (11:31 +0000)]
MDL-26425 tablelib clean up constant definitions.

10 years agoMDL-26425 tablelib mass whitespace clean-up.
Tim Hunt [Wed, 16 Feb 2011 10:54:29 +0000 (10:54 +0000)]
MDL-26425 tablelib mass whitespace clean-up.

10 years agoMDL-26989 fix incorrect disabling of assignable roles
Nikhil Gupta [Sun, 27 Mar 2011 18:34:15 +0000 (20:34 +0200)]
MDL-26989 fix incorrect disabling of assignable roles

10 years agoMDL-26795 fix incorrect location of email change strings
Petr Skoda [Sun, 27 Mar 2011 15:19:23 +0000 (17:19 +0200)]
MDL-26795 fix incorrect location of email change strings

AMOS BEGIN
 MOV [auth_emailchangecancel,auth_email],[emailchangecancel,core_auth]
 MOV [auth_emailchangepending,auth_email],[emailchangepending,core_auth]
 MOV [auth_emailupdate,auth_email],[emailupdate,core_auth]
 MOV [auth_emailnowexists,auth_email],[emailnowexists,core_auth]
 MOV [auth_emailupdatemessage,auth_email],[emailupdatemessage,core_auth]
 MOV [auth_emailupdatesuccess,auth_email],[emailupdatesuccess,core_auth]
 MOV [auth_emailupdatetitle,auth_email],[emailupdatetitle,core_auth]
 CPY [auth_emailnoemail,auth_email],[noemail,auth_ldap]
AMOS END

10 years agoMDL-26881 work around the block context setting problems
Petr Skoda [Sun, 27 Mar 2011 14:39:27 +0000 (16:39 +0200)]
MDL-26881 work around the block context setting problems

10 years agoMDL-26951 fix removing of archetype from role
Petr Skoda [Sun, 27 Mar 2011 14:04:33 +0000 (16:04 +0200)]
MDL-26951 fix removing of archetype from role

10 years agoMDL-26966 improve self URL validation
Petr Skoda [Sun, 27 Mar 2011 10:29:36 +0000 (12:29 +0200)]
MDL-26966 improve self URL validation

10 years agoMDL-26990 fix undefined rebuild_course_cache() regression
Petr Skoda [Sat, 26 Mar 2011 21:49:04 +0000 (22:49 +0100)]
MDL-26990 fix undefined rebuild_course_cache() regression

10 years agoMDL-26985 make sure admins do not upgrade to 2.1dev accidentally
Petr Skoda [Sat, 26 Mar 2011 21:28:32 +0000 (22:28 +0100)]
MDL-26985 make sure admins do not upgrade to 2.1dev accidentally

We already have the new maturity warning in the upgrade page but we are not changing versions yet, we should better give admins one extra chance to go back to latest 2.0.2+ stable.

10 years agoMDL-26985 add 2.1 release info
Petr Skoda [Sat, 26 Mar 2011 21:08:56 +0000 (22:08 +0100)]
MDL-26985 add 2.1 release info

We keep the $CFG->version unchanged for now so that admins that upgrade accidentally can go back to the latest stable 2.0.2+.

10 years agoMDL-26985 new Moodle 2.1 requirements
Petr Skoda [Sat, 26 Mar 2011 21:02:42 +0000 (22:02 +0100)]
MDL-26985 new Moodle 2.1 requirements

For now only extra PHP 5.3.2 requirement compared to 2.0.

10 years agoMDL-26932 full url path for toggle completion form POST
Jenny Gray [Fri, 25 Mar 2011 11:57:41 +0000 (11:57 +0000)]
MDL-26932 full url path for toggle completion form POST

10 years agoMDL-26804 core_string_manager::get_list_of_translations() can use a cache again
David Mudrak [Mon, 21 Mar 2011 17:33:06 +0000 (18:33 +0100)]
MDL-26804 core_string_manager::get_list_of_translations() can use a cache again

This patch reimplements the internal cache that was used to store the
list of available translations in Moodle 1.x. By default, the method
get_list_of_translations() still uses the file
moodledata/cache/languages to store the list of available translations.
The location of that file can be redefined in config.php. The internal
format of the cache file is JSON now (used to be a plain text list).

The patch also fixes a usage of the global $CFG in translation_exists()
methods where the internal property should be used instead.

10 years agoMDL-26916, MDL-26917
Dongsheng Cai [Mon, 21 Mar 2011 16:22:04 +0000 (00:22 +0800)]
MDL-26916, MDL-26917

1. Fix filepicker paging issue MDL-26916
2. Highlight view as icon button by default MDL-26917

10 years agoMDL-26798 encode file path in dropbox repository plugin, credits to Myles Carrick
Myles Carrick [Mon, 21 Mar 2011 16:05:02 +0000 (00:05 +0800)]
MDL-26798 encode file path in dropbox repository plugin, credits to Myles Carrick

10 years agomessage MDL-26077 fixed up a problem with html tags being stripped out
Andrew Davis (andyjdavis) [Wed, 23 Mar 2011 03:24:04 +0000 (11:24 +0800)]
message MDL-26077 fixed up a problem with html tags being stripped out

10 years agoPlagiarism MDL-26939 - missing return
Dan Marsden [Tue, 22 Mar 2011 22:37:57 +0000 (11:37 +1300)]
Plagiarism MDL-26939 - missing return

10 years agoForum Overview MDL-26957 add classes to allow better control by theme
Dan Marsden [Thu, 24 Mar 2011 01:41:30 +0000 (14:41 +1300)]
Forum Overview MDL-26957 add classes to allow better control by theme

10 years agoRevised fix for MDL-26906, magazine and formal white secure browser quiz window
stabijoh [Wed, 23 Mar 2011 11:29:01 +0000 (07:29 -0400)]
Revised fix for MDL-26906, magazine and formal white secure browser quiz window

10 years agoweekly release
Petr Skoda [Wed, 23 Mar 2011 10:33:20 +0000 (11:33 +0100)]
weekly release

10 years agoMDL-26335 fix capability name typo in the description of the web service function...
Jerome Mouneyrac [Wed, 23 Mar 2011 03:35:46 +0000 (11:35 +0800)]
MDL-26335 fix capability name typo in the description of the web service function moodle_user_get_users_by_id

10 years agoMDL-26848 I left one remaining "xxx" there, grrr
Eloy Lafuente (stronk7) [Tue, 22 Mar 2011 11:28:57 +0000 (12:28 +0100)]
MDL-26848 I left one remaining "xxx" there, grrr

10 years agobump version to detect integration reset problems
Petr Skoda [Tue, 22 Mar 2011 10:16:16 +0000 (11:16 +0100)]
bump version to detect integration reset problems

10 years agoMDL-26848 fixing some "stupid" comments and specs of 1 field
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 21:20:17 +0000 (22:20 +0100)]
MDL-26848 fixing some "stupid" comments and specs of 1 field

10 years agoMerge branch 'MDL-26848' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 20:56:46 +0000 (21:56 +0100)]
Merge branch 'MDL-26848' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-25834' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 20:54:57 +0000 (21:54 +0100)]
Merge branch 'MDL-25834' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'm20_MDL-26905_AICC_API_missing_currentorg_init' of git://github.com...
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 20:38:23 +0000 (21:38 +0100)]
Merge branch 'm20_MDL-26905_AICC_API_missing_currentorg_init' of git://github.com/scara/moodle

10 years agoMerge branch 'MDL-26570' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 20:34:17 +0000 (21:34 +0100)]
Merge branch 'MDL-26570' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-25621' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 20:32:50 +0000 (21:32 +0100)]
Merge branch 'MDL-25621' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-26863_wrong_appendtolog_statement' of git://github.com/scara/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 20:15:54 +0000 (21:15 +0100)]
Merge branch 'MDL-26863_wrong_appendtolog_statement' of git://github.com/scara/moodle

10 years agoMerge branch 'MDL-26875' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 20:10:55 +0000 (21:10 +0100)]
Merge branch 'MDL-26875' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'm20_MDL-26894_SCORM13_PHP_notice_undefined_prop_id' of git://github...
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 20:03:15 +0000 (21:03 +0100)]
Merge branch 'm20_MDL-26894_SCORM13_PHP_notice_undefined_prop_id' of git://github.com/scara/moodle

10 years agoMerge branch 'MDL-26861' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 19:59:32 +0000 (20:59 +0100)]
Merge branch 'MDL-26861' of git://github.com/timhunt/moodle

10 years agoMerge branch 'master' of git.moodle.org:/git/integration
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 19:55:20 +0000 (20:55 +0100)]
Merge branch 'master' of git.moodle.org:/git/integration

10 years agoMerge branch 'MDL-23022' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 21 Mar 2011 18:16:37 +0000 (19:16 +0100)]
Merge branch 'MDL-23022' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'wip-MDL-26781' of git://github.com/sammarshallou/moodle
Petr Skoda [Mon, 21 Mar 2011 18:10:15 +0000 (19:10 +0100)]
Merge branch 'wip-MDL-26781' of git://github.com/sammarshallou/moodle

10 years agoMerge branch 'MDL-26908' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 18:08:46 +0000 (19:08 +0100)]
Merge branch 'MDL-26908' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'wip-MDL-26747' of git://github.com/sammarshallou/moodle
Petr Skoda [Mon, 21 Mar 2011 18:06:28 +0000 (19:06 +0100)]
Merge branch 'wip-MDL-26747' of git://github.com/sammarshallou/moodle

10 years agoMerge branch 'MDL-26922' of git://github.com/stronk7/moodle
Petr Skoda [Mon, 21 Mar 2011 18:02:16 +0000 (19:02 +0100)]
Merge branch 'MDL-26922' of git://github.com/stronk7/moodle

10 years agoMDL-26922 dml - avoid PHP_INT_MAX overflow on limit queries
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 17:49:08 +0000 (18:49 +0100)]
MDL-26922 dml - avoid PHP_INT_MAX overflow on limit queries

10 years agoMerge branch 'MDL-26847_amended' of git://github.com/timhunt/moodle
Petr Skoda [Mon, 21 Mar 2011 17:10:35 +0000 (18:10 +0100)]
Merge branch 'MDL-26847_amended' of git://github.com/timhunt/moodle

10 years agoMerge branch 'master' of git.moodle.org:/git/integration
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 17:04:25 +0000 (18:04 +0100)]
Merge branch 'master' of git.moodle.org:/git/integration

10 years agoMerge branch 'MDL-25975' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 21 Mar 2011 17:02:46 +0000 (18:02 +0100)]
Merge branch 'MDL-25975' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-26903' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 21 Mar 2011 17:00:07 +0000 (18:00 +0100)]
Merge branch 'MDL-26903' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 16:55:40 +0000 (17:55 +0100)]
Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle

10 years agoMDL-26842 fix invalid parameter mix discovered by the new test
Petr Skoda [Mon, 21 Mar 2011 16:19:36 +0000 (17:19 +0100)]
MDL-26842 fix invalid parameter mix discovered by the new test

10 years agoMerge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 15:38:19 +0000 (16:38 +0100)]
Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle

10 years agoMDL-26842 fix o_ prefix regression
Petr Skoda [Mon, 21 Mar 2011 15:32:09 +0000 (16:32 +0100)]
MDL-26842 fix o_ prefix regression

10 years agoMerge branch 'master' of git.moodle.org:/git/integration
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 15:31:27 +0000 (16:31 +0100)]
Merge branch 'master' of git.moodle.org:/git/integration

10 years agoMDL-26847 new method file_storage::delete_area_files_select for efficient bulk file...
Tim Hunt [Wed, 16 Mar 2011 18:52:36 +0000 (18:52 +0000)]
MDL-26847 new method file_storage::delete_area_files_select for efficient bulk file deletion.

10 years agoMerge branch 'MDL-26887' of git://github.com/timhunt/moodle
Petr Skoda [Mon, 21 Mar 2011 14:39:31 +0000 (15:39 +0100)]
Merge branch 'MDL-26887' of git://github.com/timhunt/moodle

10 years agoMerge branch 'w12_MDL-26844_20_limittests' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 14:35:17 +0000 (15:35 +0100)]
Merge branch 'w12_MDL-26844_20_limittests' of git://github.com/skodak/moodle

10 years agoMDL-25565 - fix borked merge. The power of one curly bracket!
Eloy Lafuente (stronk7) [Mon, 21 Mar 2011 14:32:24 +0000 (15:32 +0100)]
MDL-25565 - fix borked merge. The power of one curly bracket!

10 years agoMerge branch 'MDL-26571_lesson_scale' of git://github.com/andyjdavis/moodle
Petr Skoda [Mon, 21 Mar 2011 13:52:11 +0000 (14:52 +0100)]
Merge branch 'MDL-26571_lesson_scale' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-26768_0_grade' of git://github.com/andyjdavis/moodle
Petr Skoda [Mon, 21 Mar 2011 13:49:18 +0000 (14:49 +0100)]
Merge branch 'MDL-26768_0_grade' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 's8_MDL-26919_search_dialog_event' of git://github.com/dongsheng/moodle
Petr Skoda [Mon, 21 Mar 2011 13:46:59 +0000 (14:46 +0100)]
Merge branch 's8_MDL-26919_search_dialog_event' of git://github.com/dongsheng/moodle

10 years agoMerge branch 'wip-MDL-26822'
Petr Skoda [Mon, 21 Mar 2011 13:03:33 +0000 (14:03 +0100)]
Merge branch 'wip-MDL-26822'

10 years agoMDL-26822 fix whitespace
Petr Skoda [Mon, 21 Mar 2011 13:02:50 +0000 (14:02 +0100)]
MDL-26822 fix whitespace

10 years agoFix three minor filepicker bugs: 1. use language string in search dialog instead...
Dongsheng Cai [Mon, 21 Mar 2011 12:56:36 +0000 (20:56 +0800)]
Fix three minor filepicker bugs: 1. use language string in search dialog instead of hard code filepicker MDL-26915 2. search dialog now response to enter key MDL-26919 3. search dialog should be modal mode MDL-26918

10 years agoMerge branch 'MDL-26557' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 21 Mar 2011 09:32:06 +0000 (17:32 +0800)]
Merge branch 'MDL-26557' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-26827' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 21 Mar 2011 09:23:13 +0000 (17:23 +0800)]
Merge branch 'MDL-26827' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'w12_MDL-26904_20_PHPLOL' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Mar 2011 09:19:06 +0000 (17:19 +0800)]
Merge branch 'w12_MDL-26904_20_PHPLOL' of git://github.com/skodak/moodle

10 years agoMerged PULL-496/MDL-26859 and fixed incorrect defines
Sam Hemelryk [Mon, 21 Mar 2011 09:13:20 +0000 (17:13 +0800)]
Merged PULL-496/MDL-26859 and fixed incorrect defines

10 years agoMerge branch 'w12_MDL-26876_20_blogformat' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Mar 2011 08:50:07 +0000 (16:50 +0800)]
Merge branch 'w12_MDL-26876_20_blogformat' of git://github.com/skodak/moodle

10 years agoMerged PULL-480/MDL-24877 and bumped version number to fix conflict
Sam Hemelryk [Mon, 21 Mar 2011 07:58:19 +0000 (15:58 +0800)]
Merged PULL-480/MDL-24877 and bumped version number to fix conflict

10 years agoMerge branch 'w12_MDL-26808_20_enrolpageurl' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Mar 2011 07:47:36 +0000 (15:47 +0800)]
Merge branch 'w12_MDL-26808_20_enrolpageurl' of git://github.com/skodak/moodle

10 years agoMerge branch 'w12_MDL-26826_20_youtubedim' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Mar 2011 06:27:45 +0000 (14:27 +0800)]
Merge branch 'w12_MDL-26826_20_youtubedim' of git://github.com/skodak/moodle

10 years agoMerge branch 'w12_MDL-26726_20_typocat' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Mar 2011 06:16:51 +0000 (14:16 +0800)]
Merge branch 'w12_MDL-26726_20_typocat' of git://github.com/skodak/moodle