moodle.git
8 years agoMerge branch 'MDL-36900-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 11 Mar 2013 23:45:59 +0000 (00:45 +0100)]
Merge branch 'MDL-36900-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-38346_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 11 Mar 2013 23:43:38 +0000 (00:43 +0100)]
Merge branch 'MDL-38346_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'wip-mdl-38382' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 11 Mar 2013 23:38:37 +0000 (00:38 +0100)]
Merge branch 'wip-mdl-38382' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-38337' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 11 Mar 2013 23:25:05 +0000 (00:25 +0100)]
Merge branch 'MDL-38337' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-34818_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Mon, 11 Mar 2013 23:22:18 +0000 (00:22 +0100)]
Merge branch 'MDL-34818_master' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'wip_master_mdl-38262' of git://github.com/iarenaza/moodle
Eloy Lafuente (stronk7) [Mon, 11 Mar 2013 23:04:04 +0000 (00:04 +0100)]
Merge branch 'wip_master_mdl-38262' of git://github.com/iarenaza/moodle

8 years agoMerge branch 'MDL-38389-m' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 11 Mar 2013 08:19:53 +0000 (16:19 +0800)]
Merge branch 'MDL-38389-m' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'wip-MDL-31342_master' of git://github.com/gjb2048/moodle
Aparup Banerjee [Mon, 11 Mar 2013 07:41:03 +0000 (15:41 +0800)]
Merge branch 'wip-MDL-31342_master' of git://github.com/gjb2048/moodle

8 years agoMerge branch 'wip-MDL-34713-master' of git://github.com/phalacee/moodle
Damyon Wiese [Mon, 11 Mar 2013 05:43:56 +0000 (13:43 +0800)]
Merge branch 'wip-MDL-34713-master' of git://github.com/phalacee/moodle

8 years agoMerge branch 'MDL-33424' of git://github.com/jmvedrine/moodle
Damyon Wiese [Mon, 11 Mar 2013 05:30:45 +0000 (13:30 +0800)]
Merge branch 'MDL-33424' of git://github.com/jmvedrine/moodle

8 years agoMDL-38352 behat: Updating tests
David Monllao [Mon, 11 Mar 2013 02:03:55 +0000 (10:03 +0800)]
MDL-38352 behat: Updating tests

According to non-escaped double quotes
in TableNodes. Also refactoring previous
test affected by the issue.

8 years agoMDL-38352 behat: Removing extra double quotes escape
David Monllao [Mon, 11 Mar 2013 02:00:33 +0000 (10:00 +0800)]
MDL-38352 behat: Removing extra double quotes escape

8 years agoMDL-38387 cache: fixed inifinite initialisation loop with site id
Sam Hemelryk [Fri, 8 Mar 2013 01:07:13 +0000 (14:07 +1300)]
MDL-38387 cache: fixed inifinite initialisation loop with site id

8 years agoMDL-34818 theme_mymobile: Fixes resources folders to show properly on first access.
Mary Evans [Mon, 11 Mar 2013 00:02:50 +0000 (00:02 +0000)]
MDL-34818 theme_mymobile: Fixes resources folders to show properly on first access.

8 years agoMDL-33424 Images missing when restoring a 1.9 backup
Jean-Michel Vedrine [Tue, 1 Jan 2013 17:23:05 +0000 (18:23 +0100)]
MDL-33424 Images missing when restoring a 1.9 backup

8 years agoMDL-38337 quiz: respect maximum grade config for new quizzes.
Tim Hunt [Tue, 5 Mar 2013 22:58:51 +0000 (22:58 +0000)]
MDL-38337 quiz: respect maximum grade config for new quizzes.

8 years agoMDL-38389 JavaScript: Return DEBUG versions of Moodle YUI modules
Andrew Robert Nicols [Fri, 8 Mar 2013 05:46:55 +0000 (05:46 +0000)]
MDL-38389 JavaScript: Return DEBUG versions of Moodle YUI modules

