moodle.git
8 years agoMerge branch 'wip-MDL-37942-master' of git://github.com/jason-platts/moodle
Dan Poltawski [Mon, 22 Apr 2013 11:42:10 +0000 (12:42 +0100)]
Merge branch 'wip-MDL-37942-master' of git://github.com/jason-platts/moodle

8 years agoMerge branch 'w16_MDL-39141_m25_toolbar' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 22 Apr 2013 11:38:47 +0000 (12:38 +0100)]
Merge branch 'w16_MDL-39141_m25_toolbar' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-39173-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 22 Apr 2013 10:41:41 +0000 (11:41 +0100)]
Merge branch 'MDL-39173-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'wip-mdl-38851' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Mon, 22 Apr 2013 07:11:59 +0000 (15:11 +0800)]
Merge branch 'wip-mdl-38851' of git://github.com/rajeshtaneja/moodle

8 years agoMDL-38614 form: Reduce size of description field
Frederic Massart [Thu, 21 Mar 2013 07:52:10 +0000 (15:52 +0800)]
MDL-38614 form: Reduce size of description field

8 years agoMerge branch 'MDL-39182_master' of https://github.com/markn86/moodle
Damyon Wiese [Mon, 22 Apr 2013 06:00:11 +0000 (14:00 +0800)]
Merge branch 'MDL-39182_master' of https://github.com/markn86/moodle

8 years agoMDL-39182 mod_forum: display the post threshold warning message in a more noticeable...
Mark Nelson [Wed, 17 Apr 2013 08:40:27 +0000 (16:40 +0800)]
MDL-39182 mod_forum: display the post threshold warning message in a more noticeable area

8 years agoMDL-36959 file_storage: Preserve each file in a hash collision
Damyon Wiese [Mon, 22 Apr 2013 04:07:43 +0000 (12:07 +0800)]
MDL-36959 file_storage: Preserve each file in a hash collision

8 years agoMerge branch 'w16_MDL-36959_m25_poolhashes' of git://github.com/skodak/moodle
Damyon Wiese [Mon, 22 Apr 2013 03:38:07 +0000 (11:38 +0800)]
Merge branch 'w16_MDL-36959_m25_poolhashes' of git://github.com/skodak/moodle

8 years agoMerge branch 'wip-MDL-38893-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Mon, 22 Apr 2013 03:34:17 +0000 (15:34 +1200)]
Merge branch 'wip-MDL-38893-master' of git://github.com/phalacee/moodle

Conflicts:
theme/bootstrap/style/generated.css

8 years agoMerge branch 'MDL-38918-master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 22 Apr 2013 03:25:46 +0000 (15:25 +1200)]
Merge branch 'MDL-38918-master' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'MDL-39231_master' of git://github.com/bmbrands/moodle
Sam Hemelryk [Mon, 22 Apr 2013 03:24:58 +0000 (15:24 +1200)]
Merge branch 'MDL-39231_master' of git://github.com/bmbrands/moodle

8 years agoMerge branch 'MDL-39050' of git://github.com/timhunt/moodle
Damyon Wiese [Mon, 22 Apr 2013 02:25:46 +0000 (10:25 +0800)]
Merge branch 'MDL-39050' of git://github.com/timhunt/moodle

8 years agoMDL-38898 theme_simple: Copy fixes for block dnd from bootstrap
Damyon Wiese [Mon, 22 Apr 2013 02:07:53 +0000 (10:07 +0800)]
MDL-38898 theme_simple: Copy fixes for block dnd from bootstrap

8 years agoMDL-38893 - Fixing layout of the debug boxes for cache information under bootstrap...
Jason Fowler [Thu, 11 Apr 2013 02:53:29 +0000 (10:53 +0800)]
MDL-38893 - Fixing layout of the debug boxes for cache information under bootstrap - patch provided by David Scotson <david.scotson@glasgow.ac.uk>

8 years agoMerge branch 'MDL-38898_master' of git://github.com/lazydaisy/moodle
Damyon Wiese [Mon, 22 Apr 2013 01:52:09 +0000 (09:52 +0800)]
Merge branch 'MDL-38898_master' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'wip-MDL-39118-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 22 Apr 2013 01:41:45 +0000 (13:41 +1200)]
Merge branch 'wip-MDL-39118-master' of git://github.com/abgreeve/moodle

