http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89671
Revision: 89671
Author: catrope
Date: 2011-06-07 18:41:03 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
1.17wmf1: Revert r89670, merged revs were intended for REL1_17 instead. This
unmerges r87423, r88118, r88124, r88211, r88498, r89099, r89401, r89451
Modified Paths:
--------------
branches/wmf/1.17wmf1/includes/api/ApiParse.php
branches/wmf/1.17wmf1/includes/installer/Installer.i18n.php
branches/wmf/1.17wmf1/includes/specials/SpecialUserlogin.php
branches/wmf/1.17wmf1/includes/specials/SpecialVersion.php
branches/wmf/1.17wmf1/resources/Resources.php
branches/wmf/1.17wmf1/skins/chick/main.css
branches/wmf/1.17wmf1/skins/common/shared.css
branches/wmf/1.17wmf1/skins/monobook/main.css
branches/wmf/1.17wmf1/skins/vector/screen.css
Property Changed:
----------------
branches/wmf/1.17wmf1/includes/api/ApiParse.php
branches/wmf/1.17wmf1/includes/specials/SpecialVersion.php
branches/wmf/1.17wmf1/resources/Resources.php
branches/wmf/1.17wmf1/skins/common/shared.css
branches/wmf/1.17wmf1/skins/vector/screen.css
Modified: branches/wmf/1.17wmf1/includes/api/ApiParse.php
===================================================================
--- branches/wmf/1.17wmf1/includes/api/ApiParse.php 2011-06-07 18:39:47 UTC
(rev 89670)
+++ branches/wmf/1.17wmf1/includes/api/ApiParse.php 2011-06-07 18:41:03 UTC
(rev 89671)
@@ -516,6 +516,7 @@
' headhtml - Gives parsed <head> of the
page',
' iwlinks - Gives interwiki links in the
parsed wikitext',
' wikitext - Gives the original wikitext
that was parsed',
+ 'NOTE: Section tree is only generated if there
are more than 4 sections, or if the __TOC__ keyword is present'
),
'pst' => array(
'Do a pre-save transform on the input before
parsing it',
Property changes on: branches/wmf/1.17wmf1/includes/api/ApiParse.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/api/ApiParse.php:51646
/branches/REL1_16/phase3/includes/api/ApiParse.php:63621-63636,69357
/branches/sqlite/includes/api/ApiParse.php:58211-58321
/branches/wmf/1.16wmf4/includes/api/ApiParse.php:67177,69199,69521,76243,77266
/branches/wmf-deployment/includes/api/ApiParse.php:53381,59952,60970
/trunk/phase3/includes/api/ApiParse.php:79454-79456,79536,79727,79733,79762,79773-79774,80728,81121,81124,81406,87423,88118,88124,88211,88498,89099,89401,89451
+ /branches/REL1_15/phase3/includes/api/ApiParse.php:51646
/branches/REL1_16/phase3/includes/api/ApiParse.php:63621-63636,69357
/branches/sqlite/includes/api/ApiParse.php:58211-58321
/branches/wmf/1.16wmf4/includes/api/ApiParse.php:67177,69199,69521,76243,77266
/branches/wmf-deployment/includes/api/ApiParse.php:53381,59952,60970
/trunk/phase3/includes/api/ApiParse.php:79454-79456,79536,79727,79733,79762,79773-79774,80728,81121,81124,81406
Modified: branches/wmf/1.17wmf1/includes/installer/Installer.i18n.php
===================================================================
--- branches/wmf/1.17wmf1/includes/installer/Installer.i18n.php 2011-06-07
18:39:47 UTC (rev 89670)
+++ branches/wmf/1.17wmf1/includes/installer/Installer.i18n.php 2011-06-07
18:41:03 UTC (rev 89671)
@@ -415,7 +415,7 @@
'config-upload-deleted-help' => 'Choose a directory in which to
archive deleted files.
Ideally, this should not be accessible from the web.',
'config-logo' => 'Logo URL:',
- 'config-logo-help' => "MediaWiki's default skin includes
space for a 135x160 pixel logo above the sidebar menu.
+ 'config-logo-help' => "MediaWiki's default skin includes
space for a 135x160 pixel logo in the top left corner.
Upload an image of the appropriate size, and enter the URL here.
If you do not want a logo, leave this box blank.",
Modified: branches/wmf/1.17wmf1/includes/specials/SpecialUserlogin.php
===================================================================
--- branches/wmf/1.17wmf1/includes/specials/SpecialUserlogin.php
2011-06-07 18:39:47 UTC (rev 89670)
+++ branches/wmf/1.17wmf1/includes/specials/SpecialUserlogin.php
2011-06-07 18:41:03 UTC (rev 89671)
@@ -148,7 +148,7 @@
global $wgOut;
if ( $this->mEmail == '' ) {
- $this->mainLoginForm( wfMsgExt( 'noemailcreate', array(
'parsemag', 'escape' ), $this->mName ) );
+ $this->mainLoginForm( wfMsgExt( 'noemail', array(
'parsemag', 'escape' ), $this->mName ) );
return;
}
Modified: branches/wmf/1.17wmf1/includes/specials/SpecialVersion.php
===================================================================
--- branches/wmf/1.17wmf1/includes/specials/SpecialVersion.php 2011-06-07
18:39:47 UTC (rev 89670)
+++ branches/wmf/1.17wmf1/includes/specials/SpecialVersion.php 2011-06-07
18:41:03 UTC (rev 89671)
@@ -103,7 +103,6 @@
'Aryeh Gregor', 'Aaron Schulz', 'Andrew Garrett',
'Raimond Spekking',
'Alexandre Emsenhuber', 'Siebrand Mazeland', 'Chad
Horohoe',
'Roan Kattouw', 'Trevor Parscal', 'Bryan Tong Minh',
'Sam Reed',
- 'Victor Vasiliev', 'Rotem Liss', 'Platonides', 'Ashar
Voultoiz',
wfMsg( 'version-poweredby-others' )
);
Property changes on: branches/wmf/1.17wmf1/includes/specials/SpecialVersion.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/specials/SpecialVersion.php:51646
/branches/sqlite/includes/specials/SpecialVersion.php:58211-58321
/branches/wmf/1.16wmf4/includes/specials/SpecialVersion.php:67177,69199,76243,77266
/branches/wmf-deployment/includes/specials/SpecialVersion.php:53381,56967,60970
/trunk/phase3/includes/specials/SpecialVersion.php:79131,79561,79655,79704,79706,79713,87423,88118,88124,88211,88498,89099,89401,89451
+ /branches/REL1_15/phase3/includes/specials/SpecialVersion.php:51646
/branches/sqlite/includes/specials/SpecialVersion.php:58211-58321
/branches/wmf/1.16wmf4/includes/specials/SpecialVersion.php:67177,69199,76243,77266
/branches/wmf-deployment/includes/specials/SpecialVersion.php:53381,56967,60970
/trunk/phase3/includes/specials/SpecialVersion.php:79131,79561,79655,79704,79706,79713
Modified: branches/wmf/1.17wmf1/resources/Resources.php
===================================================================
--- branches/wmf/1.17wmf1/resources/Resources.php 2011-06-07 18:39:47 UTC
(rev 89670)
+++ branches/wmf/1.17wmf1/resources/Resources.php 2011-06-07 18:41:03 UTC
(rev 89671)
@@ -77,7 +77,6 @@
'jquery.suggestions' => array(
'scripts' => 'resources/jquery/jquery.suggestions.js',
'styles' => 'resources/jquery/jquery.suggestions.css',
- 'dependencies' => 'jquery.autoEllipsis',
),
'jquery.tabIndex' => array(
'scripts' => 'resources/jquery/jquery.tabIndex.js'
Property changes on: branches/wmf/1.17wmf1/resources/Resources.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/resources/Resources.php:51646
/branches/new-installer/phase3/resources/Resources.php:43664-66004
/branches/sqlite/resources/Resources.php:58211-58321
/branches/wmf/1.16wmf4/resources/Resources.php:67177,69199,76243,77266
/branches/wmf-deployment/resources/Resources.php:60970
/trunk/phase3/resources/Resources.php:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80495,80765,81177,81719,82000,82155-82156,82191,82200,82203,82218,86577,86579,86657,87423,87472,88118,88124,88211,88498,89099,89401,89451
+ /branches/REL1_15/phase3/resources/Resources.php:51646
/branches/new-installer/phase3/resources/Resources.php:43664-66004
/branches/sqlite/resources/Resources.php:58211-58321
/branches/wmf/1.16wmf4/resources/Resources.php:67177,69199,76243,77266
/branches/wmf-deployment/resources/Resources.php:60970
/trunk/phase3/resources/Resources.php:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80495,80765,81177,81719,82000,82155-82156,82191,82200,82203,82218,86577,86579,86657,87472
Modified: branches/wmf/1.17wmf1/skins/chick/main.css
===================================================================
--- branches/wmf/1.17wmf1/skins/chick/main.css 2011-06-07 18:39:47 UTC (rev
89670)
+++ branches/wmf/1.17wmf1/skins/chick/main.css 2011-06-07 18:41:03 UTC (rev
89671)
@@ -146,6 +146,12 @@
color: black;
vertical-align: top;
}
+abbr, acronym, .explain {
+ border-bottom: 1px dotted black;
+ color: black;
+ background: none;
+ cursor: help;
+}
q {
font-family: Times, "Times New Roman", serif;
font-style: italic;
Modified: branches/wmf/1.17wmf1/skins/common/shared.css
===================================================================
--- branches/wmf/1.17wmf1/skins/common/shared.css 2011-06-07 18:39:47 UTC
(rev 89670)
+++ branches/wmf/1.17wmf1/skins/common/shared.css 2011-06-07 18:41:03 UTC
(rev 89671)
@@ -4,12 +4,6 @@
* another, but don't ignore the poor non-Monobook users either.
*/
-/* Default style for semantic tags */
-abbr, acronym, .explain {
- border-bottom: 1px dotted black;
- cursor: help;
-}
-
/* Colored watchlist and recent changes numbers */
.mw-plusminus-pos { color: #006400; } /* dark green */
.mw-plusminus-neg { color: #8b0000; } /* dark red */
Property changes on: branches/wmf/1.17wmf1/skins/common/shared.css
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/skins/common/shared.css:51646
/branches/REL1_17/phase3/skins/common/shared.css:86409
/branches/new-installer/phase3/skins/common/shared.css:43664-66004
/branches/sqlite/skins/common/shared.css:58211-58321
/branches/wmf/1.16wmf4/skins/common/shared.css:67177,69199,76243,77266
/branches/wmf-deployment/skins/common/shared.css:60970
/trunk/phase3/skins/common/shared.css:78232,78964,79086-79087,79091,80495,80697,80755,80765,80771,80773-80774,80779,80816,80833,81177,82000,82004,82025,82048,82070,82073,82081,82085,82088,82090-82091,82096,82100-82101,82114,82128-82131,82146,82155-82156,82191,82200,82203,82218,83586-83587,83817,83876,83979,84118,84228,84607,84615,84665,85546,86450,86625,86788,86841,86904,87030,87423,88118,88124,88211,88498,89099,89401,89451
+ /branches/REL1_15/phase3/skins/common/shared.css:51646
/branches/REL1_17/phase3/skins/common/shared.css:86409
/branches/new-installer/phase3/skins/common/shared.css:43664-66004
/branches/sqlite/skins/common/shared.css:58211-58321
/branches/wmf/1.16wmf4/skins/common/shared.css:67177,69199,76243,77266
/branches/wmf-deployment/skins/common/shared.css:60970
/trunk/phase3/skins/common/shared.css:78232,78964,79086-79087,79091,80495,80697,80755,80765,80771,80773-80774,80779,80816,80833,81177,82000,82004,82025,82048,82070,82073,82081,82085,82088,82090-82091,82096,82100-82101,82114,82128-82131,82146,82155-82156,82191,82200,82203,82218,83586-83587,83817,83876,83979,84118,84228,84607,84615,84665,85546,86450,86625,86788,86841,86904,87030
Modified: branches/wmf/1.17wmf1/skins/monobook/main.css
===================================================================
--- branches/wmf/1.17wmf1/skins/monobook/main.css 2011-06-07 18:39:47 UTC
(rev 89670)
+++ branches/wmf/1.17wmf1/skins/monobook/main.css 2011-06-07 18:41:03 UTC
(rev 89671)
@@ -195,6 +195,12 @@
select {
vertical-align: top;
}
+abbr, acronym, .explain {
+ border-bottom: 1px dotted black;
+ color: black;
+ background: none;
+ cursor: help;
+}
q {
font-family: Times, "Times New Roman", serif;
font-style: italic;
Modified: branches/wmf/1.17wmf1/skins/vector/screen.css
===================================================================
--- branches/wmf/1.17wmf1/skins/vector/screen.css 2011-06-07 18:39:47 UTC
(rev 89670)
+++ branches/wmf/1.17wmf1/skins/vector/screen.css 2011-06-07 18:41:03 UTC
(rev 89671)
@@ -754,8 +754,16 @@
margin: .4em 0 .5em 0;
line-height: 1.5em;
}
-p img {
- margin: 0;
+ p img {
+ margin: 0;
+ }
+abbr,
+acronym,
+.explain {
+ border-bottom: 1px dotted black;
+ color: black;
+ background: none;
+ cursor: help;
}
q {
font-family: Times, "Times New Roman", serif;
Property changes on: branches/wmf/1.17wmf1/skins/vector/screen.css
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/skins/vector/screen.css:51646
/branches/REL1_17/phase3/skins/vector/screen.css:81680,86409
/branches/new-installer/phase3/skins/vector/screen.css:43664-66004
/branches/sqlite/skins/vector/screen.css:58211-58321
/branches/wmf/1.16wmf4/skins/vector/screen.css:67177,69199,76243,77266
/branches/wmf-deployment/skins/vector/screen.css:60970
/trunk/phase3/skins/vector/screen.css:78964,79086-79087,79091,79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80495,80765,81177,82000,82004,82025,82048,82070,82073,82081,82085,82088,82090-82091,82096,82100-82101,82114,82128-82131,82146,82155-82156,82191,82200,82203,82218,82315,82386,82411-82413,82446,85546,86450,86625,86788,86841,86904,87030,87423,88118,88124,88211,88498,89099,89401,89451
+ /branches/REL1_15/phase3/skins/vector/screen.css:51646
/branches/REL1_17/phase3/skins/vector/screen.css:81680,86409
/branches/new-installer/phase3/skins/vector/screen.css:43664-66004
/branches/sqlite/skins/vector/screen.css:58211-58321
/branches/wmf/1.16wmf4/skins/vector/screen.css:67177,69199,76243,77266
/branches/wmf-deployment/skins/vector/screen.css:60970
/trunk/phase3/skins/vector/screen.css:78964,79086-79087,79091,79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80495,80765,81177,82000,82004,82025,82048,82070,82073,82081,82085,82088,82090-82091,82096,82100-82101,82114,82128-82131,82146,82155-82156,82191,82200,82203,82218,82315,82386,82411-82413,82446,85546,86450,86625,86788,86841,86904,87030
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
