Commit graph

15366 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
fedcc83016 Merge branch 'MDL-38035-master' of git://github.com/sammarshallou/moodle 2013-03-20 17:06:22 +01:00
sam marshall
acfee0d4ba MDL-38035 Conditional availability: Support multilang custom user fields 2013-03-20 15:57:53 +00:00
Damyon Wiese
c2eb74df47 Merge branch 'MDL-34401-muc-pluginlib' of git://github.com/mudrd8mz/moodle
Conflicts:
	lib/db/caches.php
	version.php
2013-03-20 14:08:55 +08:00
Damyon Wiese
80d852fa23 Merge branch 'MDL-38373' of git://github.com/stronk7/moodle 2013-03-20 11:05:38 +08:00
Eloy Lafuente (stronk7)
cfe6a96f0a Merge branch 'MDL-38470-m' of https://github.com/andrewnicols/moodle 2013-03-20 01:47:52 +01:00
Andrew Robert Nicols
c5952e06f1 MDL-38470 JavaScript: Rebuild moodle-core-tooltip with Shifter 2013-03-20 00:46:33 +00:00
Eloy Lafuente (stronk7)
e6f94aaa11 MDL-38515 JavaScript: Partially revert 4f65d03b08
It was going to cause some continuous logging in the console
annoying developers on 2.5 all the time. It may be reintroduced
once filepickers are converted to proper YUI modules.
2013-03-20 01:02:45 +01:00
Eloy Lafuente (stronk7)
b2b54ad7fe Revert "MDL-38515 JavaScript: Correct module dependencies for core_filepicker"
This reverts commit babf34d5cf.
2013-03-20 00:55:32 +01:00
Eloy Lafuente (stronk7)
87b6981e25 MDL-38035 api: doc get_condition_user_fields() new param. 2013-03-20 00:09:43 +01:00
Eloy Lafuente (stronk7)
1d962a1984 Merge branch 'MDL-38035-master' of git://github.com/sammarshallou/moodle 2013-03-19 23:54:27 +01:00
Eloy Lafuente (stronk7)
354ec0691b Merge branch 'MDL-37664-master' of https://github.com/lucisgit/moodle 2013-03-19 23:31:21 +01:00
Eloy Lafuente (stronk7)
eb8a3eeaac Merge branch 'MDL-38410_master' of git://github.com/dmonllao/moodle 2013-03-19 23:20:31 +01:00
Eloy Lafuente (stronk7)
e0e59a0c38 Merge branch 'w12_MDL-38558_m25_preupgrade' of git://github.com/skodak/moodle 2013-03-19 19:15:09 +01:00
Petr Škoda
6b4b74904b MDL-38558 add preupgrade script support
This is intended things like undoing of local hacks, it is similar to older pre 2.0 upgrade hack.
2013-03-19 19:14:01 +01:00
Eloy Lafuente (stronk7)
4e37889c41 Merge branch 'w12_MDL-38329_m25_webkit' of git://github.com/skodak/moodle 2013-03-19 18:17:11 +01:00
Eloy Lafuente (stronk7)
58b9cd031f Merge branch 'MDL-38497-admintree-beforesibling' of git://github.com/mudrd8mz/moodle
Conflicts:
	lib/upgrade.txt
2013-03-19 17:16:32 +01:00
Eloy Lafuente (stronk7)
7c27e34742 Merge branch 'MDL-38507-m' of git://github.com/andrewnicols/moodle 2013-03-19 13:31:46 +01:00
Eloy Lafuente (stronk7)
7761a38737 Merge branch 'w12_MDL-38319_m25_roleperf' of git://github.com/skodak/moodle 2013-03-19 13:22:50 +01:00
Andrew Robert Nicols
babf34d5cf MDL-38515 JavaScript: Correct module dependencies for core_filepicker 2013-03-19 11:42:12 +00:00
Andrew Robert Nicols
4f65d03b08 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
2013-03-19 11:42:12 +00:00
Eloy Lafuente (stronk7)
09fe13d123 Merge branch 'MDL-38391-m' of git://github.com/andrewnicols/moodle 2013-03-19 12:34:45 +01:00
David Monllao
5cde7298e3 MDL-38410 behat: Adding new form fields 2013-03-19 16:42:59 +08:00
David Monllao
fb624374bc MDL-38410 behat: Step to select from radio inputs 2013-03-19 16:42:59 +08:00
Damyon Wiese
851c304f45 Merge branch 'w12_MDL-38320_m25_logininfo' of git://github.com/skodak/moodle 2013-03-19 15:01:02 +08:00
Damyon Wiese
976b0ff2d4 Merge branch 'MDL-37959-master' of git://github.com/FMCorz/moodle
Conflicts:
	lib/formslib.php
