http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89672
Revision: 89672
Author: catrope
Date: 2011-06-07 18:45:20 +0000 (Tue, 07 Jun 2011)
Log Message:
-----------
1.17: Redo r89670 in the right branch: MFT r87423, r88118, r88124, r88211,
r88498, r89099, r89401, r89451
Modified Paths:
--------------
branches/REL1_17/phase3/includes/api/ApiParse.php
branches/REL1_17/phase3/includes/installer/Installer.i18n.php
branches/REL1_17/phase3/includes/specials/SpecialUserlogin.php
branches/REL1_17/phase3/includes/specials/SpecialVersion.php
branches/REL1_17/phase3/resources/Resources.php
branches/REL1_17/phase3/skins/chick/main.css
branches/REL1_17/phase3/skins/common/shared.css
branches/REL1_17/phase3/skins/monobook/main.css
branches/REL1_17/phase3/skins/vector/screen.css
Property Changed:
----------------
branches/REL1_17/phase3/includes/api/ApiParse.php
branches/REL1_17/phase3/includes/installer/Installer.i18n.php
branches/REL1_17/phase3/includes/specials/SpecialVersion.php
branches/REL1_17/phase3/resources/Resources.php
branches/REL1_17/phase3/skins/common/shared.css
branches/REL1_17/phase3/skins/vector/screen.css
Modified: branches/REL1_17/phase3/includes/api/ApiParse.php
===================================================================
--- branches/REL1_17/phase3/includes/api/ApiParse.php 2011-06-07 18:41:03 UTC
(rev 89671)
+++ branches/REL1_17/phase3/includes/api/ApiParse.php 2011-06-07 18:45:20 UTC
(rev 89672)
@@ -516,7 +516,6 @@
' 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/REL1_17/phase3/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:69521
/branches/wmf-deployment/includes/api/ApiParse.php:53381,59952
/trunk/phase3/includes/api/ApiParse.php:79454-79456,79536,79727,79733,79762,79773-79774,80728,81121,81124,81406
+ /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:69521
/branches/wmf-deployment/includes/api/ApiParse.php:53381,59952
/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
Modified: branches/REL1_17/phase3/includes/installer/Installer.i18n.php
===================================================================
--- branches/REL1_17/phase3/includes/installer/Installer.i18n.php
2011-06-07 18:41:03 UTC (rev 89671)
+++ branches/REL1_17/phase3/includes/installer/Installer.i18n.php
2011-06-07 18:45:20 UTC (rev 89672)
@@ -427,7 +427,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 in the top left corner.
+ 'config-logo-help' => "MediaWiki's default skin includes
space for a 135x160 pixel logo above the sidebar menu.
Upload an image of the appropriate size, and enter the URL here.
If you do not want a logo, leave this box blank.",
Property changes on:
branches/REL1_17/phase3/includes/installer/Installer.i18n.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/installer/Installer.i18n.php:51646
/branches/new-installer/phase3/includes/installer/Installer.i18n.php:43664-66004
/branches/sqlite/includes/installer/Installer.i18n.php:58211-58321
/branches/wmf-deployment/includes/installer/Installer.i18n.php:53381
/trunk/phase3/includes/installer/Installer.i18n.php:82845,82847-82848,84756,84875,84881-84882,84970,84976,87222,88658
+ /branches/REL1_15/phase3/includes/installer/Installer.i18n.php:51646
/branches/new-installer/phase3/includes/installer/Installer.i18n.php:43664-66004
/branches/sqlite/includes/installer/Installer.i18n.php:58211-58321
/branches/wmf-deployment/includes/installer/Installer.i18n.php:53381
/trunk/phase3/includes/installer/Installer.i18n.php:82845,82847-82848,84756,84875,84881-84882,84970,84976,87222,87423,88118,88124,88211,88498,88658,89099,89401,89451
Modified: branches/REL1_17/phase3/includes/specials/SpecialUserlogin.php
===================================================================
--- branches/REL1_17/phase3/includes/specials/SpecialUserlogin.php
2011-06-07 18:41:03 UTC (rev 89671)
+++ branches/REL1_17/phase3/includes/specials/SpecialUserlogin.php
2011-06-07 18:45:20 UTC (rev 89672)
@@ -148,7 +148,7 @@
global $wgOut;
if ( $this->mEmail == '' ) {
- $this->mainLoginForm( wfMsgExt( 'noemail', array(
'parsemag', 'escape' ), $this->mName ) );
+ $this->mainLoginForm( wfMsgExt( 'noemailcreate', array(
'parsemag', 'escape' ), $this->mName ) );
return;
}
Modified: branches/REL1_17/phase3/includes/specials/SpecialVersion.php
===================================================================
--- branches/REL1_17/phase3/includes/specials/SpecialVersion.php
2011-06-07 18:41:03 UTC (rev 89671)
+++ branches/REL1_17/phase3/includes/specials/SpecialVersion.php
2011-06-07 18:45:20 UTC (rev 89672)
@@ -103,6 +103,7 @@
'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/REL1_17/phase3/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-deployment/includes/specials/SpecialVersion.php:53381,56967
/trunk/phase3/includes/specials/SpecialVersion.php:79131,79561,79655,79704,79706,79713
+ /branches/REL1_15/phase3/includes/specials/SpecialVersion.php:51646
/branches/sqlite/includes/specials/SpecialVersion.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialVersion.php:53381,56967
/trunk/phase3/includes/specials/SpecialVersion.php:79131,79561,79655,79704,79706,79713,87423,88118,88124,88211,88498,89099,89401,89451
Modified: branches/REL1_17/phase3/resources/Resources.php
===================================================================
--- branches/REL1_17/phase3/resources/Resources.php 2011-06-07 18:41:03 UTC
(rev 89671)
+++ branches/REL1_17/phase3/resources/Resources.php 2011-06-07 18:45:20 UTC
(rev 89672)
@@ -104,6 +104,7 @@
'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/REL1_17/phase3/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
/trunk/phase3/includes/Sanitizer.php:78344,78893,78897,78909
/trunk/phase3/resources/Resources.php:78108,78179,78344,78347,78350,78365,78380,78425,78539,78886,78893,78897,78909,78964,79086-79087,79091,79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81657,81719,81722,81833,82200,82721,82845,82847-82849
+ /branches/REL1_15/phase3/resources/Resources.php:51646
/branches/new-installer/phase3/resources/Resources.php:43664-66004
/branches/sqlite/resources/Resources.php:58211-58321
/trunk/phase3/includes/Sanitizer.php:78344,78893,78897,78909
/trunk/phase3/resources/Resources.php:78108,78179,78344,78347,78350,78365,78380,78425,78539,78886,78893,78897,78909,78964,79086-79087,79091,79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81657,81719,81722,81833,82200,82721,82845,82847-82849,87423,88118,88124,88211,88498,89099,89401,89451
Modified: branches/REL1_17/phase3/skins/chick/main.css
===================================================================
--- branches/REL1_17/phase3/skins/chick/main.css 2011-06-07 18:41:03 UTC
(rev 89671)
+++ branches/REL1_17/phase3/skins/chick/main.css 2011-06-07 18:45:20 UTC
(rev 89672)
@@ -146,12 +146,6 @@
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/REL1_17/phase3/skins/common/shared.css
===================================================================
--- branches/REL1_17/phase3/skins/common/shared.css 2011-06-07 18:41:03 UTC
(rev 89671)
+++ branches/REL1_17/phase3/skins/common/shared.css 2011-06-07 18:45:20 UTC
(rev 89672)
@@ -4,6 +4,12 @@
* 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/REL1_17/phase3/skins/common/shared.css
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/skins/common/shared.css:51646
/branches/new-installer/phase3/skins/common/shared.css:43664-66004
/branches/sqlite/skins/common/shared.css:58211-58321
/trunk/phase3/skins/common/shared.css:78108,78179,78232,78344,78347,78350,78365,78380,78425,78539,78886,78893,78897,78909,78964,79086-79087,79091,80495,80610,80697,80755,80765,80771,80773-80774,80779,80816,80833,81177,81467,81490,81692,81707,81729,81765,81778,81812,81854,81890-81894,81896-81898,81900,81955,82129,82155-82156,82181,82191,82200,82203,82215,82219,82221,82253,82297,82307,82309,82312,82315,82337,82391-82392,82403,82411,82446,82457,82466,82473,82475,82478,82482,82486,82518,82530,82538,82547,82550,82565,82572,82608,82696,82748,82836,82853,82858,82871,82938,83005,83015,83046,83114,83153,83173,83270,83284,83374,83390,83392,83402-83403,83410-83411,83420,83461,83463,83476,83489,83496,83586-83587,83798,83814,83876,85546,86450,86625,86841,86904,86973,87030
+ /branches/REL1_15/phase3/skins/common/shared.css:51646
/branches/new-installer/phase3/skins/common/shared.css:43664-66004
/branches/sqlite/skins/common/shared.css:58211-58321
/trunk/phase3/skins/common/shared.css:78108,78179,78232,78344,78347,78350,78365,78380,78425,78539,78886,78893,78897,78909,78964,79086-79087,79091,80495,80610,80697,80755,80765,80771,80773-80774,80779,80816,80833,81177,81467,81490,81692,81707,81729,81765,81778,81812,81854,81890-81894,81896-81898,81900,81955,82129,82155-82156,82181,82191,82200,82203,82215,82219,82221,82253,82297,82307,82309,82312,82315,82337,82391-82392,82403,82411,82446,82457,82466,82473,82475,82478,82482,82486,82518,82530,82538,82547,82550,82565,82572,82608,82696,82748,82836,82853,82858,82871,82938,83005,83015,83046,83114,83153,83173,83270,83284,83374,83390,83392,83402-83403,83410-83411,83420,83461,83463,83476,83489,83496,83586-83587,83798,83814,83876,85546,86450,86625,86841,86904,86973,87030,87423,88118,88124,88211,88498,89099,89401,89451
Modified: branches/REL1_17/phase3/skins/monobook/main.css
===================================================================
--- branches/REL1_17/phase3/skins/monobook/main.css 2011-06-07 18:41:03 UTC
(rev 89671)
+++ branches/REL1_17/phase3/skins/monobook/main.css 2011-06-07 18:45:20 UTC
(rev 89672)
@@ -195,12 +195,6 @@
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/REL1_17/phase3/skins/vector/screen.css
===================================================================
--- branches/REL1_17/phase3/skins/vector/screen.css 2011-06-07 18:41:03 UTC
(rev 89671)
+++ branches/REL1_17/phase3/skins/vector/screen.css 2011-06-07 18:45:20 UTC
(rev 89672)
@@ -754,16 +754,8 @@
margin: .4em 0 .5em 0;
line-height: 1.5em;
}
- p img {
- margin: 0;
- }
-abbr,
-acronym,
-.explain {
- border-bottom: 1px dotted black;
- color: black;
- background: none;
- cursor: help;
+p img {
+ margin: 0;
}
q {
font-family: Times, "Times New Roman", serif;
Property changes on: branches/REL1_17/phase3/skins/vector/screen.css
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/skins/vector/screen.css:51646
/branches/new-installer/phase3/skins/vector/screen.css:43664-66004
/branches/sqlite/skins/vector/screen.css:58211-58321
/trunk/phase3/skins/vector/screen.css:78108,78179,78344,78347,78350,78365,78380,78425,78539,78886,78893,78897,78909,78964,79086-79087,79091,79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80495,80610,80765,81177,81467,81490,81679,81692,81707,81729,81765,81778,81812,81854,81890-81894,81896-81898,81900,81955,82129,82155-82156,82181,82191,82200,82203,82215,82219,82221,82253,82297,82307,82309,82312,82315,82337,82391-82392,82403,82411,82446,82457,82466,82473,82475,82478,82482,82486,85546,86450,86625,86841,86904,86973,87030
+ /branches/REL1_15/phase3/skins/vector/screen.css:51646
/branches/new-installer/phase3/skins/vector/screen.css:43664-66004
/branches/sqlite/skins/vector/screen.css:58211-58321
/trunk/phase3/skins/vector/screen.css:78108,78179,78344,78347,78350,78365,78380,78425,78539,78886,78893,78897,78909,78964,79086-79087,79091,79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80495,80610,80765,81177,81467,81490,81679,81692,81707,81729,81765,81778,81812,81854,81890-81894,81896-81898,81900,81955,82129,82155-82156,82181,82191,82200,82203,82215,82219,82221,82253,82297,82307,82309,82312,82315,82337,82391-82392,82403,82411,82446,82457,82466,82473,82475,82478,82482,82486,85546,86450,86625,86841,86904,86973,87030,87423,88118,88124,88211,88498,89099,89401,89451
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
