http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56425
Revision: 56425
Author: catrope
Date: 2009-09-16 18:20:49 +0000 (Wed, 16 Sep 2009)
Log Message:
-----------
wmf-deployment-work: Merge r56424 (fix for r56417 which was merged
earlier) from trunk
Modified Paths:
--------------
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
Property Changed:
----------------
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
Property changes on:
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar:51646
/trunk/extensions/UsabilityInitiative/EditToolbar:56207,56209,56296,56333,56355,56424
/trunk/phase3/extensions/UsabilityInitiative/EditToolbar:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350
Modified:
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
===================================================================
---
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
2009-09-16 18:12:40 UTC (rev 56424)
+++
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
2009-09-16 18:20:49 UTC (rev 56425)
@@ -324,7 +324,8 @@
options: {
pre: "{|
class=\"wikitable\" border=\"1\"\n|",
periMsg:
'edittoolbar-tool-table-example-old',
- post: "\n|}"
+ post: "\n|}",
+ ownline: true
}
}
},
Property changes on:
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646
/trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56207,56209,56226,56296,56333,56355,56417
/trunk/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350
+
/branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646
/trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56207,56209,56226,56296,56333,56355,56417,56424
/trunk/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350
Modified:
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
===================================================================
---
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
2009-09-16 18:12:40 UTC (rev 56424)
+++
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
2009-09-16 18:20:49 UTC (rev 56425)
@@ -19,7 +19,7 @@
/* Configuration */
// Bump the version number every time you change any of the .css/.js files
-$wgEditToolbarStyleVersion = 33;
+$wgEditToolbarStyleVersion = 34;
// Set this to true to simply override the stock toolbar for everyone
$wgEditToolbarGlobalEnable = false;
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
