Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 16:16:32 +0000 (17:16 +0100)]
Merge branch 'MDL-38497-admintree-beforesibling' of git://github.com/mudrd8mz/moodle
Conflicts:
lib/upgrade.txt
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 15:51:45 +0000 (16:51 +0100)]
Merge branch 'w12_MDL-38202_m25_loginas' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 15:48:37 +0000 (16:48 +0100)]
Merge branch 'MDL-38542' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 15:33:28 +0000 (16:33 +0100)]
Merge branch 'MDL-38444' of https://github.com/ppichet/moodle
Tim Hunt [Tue, 19 Mar 2013 13:40:51 +0000 (13:40 +0000)]
MDL-38542 shortanswer qtype: was broken for responses of '0'.
This was a regression caused by MDL-37157 & MDL-37746.
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 12:31:46 +0000 (13:31 +0100)]
Merge branch 'MDL-38507-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 12:22:50 +0000 (13:22 +0100)]
Merge branch 'w12_MDL-38319_m25_roleperf' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 12:21:17 +0000 (13:21 +0100)]
Bump (to better detect other issues incrementing it)
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 12:17:51 +0000 (13:17 +0100)]
Merge branch 'MDL-38391-m' of git://github.com/andrewnicols/moodle
Andrew Robert Nicols [Tue, 19 Mar 2013 12:09:43 +0000 (12:09 +0000)]
MDL-38391 lib: Add missing string for YUI cachedef
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 11:51:47 +0000 (12:51 +0100)]
Merge branch 'MDL-38515-m' of git://github.com/andrewnicols/moodle
Andrew Robert Nicols [Sat, 16 Mar 2013 20:45:02 +0000 (20:45 +0000)]
MDL-38515 JavaScript: Correct module dependencies for core_filepicker
Andrew Robert Nicols [Sat, 16 Mar 2013 20:42:55 +0000 (20:42 +0000)]
MDL-38515 JavaScript: Detect use of invalid module names in YUI dependencies
A warning is shown in the browser console if debugging is set, but it is
not possible to return from the configFn and stop the module load attempt
from continuing.
The error is caught and an additional error is shown by yui_combo.php
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 11:34:45 +0000 (12:34 +0100)]
Merge branch 'MDL-38391-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 11:28:01 +0000 (12:28 +0100)]
Merge branch 'MDL-38397' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 09:24:23 +0000 (10:24 +0100)]
Merge branch 'wip-mdl-38431' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 08:36:43 +0000 (09:36 +0100)]
Merge branch 'MDL-36872-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 19 Mar 2013 08:17:41 +0000 (16:17 +0800)]
Merge branch 'MDL-38368-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 19 Mar 2013 07:59:41 +0000 (15:59 +0800)]
MDL-30790 folder : Whitespace fixes
Damyon Wiese [Tue, 19 Mar 2013 07:47:35 +0000 (15:47 +0800)]
Merge branch 'MDL-30790_25' of git://github.com/rlorenzo/moodle
Damyon Wiese [Tue, 19 Mar 2013 07:18:13 +0000 (15:18 +0800)]
Merge branch 'wip-mdl-36395-m' of git://github.com/rajeshtaneja/moodle
Conflicts:
version.php
Damyon Wiese [Tue, 19 Mar 2013 07:01:02 +0000 (15:01 +0800)]
Merge branch 'w12_MDL-38320_m25_logininfo' of git://github.com/skodak/moodle
Damyon Wiese [Tue, 19 Mar 2013 06:54:40 +0000 (14:54 +0800)]
Merge branch 'MDL-37959-master' of git://github.com/FMCorz/moodle
Conflicts:
lib/formslib.php
Damyon Wiese [Tue, 19 Mar 2013 06:36:43 +0000 (14:36 +0800)]
Merge branch 'MDL-38426_dnd_plain_text' of git://github.com/davosmith/moodle
Damyon Wiese [Tue, 19 Mar 2013 06:02:23 +0000 (14:02 +0800)]
Merge branch 'MDL-38456-mdeploy-paths' of git://github.com/mudrd8mz/moodle
Damyon Wiese [Tue, 19 Mar 2013 05:03:11 +0000 (13:03 +0800)]
MDL-37079 Course create/update module. Remove use of "continue 2".
Damyon Wiese [Tue, 19 Mar 2013 04:15:48 +0000 (12:15 +0800)]
Merge branch 'MDL-38453-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 19 Mar 2013 03:52:51 +0000 (11:52 +0800)]
Merge branch 'MDL-38049-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 19 Mar 2013 03:20:39 +0000 (11:20 +0800)]
MDL-37079 Course create/update module. Fix indenting, some comment formatting and whitespace.
Damyon Wiese [Tue, 19 Mar 2013 03:13:23 +0000 (11:13 +0800)]
Merge branch 'MDL-37079-master2' of git://github.com/mouneyrac/moodle
Damyon Wiese [Tue, 19 Mar 2013 01:55:39 +0000 (09:55 +0800)]
MDL-38367 Course dnduploadlib : deprecated add_* functions as they are internal to the class.
Damyon Wiese [Tue, 19 Mar 2013 01:31:07 +0000 (09:31 +0800)]
Merge branch 'MDL-38367_dnd_ui_improvements' of git://github.com/davosmith/moodle
Eloy Lafuente (stronk7) [Tue, 19 Mar 2013 00:46:11 +0000 (01:46 +0100)]
Merge branch 'MDL-38524_master' of git://github.com/dmonllao/moodle
Andrew Robert Nicols [Mon, 18 Mar 2013 23:52:39 +0000 (23:52 +0000)]
MDL-38391 lib: Also include core subsystems in YUI_config.modules
Andrew Robert Nicols [Mon, 18 Mar 2013 23:29:57 +0000 (23:29 +0000)]
MDL-38391 lib: Rename moodle_metadata adder
This is a bit of a grey area. This function does not get and return a value
to the caller, and does not set a value taken from the caller. Instead it
gets a value from get_moodle_metadata and adds it to the current instance
of YUI_config. This rename will hopefully improve clarity here.
Andrew Robert Nicols [Mon, 18 Mar 2013 23:16:59 +0000 (23:16 +0000)]
MDL-38391 lib: Add note about use of camelCase variables names in YUI_config
Andrew Robert Nicols [Mon, 18 Mar 2013 23:13:12 +0000 (23:13 +0000)]
MDL-38391 lib: Remove clearing of YUI MUC cache on cache purge
purge_all_caches() handles clearing of all MUC caches so we don't need to
additionally clear the cache here too.
Eloy Lafuente (stronk7) [Mon, 18 Mar 2013 22:56:34 +0000 (23:56 +0100)]
Merge branch 'w12_MDL-36198_m25_yuireset' of git://github.com/skodak/moodle
Davo Smith [Mon, 18 Mar 2013 18:47:04 +0000 (18:47 +0000)]
MDL-38367 course dndupload - deprecate public 'add_type' function, remove non-YUI3 API call to _node
David Monllao [Mon, 18 Mar 2013 08:32:13 +0000 (16:32 +0800)]
MDL-38524 behat: Using wildcard instead of hardcoded version
Jerome Mouneyrac [Mon, 18 Mar 2013 08:08:52 +0000 (16:08 +0800)]
MDL-37079 missed one modedit.php change since started to work on the issue
Jerome Mouneyrac [Fri, 15 Mar 2013 09:45:56 +0000 (17:45 +0800)]
MDL-37079 switch the modedit.php functions into course/modedit.php
Jerome Mouneyrac [Tue, 22 Jan 2013 06:03:48 +0000 (14:03 +0800)]
MDL-37079 remove TODO, add . in comments
Jerome Mouneyrac [Tue, 22 Jan 2013 02:52:47 +0000 (10:52 +0800)]
MDL-37079 Added many assertEquals + generic test function (easy to test new module) + now process next advanced grading screens
Jerome Mouneyrac [Wed, 2 Jan 2013 05:58:42 +0000 (13:58 +0800)]
MDL-37079 create/update_module()
Damyon Wiese [Mon, 18 Mar 2013 06:11:09 +0000 (14:11 +0800)]
MDL-38005 formslib: Removing additional duplicate headers in calculated question form.
Damyon Wiese [Mon, 18 Mar 2013 05:45:41 +0000 (13:45 +0800)]
Merge branch 'MDL-38005-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 18 Mar 2013 05:24:45 +0000 (13:24 +0800)]
Merge branch 'MDL-38340-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 18 Mar 2013 05:08:41 +0000 (13:08 +0800)]
Merge branch 'MDL-38435-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 18 Mar 2013 03:41:00 +0000 (11:41 +0800)]
Merge branch 'MDL-38215-workshop-oracle' of git://github.com/mudrd8mz/moodle
Petr Škoda [Sun, 17 Mar 2013 20:13:28 +0000 (21:13 +0100)]
MDL-38320 fix role name display when roles switched
Petr Škoda [Sun, 17 Mar 2013 19:51:25 +0000 (20:51 +0100)]
MDL-38202 fix loginas logout redirection
Petr Škoda [Sun, 17 Mar 2013 19:15:59 +0000 (20:15 +0100)]
MDL-38319 make role_get_names() faster and more useful
Andrew Robert Nicols [Sat, 16 Mar 2013 12:57:15 +0000 (12:57 +0000)]
MDL-38507 JavaScript: Move definition of YUI_config before setup of SimpleYUI
Since moving to SimpleYUI, the order of inclusion for the YUI_config
variable is more important.
Simple YUI defines a global instance of YUI so that it can be used without
specifying the full YUI().use() syntax. As a result, any configuration
applied when that global instance is setup must exist already.
Andrew Robert Nicols [Sat, 16 Mar 2013 00:14:56 +0000 (00:14 +0000)]
MDL-38391 lib: Move the group configFn to the YUI_config class
Andrew Robert Nicols [Fri, 15 Mar 2013 15:33:59 +0000 (15:33 +0000)]
MDL-38391 lib: Add system to fetch moodle YUI metadata
ppichet [Sun, 17 Mar 2013 03:36:44 +0000 (23:36 -0400)]
MDL-38444 Saving datasets from edit_calculatedsimple_form.php
Bypassing the 3 steps savequestion() of calculated.
Eloy Lafuente (stronk7) [Sat, 16 Mar 2013 17:04:57 +0000 (18:04 +0100)]
MDL-25655 glossary: non full searches now working.
In the process of updting the module from 1.9 to
2.0 the (non) full search feature was lost without notice.
This restitutes it with the same behavior present in 1.9:
- fullsearch disabled: look into concepts and aliases.
- fullsearch enabled (default): look also into definitions.
Andrew Robert Nicols [Fri, 15 Mar 2013 15:31:04 +0000 (15:31 +0000)]
MDL-38391 lib: Rewrite YUI_config as a class
Rex Lorenzo [Fri, 15 Mar 2013 23:09:56 +0000 (16:09 -0700)]
MDL-30790 - Option to collapse or expand sub-folders
Petr Škoda [Thu, 14 Mar 2013 14:59:03 +0000 (15:59 +0100)]
MDL-36198 allow themes to specify yui cssnormalize or disable all CSS resets
Damyon Wiese [Fri, 15 Mar 2013 05:49:57 +0000 (13:49 +0800)]
Merge branch 'MDL-38474-master' of git://github.com/FMCorz/moodle
Frederic Massart [Fri, 15 Mar 2013 05:45:31 +0000 (13:45 +0800)]
MDL-38474 repository: Cannot edit a repository instance
Frederic Massart [Tue, 12 Mar 2013 09:18:00 +0000 (17:18 +0800)]
MDL-38005 form: Headers have a proper name
Damyon Wiese [Fri, 15 Mar 2013 02:43:46 +0000 (10:43 +0800)]
Merge branch 'MDL-38474-master' of git://github.com/FMCorz/moodle
David Mudrák [Fri, 15 Mar 2013 00:00:29 +0000 (01:00 +0100)]
MDL-38497 Fix invalid $ADMIN->add() calls
As the admin_category::add() method now checks for the third parameter,
couple of typos were detected in the code. Additional parameters passed
to the add() method were probably a mistake, a relict or a typo.
Note that the typo in admin/tool/unsuproles/settings.php had actually
significant impact on the functionality as the array with required
capabilities was not actually passed to the admin_externalpage
constructor as intended.
David Mudrák [Thu, 14 Mar 2013 23:59:26 +0000 (00:59 +0100)]
MDL-38497 Add the info about the method signature change into upgrade.txt
David Mudrák [Thu, 14 Mar 2013 23:53:14 +0000 (00:53 +0100)]
MDL-38497 Add unit tests for the admin tree behaviour
David Mudrák [Thu, 14 Mar 2013 23:47:11 +0000 (00:47 +0100)]
MDL-38497 Nodes can be put before a sibling in the admin tree
The patch introduces a new optional parameter of the add() method for
all classes implementing the parentable_part_of_admin_tree interface.
Currently we have only one class admin_category implementing this
interface. If some third party code implements this interface too, they
will get an error and will have to fix the add() method signature.
However, the chance that such third party code exists is considered
pretty low.
Tim Hunt [Thu, 14 Mar 2013 22:11:49 +0000 (22:11 +0000)]
MDL-38397 question editing: only validate default mark if present.
Most qtypes have that field, but not all. multianswer is an example in core.
Also some contrib qtypes.
Eloy Lafuente (stronk7) [Thu, 14 Mar 2013 14:44:46 +0000 (15:44 +0100)]
weekly release 2.5dev
Petr Škoda [Thu, 14 Mar 2013 07:41:11 +0000 (08:41 +0100)]
MDL-38467 import YUI 3.9.0
Aparup Banerjee [Thu, 14 Mar 2013 07:39:07 +0000 (15:39 +0800)]
Revert "MDL-38387 cache: fixed inifinite initialisation loop with site id"
This reverts commit
17200a016dba8479476a3819b5646855014b8d75.
Damyon Wiese [Thu, 14 Mar 2013 07:30:32 +0000 (15:30 +0800)]
Merge branch 'wip-MDL-38303-m25' of git://github.com/samhemelryk/moodle
Frederic Massart [Thu, 14 Mar 2013 06:09:19 +0000 (14:09 +0800)]
MDL-38474 repository: Correct context when checking permissions to access a repository
Frederic Massart [Thu, 14 Mar 2013 06:03:17 +0000 (14:03 +0800)]
MDL-38368 folder: No edit button when displayed inline
Aparup Banerjee [Thu, 14 Mar 2013 03:17:23 +0000 (11:17 +0800)]
Revert "Merge branch 'wip-MDL-35875-master' of git://github.com/phalacee/moodle"
This reverts commit
02dcf9b501d613c077fa51f5f0a35a477ef81c48, reversing
changes made to
61cd50618a5ff227f5a52006f94c5b2310a73abf.
David Mudrák [Wed, 13 Mar 2013 13:24:16 +0000 (14:24 +0100)]
MDL-38215 Fix cross-db support in workshop SQL queries
The $sql used in these methods may contain multiple parts glued
together by the UNION operator. Simply appending the ORDER BY statement
to the end of the query does not work in all DBs (failure reported at
Oracle). Following the pattern already applied in MDL-30051, we wrap the
SQL into yet another SELECT statement and perform ordering there.
Credit goes to Sara Cenni for suggesting the fix.
David Mudrák [Wed, 13 Mar 2013 11:08:38 +0000 (12:08 +0100)]
MDL-38456 Allow colons in paths passed to mdeploy.php utility
The input_manager now accepts colons (:) in TYPE_PATH options, but only
in cases where the colon is used as a part of Windows drive labels, as
in C:\apache.
Damyon Wiese [Wed, 13 Mar 2013 08:12:00 +0000 (16:12 +0800)]
Merge branch 'MDL-38184_master-winfix' of git://github.com/dmonllao/moodle
David Monllao [Wed, 13 Mar 2013 06:35:37 +0000 (14:35 +0800)]
MDL-38184 behat: Fixing problem with Windows tests
Aparup Banerjee [Wed, 13 Mar 2013 06:59:47 +0000 (14:59 +0800)]
Merge branch 'MDL-36990_master-neu' of git://github.com/grabs/moodle
Andreas Grabs [Wed, 13 Mar 2013 06:32:04 +0000 (07:32 +0100)]
MDL-36990 mod_feedback - remove single move icon, prevent autoscrolling
Frederic Massart [Wed, 13 Mar 2013 04:54:18 +0000 (12:54 +0800)]
MDL-38453 form: RTL styles for short forms
Frederic Massart [Wed, 13 Mar 2013 03:14:20 +0000 (11:14 +0800)]
MDL-37959 form: Aria attribute set on collapsible sections
Frederic Massart [Wed, 13 Mar 2013 02:28:37 +0000 (10:28 +0800)]
MDL-38049 form: Collapsed sections are hidden on page load
Eloy Lafuente (stronk7) [Wed, 13 Mar 2013 00:14:03 +0000 (01:14 +0100)]
Merge branch 'MDL-38268-master' of https://github.com/jfilip/moodle
Eloy Lafuente (stronk7) [Wed, 13 Mar 2013 00:08:26 +0000 (01:08 +0100)]
Merge branch 'MDL-30166-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Tue, 12 Mar 2013 21:50:32 +0000 (22:50 +0100)]
Merge branch 'wip-mdl-38332' of git://github.com/rajeshtaneja/moodle
Davo Smith [Tue, 12 Mar 2013 19:46:14 +0000 (19:46 +0000)]
MDL-38426 mod_label - correctly handle plain text that has been added by drag and drop upload
Eloy Lafuente (stronk7) [Tue, 12 Mar 2013 18:35:16 +0000 (19:35 +0100)]
MDL-38212 fix related unit tests.
For statslib tests was enough to require cronlib.php as
far as all the tests there are using ob-capture / output
expectations, so the new function does not bork anything.
For pluginlib tests finally the use was deleted because
it's a part of cron not interesting (should be always "cheap")
and to keep it there we should be adding a bunch of output
expectations under some cases, for practically nothing.
Eloy Lafuente (stronk7) [Tue, 12 Mar 2013 15:08:49 +0000 (16:08 +0100)]
MDL-38212 Add a little note about the output change.
Eloy Lafuente (stronk7) [Tue, 12 Mar 2013 15:02:39 +0000 (16:02 +0100)]
Merge branch 'MDL-38212' of git://github.com/timhunt/moodle
Rajesh Taneja [Tue, 12 Mar 2013 06:48:07 +0000 (14:48 +0800)]
MDL-36395: Converted hard-coded MAX_USER_PER_PAGE to config setting
course, cohort, enrol, role, groups and forum used to use hard-coded
MAX_USERS_PER_PAGE=100 for rendering user list. This has been converted
to $CFG->maxusersperpage.
Ankit Agarwal [Tue, 12 Mar 2013 09:04:53 +0000 (17:04 +0800)]
MDL-36872 reports: Fixing incorrect sorting of recent activites by timestamp
Aparup Banerjee [Tue, 12 Mar 2013 08:53:45 +0000 (16:53 +0800)]
Merge branch 'wip-MDL-35875-master' of git://github.com/phalacee/moodle
Damyon Wiese [Tue, 12 Mar 2013 08:35:19 +0000 (16:35 +0800)]
Merge branch 'MDL-38184_master' of git://github.com/dmonllao/moodle
Frederic Massart [Tue, 12 Mar 2013 04:20:33 +0000 (12:20 +0800)]
MDL-38340 form: Last fieldset is collapsed by default
Frederic Massart [Tue, 12 Mar 2013 07:05:17 +0000 (15:05 +0800)]
MDL-38435 form: Sections can be expanded by default
Damyon Wiese [Tue, 12 Mar 2013 08:11:38 +0000 (16:11 +0800)]
Merge branch 'MDL-38346_master-fix' of git://github.com/dmonllao/moodle