8 years agoMDL-34713 - Blog - Fixing undefined index for blog menu block
Jason Fowler [Fri, 8 Mar 2013 05:46:27 +0000 (13:46 +0800)]
MDL-34713 - Blog - Fixing undefined index for blog menu block

8 years agoMDL-36900 files: D&D upload uses new file name increment function
Frederic Massart [Mon, 25 Feb 2013 12:23:54 +0000 (20:23 +0800)]
MDL-36900 files: D&D upload uses new file name increment function

8 years agoMDL-36900 repository: File Manager new folder UI improvements
Frederic Massart [Mon, 25 Feb 2013 08:45:33 +0000 (16:45 +0800)]
MDL-36900 repository: File Manager new folder UI improvements

8 years agoMDL-38382: Update will show minor number with leading zeros (if any)
Rajesh Taneja [Fri, 8 Mar 2013 02:14:02 +0000 (10:14 +0800)]
MDL-38382: Update will show minor number with leading zeros (if any)

8 years agoMDL-38378 Take rid of harcoded db prefix and bump.
Eloy Lafuente (stronk7) [Thu, 7 Mar 2013 23:27:01 +0000 (00:27 +0100)]
MDL-38378 Take rid of harcoded db prefix and bump.

8 years agoMDL-31342 theme_mymobile: TinyMCE editor difficulties.
Gareth J Barnard [Thu, 7 Mar 2013 19:45:30 +0000 (19:45 +0000)]
MDL-31342 theme_mymobile: TinyMCE editor difficulties.

8 years agoweekly release 2.5dev
Eloy Lafuente (stronk7) [Thu, 7 Mar 2013 15:20:02 +0000 (16:20 +0100)]
weekly release 2.5dev

8 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Eloy Lafuente (stronk7) [Thu, 7 Mar 2013 15:16:54 +0000 (16:16 +0100)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

8 years agoMerge branch 'MDL-38352' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Thu, 7 Mar 2013 10:45:06 +0000 (11:45 +0100)]
Merge branch 'MDL-38352' of git://github.com/danpoltawski/moodle

8 years agoMDL-38352 - use ISO ISO 3166-1 name for Libya
Dan Poltawski [Thu, 7 Mar 2013 10:34:41 +0000 (18:34 +0800)]
MDL-38352 - use ISO ISO 3166-1 name for Libya

8 years agoMDL-38345 Prevent undefined CFG leading to DB error.
Eloy Lafuente (stronk7) [Thu, 7 Mar 2013 09:21:03 +0000 (10:21 +0100)]
MDL-38345 Prevent undefined CFG leading to DB error.

It seems that MDL-32975, no matter a version bump
was done, leads to the $CFG->navsortmycoursessort
setting undefined sometimes. And that ends with an error
visiting the /my page. This just ensures a safe default
if the setting is undefined/empty.

8 years agoMDL-37852 repository: Admins can't access user instances settings
Frederic Massart [Thu, 7 Mar 2013 08:14:00 +0000 (16:14 +0800)]
MDL-37852 repository: Admins can't access user instances settings

8 years agoMerge branch 'MDL-38352-behat-fix' of git://github.com/dmonllao/moodle
Aparup Banerjee [Thu, 7 Mar 2013 07:46:07 +0000 (15:46 +0800)]
Merge branch 'MDL-38352-behat-fix' of git://github.com/dmonllao/moodle

8 years agoMDL-37852 repository: Re-inforced checks to manage repository instances
Frederic Massart [Thu, 7 Mar 2013 05:20:29 +0000 (13:20 +0800)]
MDL-37852 repository: Re-inforced checks to manage repository instances

8 years agoMDL-38352 behat: Updating tests
David Monllao [Thu, 7 Mar 2013 04:04:41 +0000 (12:04 +0800)]
MDL-38352 behat: Updating tests

According to latest language strings
changes