8 years agoMDL-39118 - mod_data: removed areamaxbytes option for uploading files and images.
Adrian Greeve [Tue, 16 Apr 2013 02:05:17 +0000 (10:05 +0800)]
MDL-39118 - mod_data: removed areamaxbytes option for uploading files and images.

Setting the maximum size for a file or picture field to the course upload limit
would send a value of 0 to the file picker. This patch checks for this 0 value
and handles it appropriately.

8 years agoMerge branch 'MDL-38854_master' of git://github.com/bmbrands/moodle
Sam Hemelryk [Mon, 22 Apr 2013 00:12:58 +0000 (12:12 +1200)]
Merge branch 'MDL-38854_master' of git://github.com/bmbrands/moodle

Conflicts:
theme/bootstrap/style/generated.css

8 years agoMerge branch 'MDL-39220' of git://github.com/colchambers/moodle
Sam Hemelryk [Sun, 21 Apr 2013 23:37:34 +0000 (11:37 +1200)]
Merge branch 'MDL-39220' of git://github.com/colchambers/moodle

8 years agoMerge branch 'wip-MDL-38900-master' of git://github.com/ds125v/moodle
Sam Hemelryk [Sun, 21 Apr 2013 23:10:51 +0000 (11:10 +1200)]
Merge branch 'wip-MDL-38900-master' of git://github.com/ds125v/moodle

Conflicts:
theme/bootstrap/style/generated.css

8 years agoMerge branch 'MDL-39172' of git://github.com/jmvedrine/moodle
Sam Hemelryk [Sun, 21 Apr 2013 23:02:39 +0000 (11:02 +1200)]
Merge branch 'MDL-39172' of git://github.com/jmvedrine/moodle

8 years agoMDL-38874 theme_bootstrap: tidy up whitespace
Sam Hemelryk [Sun, 21 Apr 2013 22:43:38 +0000 (10:43 +1200)]
MDL-38874 theme_bootstrap: tidy up whitespace

8 years agoMerge branch 'MDL-38874_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Sun, 21 Apr 2013 22:35:52 +0000 (10:35 +1200)]
Merge branch 'MDL-38874_master' of git://github.com/lazydaisy/moodle

Conflicts:
theme/bootstrap/style/generated.css

8 years agoMDL-39196 theme_bootstrap: improved display of login errors
David Scotson [Sun, 21 Apr 2013 22:27:11 +0000 (10:27 +1200)]
MDL-39196 theme_bootstrap: improved display of login errors

8 years agoMerge branch 'MDL-39241-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Sun, 21 Apr 2013 21:23:54 +0000 (09:23 +1200)]
Merge branch 'MDL-39241-master' of git://github.com/danpoltawski/moodle

8 years agoMDL-38874 theme_bootstrap: added back CSS rules to fix advanced elements show/hide...
Mary Evans [Sun, 21 Apr 2013 17:02:08 +0000 (18:02 +0100)]
MDL-38874 theme_bootstrap: added back CSS rules to fix advanced elements show/hide toggle in admin forms.

While doing this I got a compile error so not sure but I am guessing the changes to fix that error will show up in the commit diff.

8 years agoMDL-36959 test reworked adding of files to sha1 content pool
Petr Škoda [Sat, 20 Apr 2013 19:47:41 +0000 (21:47 +0200)]
MDL-36959 test reworked adding of files to sha1 content pool

8 years agoMDL-36959 rework adding of content files to the file pool
Petr Škoda [Thu, 18 Apr 2013 19:55:31 +0000 (21:55 +0200)]
MDL-36959 rework adding of content files to the file pool

This patch includes refreshing of borked files in file pool and basic prevention of race conditions. It also helps with diagnosing of file pool permission problems, detects coding errors and some other type of problems including sha1 collision jackpot.

8 years agoMDL-38898 theme_bootstrap: Made changes to layout/general.php to enable drag-n-drop...
Mary Evans [Sat, 20 Apr 2013 01:10:11 +0000 (02:10 +0100)]
MDL-38898 theme_bootstrap: Made changes to layout/general.php to enable drag-n-drop support in Bootstrap theme.

8 years agoMDL-38900 Change highlighted course section color
David Scotson [Fri, 19 Apr 2013 15:39:29 +0000 (16:39 +0100)]
MDL-38900 Change highlighted course section color