2013-03-19 14:54:40 +08:00
Damyon Wiese
dcc5f0fe1e Merge branch 'MDL-38049-master' of git://github.com/FMCorz/moodle 2013-03-19 11:52:51 +08:00
Damyon Wiese
1c14b1c10c MDL-38367 Course dnduploadlib : deprecated add_* functions as they are internal to the class. 2013-03-19 09:56:16 +08:00
Andrew Robert Nicols
53ae22b993 MDL-38391 lib: Also include core subsystems in YUI_config.modules 2013-03-18 23:52:39 +00:00
Andrew Robert Nicols
da5e59b9d9 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.
2013-03-18 23:30:00 +00:00
Andrew Robert Nicols
c199993a61 MDL-38391 lib: Add note about use of camelCase variables names in YUI_config 2013-03-18 23:17:32 +00:00
Andrew Robert Nicols
d52ba47ee0 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.
2013-03-18 23:13:16 +00:00
Eloy Lafuente (stronk7)
03deed4f75 Merge branch 'w12_MDL-36198_m25_yuireset' of git://github.com/skodak/moodle 2013-03-18 23:56:34 +01:00
Damyon Wiese
7c211f565a Merge branch 'MDL-38005-master' of git://github.com/FMCorz/moodle 2013-03-18 13:45:41 +08:00
Damyon Wiese
9ccc1e1f34 Merge branch 'MDL-38340-master' of git://github.com/FMCorz/moodle 2013-03-18 13:24:45 +08:00
Damyon Wiese
61e871c3c9 Merge branch 'MDL-38435-master' of git://github.com/FMCorz/moodle 2013-03-18 13:08:41 +08:00
Petr Škoda
f2cf0f8419 MDL-38320 fix role name display when roles switched 2013-03-17 21:14:11 +01:00
Petr Škoda
d0bf51e2b3 MDL-38329 use proper plugin name for the webkit lists workaround
Credit goes to Mauno Korpelainen, thanks.
2013-03-17 20:59:11 +01:00
Petr Škoda
ab633dafac MDL-38319 make role_get_names() faster and more useful 2013-03-17 20:15:59 +01:00
Andrew Robert Nicols
43bd811891 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.
2013-03-17 16:30:39 +00:00
Andrew Robert Nicols
b3c78403b0 MDL-38391 lib: Move the group configFn to the YUI_config class 2013-03-17 16:25:33 +00:00
Andrew Robert Nicols
aa135c4d46 MDL-38391 lib: Add system to fetch moodle YUI metadata 2013-03-17 16:25:33 +00:00
Eloy Lafuente (stronk7)
07c4a94952 MDL-38373 Use correct PEAR->loadExtension()
Current use is wrong (static) and leads to strict standards notice.
2013-03-16 11:43:03 +01:00
Andrew Robert Nicols
cae21a321f MDL-38391 lib: Rewrite YUI_config as a class 2013-03-16 00:18:59 +00:00
Petr Škoda
97dbc8f2b6 MDL-36198 allow themes to specify yui cssnormalize or disable all CSS resets 2013-03-16 00:03:58 +01:00
Frederic Massart
807cf3d0ae MDL-38005 form: Headers have a proper name 2013-03-15 11:06:25 +08:00
David Mudrák
690a55f631 MDL-38497 Add the info about the method signature change into upgrade.txt 2013-03-15 00:59:26 +01:00
David Mudrák
77043fd6f6 MDL-38497 Add unit tests for the admin tree behaviour 2013-03-15 00:53:14 +01:00
David Mudrák
f6e85ab02a 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.
2013-03-15 00:47:11 +01:00
Petr Škoda
6f634b6ffb MDL-38467 import YUI 3.9.0 2013-03-14 08:49:30 +01:00
Frederic Massart
9ec532bef5 MDL-37959 form: Aria attribute set on collapsible sections 2013-03-13 11:14:20 +08:00