8 years agoMerge branch 'MDL-33946_label_dndupload_text' of git://github.com/davosmith/moodle
Aparup Banerjee [Thu, 7 Mar 2013 02:41:52 +0000 (10:41 +0800)]
Merge branch 'MDL-33946_label_dndupload_text' of git://github.com/davosmith/moodle

8 years agoRevert "MDL-38055 block_courseoverview: fixed formatting of course fullname"
Damyon Wiese [Thu, 7 Mar 2013 02:20:38 +0000 (10:20 +0800)]
Revert "MDL-38055 block_courseoverview: fixed formatting of course fullname"

This reverts commit a9ff59979fbda8d26214013eb8da7440614d2bd5.
This reverts commit 4e83302f6f6b95504cc33e7a75e3694750b5621e.

This issue has failed testing and will be delayed

8 years agoMDL-33946 course dndupload - fixes to dialog when dragging text
Davo Smith [Wed, 6 Mar 2013 22:38:01 +0000 (22:38 +0000)]
MDL-33946 course dndupload - fixes to dialog when dragging text

Radio buttons have unique IDs, matching the label IDs
'What do you want to call this text' input moved down and disabled when 'label' selected
'Add page here' changed to 'Add text here'

8 years agoMerge branch 'MDL-38173-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Wed, 6 Mar 2013 17:35:33 +0000 (18:35 +0100)]
Merge branch 'MDL-38173-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-38352-en_fix' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 6 Mar 2013 16:26:37 +0000 (17:26 +0100)]
Merge branch 'MDL-38352-en_fix' of git://github.com/mudrd8mz/moodle

8 years agoMDL-38173 Course: Fix DB from regression when adding a (new) course module to a section.
Damyon Wiese [Wed, 6 Mar 2013 15:31:31 +0000 (23:31 +0800)]
MDL-38173 Course: Fix DB from regression when adding a (new) course module to a section.

8 years agoMDL-38352 Merge English strings from the en_fix language pack
Helen Foster [Wed, 6 Mar 2013 15:44:39 +0000 (16:44 +0100)]
MDL-38352 Merge English strings from the en_fix language pack

8 years agoMerge branch 'MDL-38311' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 6 Mar 2013 09:36:24 +0000 (10:36 +0100)]
Merge branch 'MDL-38311' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-37958_master-fix' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 6 Mar 2013 09:31:20 +0000 (10:31 +0100)]
Merge branch 'MDL-37958_master-fix' of git://github.com/dmonllao/moodle

8 years agoMDL-38311 question manual grading: comment fixes.
Tim Hunt [Wed, 6 Mar 2013 09:27:11 +0000 (09:27 +0000)]
MDL-38311 question manual grading: comment fixes.

8 years agoMDL-37958 behat: Avoid problems with Background cached steps
David Monllao [Wed, 6 Mar 2013 07:47:34 +0000 (15:47 +0800)]
MDL-37958 behat: Avoid problems with Background cached steps

8 years agoMDL-38271 behat: Fixing typo
David Monllao [Wed, 6 Mar 2013 07:07:36 +0000 (15:07 +0800)]
MDL-38271 behat: Fixing typo

8 years agoMDL-37958 behat: Nasty strings in HTML
David Monllao [Wed, 6 Mar 2013 05:34:09 +0000 (13:34 +0800)]
MDL-37958 behat: Nasty strings in HTML

Nasty strings includes html entities and
non-breaking spaces followed by spaces which makes
very hard to find these strings in the DOM html,
this patch keeps the non-breaking spaces and all
the nasty characters, but leaves them isolated from
other regular spaces. It swaps the strings to HTML before
finding elements in the HTML that matches that contents.

8 years agoMDL-32975 navigation: fixed error when viewing my with no enrolments
Sam Hemelryk [Wed, 6 Mar 2013 01:35:19 +0000 (14:35 +1300)]
MDL-32975 navigation: fixed error when viewing my with no enrolments

8 years agoMDL-38311 Add missing comment format.
Eloy Lafuente (stronk7) [Wed, 6 Mar 2013 01:02:45 +0000 (02:02 +0100)]
MDL-38311 Add missing comment format.