8 years agoMerge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle
Dan Poltawski [Fri, 19 Apr 2013 14:20:02 +0000 (15:20 +0100)]
Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle

Conflicts:
mod/scorm/module.js

8 years agoMerge branch 'MDL-38361' of https://github.com/prateeksachan/moodle
Dan Poltawski [Fri, 19 Apr 2013 14:11:33 +0000 (15:11 +0100)]
Merge branch 'MDL-38361' of https://github.com/prateeksachan/moodle

8 years agoMDL-39241 groups import: missing type
Dan Poltawski [Fri, 19 Apr 2013 13:51:27 +0000 (14:51 +0100)]
MDL-39241 groups import: missing type

8 years agoMerge branch 'wip-MDL-38565-m25' of git://github.com/samhemelryk/moodle
Dan Poltawski [Fri, 19 Apr 2013 12:29:07 +0000 (13:29 +0100)]
Merge branch 'wip-MDL-38565-m25' of git://github.com/samhemelryk/moodle

8 years agoMDL-39050 quiz access rules: settings.php files should work.
Tim Hunt [Wed, 17 Apr 2013 12:15:10 +0000 (13:15 +0100)]
MDL-39050 quiz access rules: settings.php files should work.

8 years agoMDL-38918 theme_simple: Added favicon.ico to theme/simple/pix directory.
Mary Evans [Fri, 19 Apr 2013 09:46:33 +0000 (10:46 +0100)]
MDL-38918 theme_simple: Added favicon.ico to theme/simple/pix directory.

8 years agoMDL-38854: Bootstrap theme - text input in a block is wider than the block
BA CodeMonkey [Fri, 19 Apr 2013 09:07:04 +0000 (11:07 +0200)]
MDL-38854: Bootstrap theme - text input in a block is wider than the block

8 years agoMDL-39231: Rename region-bs-main to region-main in layout files for theme bootstrap...
BA CodeMonkey [Fri, 19 Apr 2013 08:52:03 +0000 (10:52 +0200)]
MDL-39231: Rename region-bs-main to region-main in layout files for theme bootstrap and theme simple

8 years agoMDL-39163 Version bump for css changes
Damyon Wiese [Fri, 19 Apr 2013 07:51:31 +0000 (15:51 +0800)]
MDL-39163 Version bump for css changes

8 years agoMerge branch 'MDL-39163-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Fri, 19 Apr 2013 07:49:16 +0000 (15:49 +0800)]
Merge branch 'MDL-39163-master' of git://github.com/FMCorz/moodle

8 years agoMDL-38851 Administration: Fixed setType in admin section
Rajesh Taneja [Mon, 8 Apr 2013 02:04:02 +0000 (10:04 +0800)]
MDL-38851 Administration: Fixed setType in admin section

8 years agoMerge branch 'MDL-31194-master' of git://github.com/mouneyrac/moodle
Damyon Wiese [Fri, 19 Apr 2013 07:15:10 +0000 (15:15 +0800)]
Merge branch 'MDL-31194-master' of git://github.com/mouneyrac/moodle

8 years agoMerge branch 'MDL-39084-master' of github.com:StudiUM/moodle
Damyon Wiese [Fri, 19 Apr 2013 05:58:15 +0000 (13:58 +0800)]
Merge branch 'MDL-39084-master' of github.com:StudiUM/moodle

8 years agoMerge branch 'wip-MDL-39211-m25' of git://github.com/marinaglancy/moodle
Damyon Wiese [Fri, 19 Apr 2013 05:53:14 +0000 (13:53 +0800)]
Merge branch 'wip-MDL-39211-m25' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-39167' of git://github.com/timhunt/moodle
Damyon Wiese [Fri, 19 Apr 2013 05:13:28 +0000 (13:13 +0800)]
Merge branch 'MDL-39167' of git://github.com/timhunt/moodle

8 years agoMDL-39173 Assign - Remove permissions check and OUTPUT from previous patch
Damyon Wiese [Fri, 19 Apr 2013 05:05:12 +0000 (13:05 +0800)]
MDL-39173 Assign - Remove permissions check and OUTPUT from previous patch

The permissions check is not correct (even users with grade capability should not
see user identities) and $assignment->get_renderer() is preferred over $OUTPUT.

