Merge "Add top help link to MediaWiki.org in several pages via indicator"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 4 Mar 2015 16:15:53 +0000 (16:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 4 Mar 2015 16:15:53 +0000 (16:15 +0000)
1  2 
includes/OutputPage.php
includes/specials/SpecialBlock.php
includes/specials/SpecialMovepage.php
languages/i18n/en.json
languages/i18n/qqq.json
resources/Resources.php

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -881,19 -877,23 +881,25 @@@ return array
                        'feedback-error1',
                        'feedback-error2',
                        'feedback-error3',
 +                      'feedback-message',
 +                      'feedback-subject',
 +                      'feedback-submit',
 +                      'feedback-terms',
 +                      'feedback-termsofuse',
                        'feedback-thanks',
 -                      'feedback-close',
 -                      'feedback-bugcheck',
 -                      'feedback-bugnew',
 +                      'feedback-thanks-title',
 +                      'feedback-useragent'
                ),
        ),
+       'mediawiki.helplink' => array(
+               'styles' => array(
+                       'resources/src/mediawiki/mediawiki.helplink.css',
+               ),
+               'targets' => array( 'desktop', 'mobile' ),
+       ),
        'mediawiki.hidpi' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.hidpi.js',
 -              'dependencies' => array(
 -                      'jquery.hidpi',
 -              ),
 +              'dependencies' => 'jquery.hidpi',
                'skipFunction' => 'resources/src/mediawiki.hidpi-skip.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),