8 years agoAutomatically generated installer lang files
AMOS bot [Wed, 6 Mar 2013 00:36:54 +0000 (00:36 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'MDL-38311' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 6 Mar 2013 00:22:32 +0000 (01:22 +0100)]
Merge branch 'MDL-38311' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-36749-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 6 Mar 2013 00:19:17 +0000 (01:19 +0100)]
Merge branch 'MDL-36749-m' of git://github.com/andrewnicols/moodle

8 years agoMDL-37411 Notes: unset courseid and userid when updating the note to prevent accident...
Rossiani Wijaya [Tue, 5 Mar 2013 07:17:11 +0000 (15:17 +0800)]
MDL-37411 Notes: unset courseid and userid when updating the note to prevent accidental changes. Thank you Sam Hemelryk for suggesting an alternative solution.

8 years agoMDL-36749 lib Complete deprecation of old_help_icon
Andrew Robert Nicols [Tue, 5 Feb 2013 09:25:29 +0000 (09:25 +0000)]
MDL-36749 lib Complete deprecation of old_help_icon

This deprecates the old_help_icon and helpbutton functions. Since they can
no longer be used, the renderers are removed altogether.

8 years agoMerge branch 'MDL-37958_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 5 Mar 2013 18:28:14 +0000 (19:28 +0100)]
Merge branch 'MDL-37958_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38327_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 5 Mar 2013 18:26:52 +0000 (19:26 +0100)]
Merge branch 'MDL-38327_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38252-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 5 Mar 2013 17:12:55 +0000 (18:12 +0100)]
Merge branch 'MDL-38252-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-38119' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 5 Mar 2013 15:45:01 +0000 (16:45 +0100)]
Merge branch 'MDL-38119' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-38271_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 5 Mar 2013 14:43:15 +0000 (15:43 +0100)]
Merge branch 'MDL-38271_master' of git://github.com/dmonllao/moodle

8 years agoMDL-38311 questions: manual grading API should accept commentformat
Tim Hunt [Mon, 4 Mar 2013 16:41:22 +0000 (16:41 +0000)]
MDL-38311 questions: manual grading API should accept commentformat

Comment format (FORMAT_...) was correctly being processed when the
manual grading happened as the result of a form submission. It was only
when done using the question_usage or question_attempt API method that
there was no way to specify the format. (Although I think the only place
this API as used was in the unit tests.)

Note that question_attempt::manual_grade API had to change, but I don't
think that is a real API change. Calling code should be using
question_usage::question_attempt, which is backwards compatible.

Note that now, if you don't pass format, then no error is generated, but
a developer debugging message is generated.

8 years agoMerge branch 'MDL-38209' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 5 Mar 2013 09:14:02 +0000 (17:14 +0800)]
Merge branch 'MDL-38209' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-38072' of git://github.com/lazydaisy/moodle
Aparup Banerjee [Tue, 5 Mar 2013 09:07:50 +0000 (17:07 +0800)]
Merge branch 'MDL-38072' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'wip-MDL-34775-master' of git://github.com/phalacee/moodle
Aparup Banerjee [Tue, 5 Mar 2013 09:01:54 +0000 (17:01 +0800)]
Merge branch 'wip-MDL-34775-master' of git://github.com/phalacee/moodle

8 years agoMDL-37852 phpunit: Tests for repository::can_be_edited_by_user()
Frederic Massart [Wed, 27 Feb 2013 06:30:03 +0000 (14:30 +0800)]
MDL-37852 phpunit: Tests for repository::can_be_edited_by_user()

8 years agoMDL-37852 repository: Prevent undesired access to repositories settings
Frederic Massart [Wed, 27 Feb 2013 00:43:17 +0000 (08:43 +0800)]
MDL-37852 repository: Prevent undesired access to repositories settings

8 years agoMDL-38007 behat: Refining error texts
David Monllao [Tue, 5 Mar 2013 08:11:15 +0000 (16:11 +0800)]
MDL-38007 behat: Refining error texts