8 years agoMDL-39173 Assign - Enable comments for blind marking assignments (anonymous ones)
Sam Chaffee [Fri, 19 Apr 2013 05:02:45 +0000 (13:02 +0800)]
MDL-39173 Assign - Enable comments for blind marking assignments (anonymous ones)

8 years agoMerge branch 'MDL-39206_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Fri, 19 Apr 2013 04:37:31 +0000 (16:37 +1200)]
Merge branch 'MDL-39206_master' of git://github.com/lazydaisy/moodle

8 years agoMDL-38646 mod_folder: improved upgrade of showexpanded
Sam Hemelryk [Fri, 19 Apr 2013 04:27:04 +0000 (16:27 +1200)]
MDL-38646 mod_folder: improved upgrade of showexpanded

8 years agoMerge branch 'MDL-38646' of git://github.com/rlorenzo/moodle
Sam Hemelryk [Fri, 19 Apr 2013 04:23:21 +0000 (16:23 +1200)]
Merge branch 'MDL-38646' of git://github.com/rlorenzo/moodle

8 years agoMerge branch 'MDL-38777-m' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Fri, 19 Apr 2013 03:20:44 +0000 (15:20 +1200)]
Merge branch 'MDL-38777-m' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-39164' of git://github.com/jmvedrine/moodle
Sam Hemelryk [Fri, 19 Apr 2013 02:54:41 +0000 (14:54 +1200)]
Merge branch 'MDL-39164' of git://github.com/jmvedrine/moodle

8 years agoMerge branch 'MDL-38710-master' of git://github.com/damyon/moodle
Sam Hemelryk [Fri, 19 Apr 2013 02:41:25 +0000 (14:41 +1200)]
Merge branch 'MDL-38710-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-39033-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Fri, 19 Apr 2013 02:02:35 +0000 (14:02 +1200)]
Merge branch 'MDL-39033-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'MDL-39185_master' of https://github.com/markn86/moodle
Sam Hemelryk [Fri, 19 Apr 2013 01:53:55 +0000 (13:53 +1200)]
Merge branch 'MDL-39185_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-39135-master' of git://github.com/damyon/moodle
Sam Hemelryk [Fri, 19 Apr 2013 01:48:32 +0000 (13:48 +1200)]
Merge branch 'MDL-39135-master' of git://github.com/damyon/moodle

8 years agoMDL-38646 folder: change column from show_expanded to showexpanded
Rex Lorenzo [Mon, 8 Apr 2013 00:48:38 +0000 (17:48 -0700)]
MDL-38646 folder: change column from show_expanded to showexpanded

8 years agoMDL-38565 cache: tidy up pre-integration
Sam Hemelryk [Thu, 18 Apr 2013 02:50:14 +0000 (14:50 +1200)]
MDL-38565 cache: tidy up pre-integration

8 years agoMDL-38565 cache: improve stats gathering
Sam Hemelryk [Wed, 17 Apr 2013 03:50:28 +0000 (15:50 +1200)]
MDL-38565 cache: improve stats gathering

8 years agoMDL-38565 cache: upgrade code to amend default stores
Sam Hemelryk [Wed, 17 Apr 2013 03:43:17 +0000 (15:43 +1200)]
MDL-38565 cache: upgrade code to amend default stores

8 years agoMDL-38565 cache: cron routine to clean up old session data
Sam Hemelryk [Wed, 17 Apr 2013 03:01:11 +0000 (15:01 +1200)]
MDL-38565 cache: cron routine to clean up old session data

8 years agoMDL-38565 cache: session caches now function as expected
Sam Hemelryk [Wed, 17 Apr 2013 00:29:15 +0000 (12:29 +1200)]
MDL-38565 cache: session caches now function as expected

This change is a large change to the way sessions are handled
within MUC after it was discovered that session did not function
as expected when any store other than the default session store
was being used.
As part of this change the session loader has been largely
customised in order to consolidate session data for the loader.
The unit tests have also being greatly increased to provide
better coverage for sessions.

8 years agoMDL-39141 fix customtoolbar notices during upgrade
Petr Škoda [Tue, 16 Apr 2013 08:21:29 +0000 (10:21 +0200)]
MDL-39141 fix customtoolbar notices during upgrade

