Merge "Promote LivePreview from its experimental state"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 7 Dec 2014 21:59:12 +0000 (21:59 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 7 Dec 2014 21:59:12 +0000 (21:59 +0000)
1  2 
languages/i18n/en.json
languages/i18n/qqq.json
resources/Resources.php

Simple merge
Simple merge
@@@ -1043,16 -1041,18 +1043,25 @@@ return array
                'dependencies' => array(
                        'jquery.form',
                        'jquery.spinner',
+                       'mediawiki.api',
                        'mediawiki.action.history.diff',
+                       'mediawiki.util',
+                       'mediawiki.jqueryMsg',
+               ),
+               'messages' => array(
+                       'otherlanguages',
+                       'tooltip-p-lang',
+                       'summary-preview',
+                       'parentheses',
                ),
        ),
 +      'mediawiki.action.edit.stash' => array(
 +              'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.stash.js',
 +              'dependencies' => array(
 +                      'jquery.getAttrs',
 +                      'mediawiki.api',
 +              ),
 +      ),
        'mediawiki.action.history' => array(
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.history.js',
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.history.css',