Also removing a couple of silly notices

8 years agoMerge branch 'MDL-38282' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 5 Mar 2013 08:06:31 +0000 (16:06 +0800)]
Merge branch 'MDL-38282' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-38240' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 5 Mar 2013 08:00:49 +0000 (16:00 +0800)]
Merge branch 'MDL-38240' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-38279' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 5 Mar 2013 07:22:38 +0000 (15:22 +0800)]
Merge branch 'MDL-38279' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-38178_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Tue, 5 Mar 2013 07:10:52 +0000 (15:10 +0800)]
Merge branch 'MDL-38178_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38025_master' of git://github.com/dmonllao/moodle
Aparup Banerjee [Tue, 5 Mar 2013 06:43:46 +0000 (14:43 +0800)]
Merge branch 'MDL-38025_master' of git://github.com/dmonllao/moodle

8 years agoMDL-38178 behat: New tests for fieldsets expansion
David Monllao [Mon, 25 Feb 2013 04:50:21 +0000 (12:50 +0800)]
MDL-38178 behat: New tests for fieldsets expansion

8 years agoMDL-38178 behat: Adding find_all and step to expand all form's fieldsets
David Monllao [Mon, 25 Feb 2013 04:49:56 +0000 (12:49 +0800)]
MDL-38178 behat: Adding find_all and step to expand all form's fieldsets

8 years agoMerge branch 'MDL-38007_master' of git://github.com/dmonllao/moodle
Aparup Banerjee [Tue, 5 Mar 2013 06:37:05 +0000 (14:37 +0800)]
Merge branch 'MDL-38007_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38241' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 5 Mar 2013 06:13:42 +0000 (14:13 +0800)]
Merge branch 'MDL-38241' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-38280' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 5 Mar 2013 06:10:00 +0000 (14:10 +0800)]
Merge branch 'MDL-38280' of git://github.com/timhunt/moodle

8 years agoMDL-38327 behat: Don't switch completely if switchcompletely is false
David Monllao [Tue, 5 Mar 2013 06:03:50 +0000 (14:03 +0800)]
MDL-38327 behat: Don't switch completely if switchcompletely is false

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

8 years agoMerge branch 'wip-MDL-38251-m25' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Tue, 5 Mar 2013 05:09:37 +0000 (13:09 +0800)]
Merge branch 'wip-MDL-38251-m25' of git://github.com/samhemelryk/moodle

8 years agoMDL-37935: Cache - fix spelling mistake in language string
Damyon Wiese [Tue, 5 Mar 2013 05:06:49 +0000 (13:06 +0800)]
MDL-37935: Cache - fix spelling mistake in language string

8 years agoMerge branch 'wip-MDL-37935-m25' of git://github.com/samhemelryk/moodle
Damyon Wiese [Tue, 5 Mar 2013 05:05:57 +0000 (13:05 +0800)]
Merge branch 'wip-MDL-37935-m25' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-30481' of git://github.com/rwijaya/moodle
Aparup Banerjee [Tue, 5 Mar 2013 04:55:41 +0000 (12:55 +0800)]
Merge branch 'MDL-30481' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'MDL-38094' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 5 Mar 2013 03:57:50 +0000 (16:57 +1300)]
Merge branch 'MDL-38094' of git://github.com/timhunt/moodle

8 years agoMerge branch 'wip-MDL-38055-m25' of git://github.com/samhemelryk/moodle
Damyon Wiese [Tue, 5 Mar 2013 03:42:25 +0000 (11:42 +0800)]
Merge branch 'wip-MDL-38055-m25' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-36171-m' of git://github.com/andrewnicols/moodle
Aparup Banerjee [Tue, 5 Mar 2013 03:13:33 +0000 (11:13 +0800)]
Merge branch 'MDL-36171-m' of git://github.com/andrewnicols/moodle