8 years agoMDL-39172 Import of .dat files is broken in blackboard_six import format
Jean-Michel Vedrine [Tue, 16 Apr 2013 20:04:55 +0000 (22:04 +0200)]
MDL-39172 Import of .dat files is broken in blackboard_six import format

8 years agoMDL-39164 GIFT, Blackboard and Examview import of essay questions broken
Jean-Michel Vedrine [Thu, 18 Apr 2013 14:18:01 +0000 (16:18 +0200)]
MDL-39164 GIFT, Blackboard and Examview import of essay questions broken

8 years agoMDL-39220 Javascript: Editor shrinks using collapse button
Colin Chambers [Thu, 18 Apr 2013 14:10:52 +0000 (15:10 +0100)]
MDL-39220 Javascript: Editor shrinks using collapse button

8 years agoMDL-39084 grade: Capability checks are incoherent for the Course grade settings section
Jean-Philippe Gaudreau [Tue, 16 Apr 2013 13:24:18 +0000 (09:24 -0400)]
MDL-39084 grade: Capability checks are incoherent for the Course grade settings section

8 years agoon demand release 2.5beta+
Dan Poltawski [Thu, 18 Apr 2013 11:51:46 +0000 (12:51 +0100)]
on demand release 2.5beta+

Special 'Spoons curry' UK Edition ;-)

8 years agoMDL-39219 mod_scorm - replace JSON with Y.JSON for IE7 compatibility
Davo Smith [Thu, 18 Apr 2013 11:44:24 +0000 (12:44 +0100)]
MDL-39219 mod_scorm - replace JSON with Y.JSON for IE7 compatibility

8 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Dan Poltawski [Thu, 18 Apr 2013 11:41:24 +0000 (12:41 +0100)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

8 years agoMDL-38592: Add major version redirect for settings used frontpage.
Damyon Wiese [Thu, 18 Apr 2013 08:29:38 +0000 (16:29 +0800)]
MDL-38592: Add major version redirect for settings used frontpage.

8 years agoMerge branch 'MDL-39203-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 18 Apr 2013 07:50:29 +0000 (08:50 +0100)]
Merge branch 'MDL-39203-master' of git://github.com/FMCorz/moodle

8 years agoMDL-39203 repository: Fixed authentication errors with Dropbox
Frederic Massart [Thu, 18 Apr 2013 06:47:22 +0000 (14:47 +0800)]
MDL-39203 repository: Fixed authentication errors with Dropbox

8 years agoMDL-39211 forgotten include of /course/lib.php
Marina Glancy [Thu, 18 Apr 2013 03:47:04 +0000 (13:47 +1000)]
MDL-39211 forgotten include of /course/lib.php

8 years agoMDL-39206 theme_bootstrap: Added resized/opaque screenshot.jpg
Mary Evans [Thu, 18 Apr 2013 00:45:11 +0000 (01:45 +0100)]
MDL-39206 theme_bootstrap: Added resized/opaque screenshot.jpg

8 years agoMDL-38777 JavaScript: Remove YUI cache persistence
Andrew Nicols [Wed, 17 Apr 2013 21:45:17 +0000 (22:45 +0100)]
MDL-38777 JavaScript: Remove YUI cache persistence

The cache does not need to be persistent within the same request and this
just holds memory open for no good reason.

8 years agoMDL-39167 quiz access rules: need to validate their settings.
Tim Hunt [Wed, 17 Apr 2013 13:24:38 +0000 (14:24 +0100)]
MDL-39167 quiz access rules: need to validate their settings.

We were missing the hook in the form validation method. We had them
everywhere else they were needed.

8 years agoMerge branch 'wip-mdl-39110' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 17 Apr 2013 11:48:17 +0000 (12:48 +0100)]
Merge branch 'wip-mdl-39110' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-38573-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 17 Apr 2013 11:37:23 +0000 (12:37 +0100)]
Merge branch 'MDL-38573-master-int' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-39081' of git://github.com/rwijaya/moodle
Dan Poltawski [Wed, 17 Apr 2013 11:32:39 +0000 (12:32 +0100)]
Merge branch 'MDL-39081' of git://github.com/rwijaya/moodle

8 years agoMDL-39021 pluginlib: theme_simple is a core plugin
Dan Poltawski [Wed, 17 Apr 2013 11:27:24 +0000 (12:27 +0100)]
MDL-39021 pluginlib: theme_simple is a core plugin

