Merge "Make it show email as required if you choose to email a random password."

[lhc/web/wiklou.git] / resources / Resources.php

diff --git a/resources/Resources.php b/resources/Resources.php
index 1fcc3ad..02cde52 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -100,8 +100,8 @@ return array(
        ),
        'skins.vector.js' => array(
                'scripts' => array(
-                       'vector/vector.js',
                        'vector/collapsibleTabs.js',
+                       'vector/vector.js',
                ),
                'position' => 'top',
                'dependencies' => 'jquery.delayedBind',
@@ -719,6 +719,7 @@ return array(
        'mediawiki.action.edit' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.js',
                'dependencies' => array(
+                       'mediawiki.legacy.wikibits',
                        'jquery.textSelection',
                        'jquery.byteLimit',
                ),
@@ -924,7 +925,9 @@ return array(
        ),
        'mediawiki.special.changeslist' => array(
                'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.css',
-               'dependencies' => array( 'jquery.makeCollapsible', 'mediawiki.icon' ),
+       ),
+       'mediawiki.special.changeslist.enhanced' => array(
+               'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.enhanced.css',
        ),
        'mediawiki.special.movePage' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.movePage.js',