8 years agoMDL-37958 behat: Ignoring spaces when comparing field contents
David Monllao [Tue, 5 Mar 2013 03:08:04 +0000 (11:08 +0800)]
MDL-37958 behat: Ignoring spaces when comparing field contents

8 years agoMerge branch 'MDL-38067-m' of git://github.com/andrewnicols/moodle
Aparup Banerjee [Tue, 5 Mar 2013 03:06:55 +0000 (11:06 +0800)]
Merge branch 'MDL-38067-m' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-34300-m' of git://github.com/andrewnicols/moodle
Aparup Banerjee [Tue, 5 Mar 2013 02:37:33 +0000 (10:37 +0800)]
Merge branch 'MDL-34300-m' of git://github.com/andrewnicols/moodle

8 years agoMDL-34284 library: Import ZF2012-01 security patch for Zend
Frederic Massart [Mon, 11 Feb 2013 07:20:11 +0000 (15:20 +0800)]
MDL-34284 library: Import ZF2012-01 security patch for Zend

8 years agoMerge branch 'MDL-37932' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 5 Mar 2013 02:30:45 +0000 (15:30 +1300)]
Merge branch 'MDL-37932' of git://github.com/timhunt/moodle

8 years agoMerge branch 'wip-MDL-37901_master' of git://github.com/gjb2048/moodle
Sam Hemelryk [Tue, 5 Mar 2013 02:15:24 +0000 (15:15 +1300)]
Merge branch 'wip-MDL-37901_master' of git://github.com/gjb2048/moodle

8 years agoMerge branch 'MDL-33946_label_dndupload_text' of git://github.com/davosmith/moodle
Aparup Banerjee [Tue, 5 Mar 2013 02:21:25 +0000 (10:21 +0800)]
Merge branch 'MDL-33946_label_dndupload_text' of git://github.com/davosmith/moodle

8 years agoMerge branch 'MDL-38298' of git://github.com/stronk7/moodle
Sam Hemelryk [Tue, 5 Mar 2013 02:12:08 +0000 (15:12 +1300)]
Merge branch 'MDL-38298' of git://github.com/stronk7/moodle

8 years agoMDL-37127 js: fixed indentation of tooltip.js
Sam Hemelryk [Tue, 5 Mar 2013 01:11:35 +0000 (14:11 +1300)]
MDL-37127 js: fixed indentation of tooltip.js

8 years agoMerge branch 'MDL-37127-m' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 5 Mar 2013 00:54:10 +0000 (13:54 +1300)]
Merge branch 'MDL-37127-m' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'wip-MDL-36215-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 5 Mar 2013 00:27:50 +0000 (01:27 +0100)]
Merge branch 'wip-MDL-36215-m25' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'wip-MDL-38300-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 5 Mar 2013 00:21:47 +0000 (01:21 +0100)]
Merge branch 'wip-MDL-38300-m25' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'wip-MDL-38247-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 5 Mar 2013 00:08:23 +0000 (01:08 +0100)]
Merge branch 'wip-MDL-38247-m25' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'm25_MDL-37515_Notice_when_submitting_change_password_form' of https...
Eloy Lafuente (stronk7) [Tue, 5 Mar 2013 00:03:26 +0000 (01:03 +0100)]
Merge branch 'm25_MDL-37515_Notice_when_submitting_change_password_form' of https://github.com/scara/moodle

8 years agoMerge branch 'MDL-37897' of git://github.com/jmvedrine/moodle
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 23:56:24 +0000 (00:56 +0100)]
Merge branch 'MDL-37897' of git://github.com/jmvedrine/moodle

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

8 years agoMerge branch 'MDL-38261-workshop-attachments-size' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 23:48:47 +0000 (00:48 +0100)]
Merge branch 'MDL-38261-workshop-attachments-size' of git://github.com/mudrd8mz/moodle

8 years agoMerge branch 'master_MDL-37907' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 23:46:12 +0000 (00:46 +0100)]
Merge branch 'master_MDL-37907' of git://github.com/danmarsden/moodle