Don't list as an add-on.

8 years agoMerge branch 'MDL-39087-plugins-uninstall' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 17 Apr 2013 11:09:20 +0000 (12:09 +0100)]
Merge branch 'MDL-39087-plugins-uninstall' of git://github.com/mudrd8mz/moodle

8 years agoMerge branch 'MDL-38956_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 17 Apr 2013 10:50:50 +0000 (12:50 +0200)]
Merge branch 'MDL-38956_master' of git://github.com/dmonllao/moodle

8 years agoMDL-39049 Badges: Fix error when awarding a badge from recipients page
Yuliya Bozhko [Mon, 15 Apr 2013 23:23:52 +0000 (11:23 +1200)]
MDL-39049 Badges: Fix error when awarding a badge from recipients page

8 years agoMDL-38573 choice: Reformat settings form
Frederic Massart [Mon, 25 Mar 2013 01:42:12 +0000 (09:42 +0800)]
MDL-38573 choice: Reformat settings form

8 years agoMDL-39185 mod_forum: declare new object before creating member variables to prevent...
Mark Nelson [Wed, 17 Apr 2013 06:52:48 +0000 (14:52 +0800)]
MDL-39185 mod_forum: declare new object before creating member variables to prevent Strict Standards warning

8 years agoMDL-38710 assign: Fix one typo and change one param to PARAM_BOOL
Damyon Wiese [Wed, 17 Apr 2013 05:49:24 +0000 (13:49 +0800)]
MDL-38710 assign: Fix one typo and change one param to PARAM_BOOL

8 years agoMDL-38710 assign: convert selectedusers to PARAM_SEQUENCE
Dan Poltawski [Mon, 15 Apr 2013 14:12:00 +0000 (15:12 +0100)]
MDL-38710 assign: convert selectedusers to PARAM_SEQUENCE

This param type is more appropiate.

8 years agoMDL-38710 assign: fix missing setType calls
Dan Poltawski [Wed, 27 Mar 2013 08:07:44 +0000 (16:07 +0800)]
MDL-38710 assign: fix missing setType calls

8 years agoMDL-34434 Change the texts saying that we'll be removing web service deprecated funct...
Jerome Mouneyrac [Wed, 17 Apr 2013 04:13:04 +0000 (12:13 +0800)]
MDL-34434 Change the texts saying that we'll be removing web service deprecated functions from 2.5

8 years agoMerge branch 'w15_MDL-39052_m25_csvtemp' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 17 Apr 2013 00:43:49 +0000 (02:43 +0200)]
Merge branch 'w15_MDL-39052_m25_csvtemp' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-39151-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 17 Apr 2013 00:01:16 +0000 (02:01 +0200)]
Merge branch 'MDL-39151-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'w15_MDL-39069_m25_helpwindow' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 16 Apr 2013 23:55:45 +0000 (01:55 +0200)]
Merge branch 'w15_MDL-39069_m25_helpwindow' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-38100-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 16 Apr 2013 23:40:51 +0000 (01:40 +0200)]
Merge branch 'MDL-38100-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-39066-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Tue, 16 Apr 2013 23:36:43 +0000 (01:36 +0200)]
Merge branch 'MDL-39066-master' of git://github.com/ankitagarwal/moodle

8 years agoMerge branch 'wip-MDL-39145-m25' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 16 Apr 2013 23:27:39 +0000 (01:27 +0200)]
Merge branch 'wip-MDL-39145-m25' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'w15_MDL-39129_m25_afterburner' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 16 Apr 2013 23:06:17 +0000 (01:06 +0200)]
Merge branch 'w15_MDL-39129_m25_afterburner' of git://github.com/skodak/moodle

8 years agoMerge branch 'w15_MDL-39075_m25_userdesc' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 16 Apr 2013 23:03:27 +0000 (01:03 +0200)]
Merge branch 'w15_MDL-39075_m25_userdesc' of git://github.com/skodak/moodle

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

8 years agoMerge branch 'wip-MDL-39111-m25' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 16 Apr 2013 21:50:19 +0000 (23:50 +0200)]
Merge branch 'wip-MDL-39111-m25' of git://github.com/marinaglancy/moodle