r56425 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r56424‎ | r56425 | r56426 >
Date:18:20, 16 September 2009
Author:catrope
Status:deferred
Tags:
Comment:
wmf-deployment-work: Merge r56424 (fix for r56417 which was merged
earlier) from trunk
Modified paths:
  • /branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar (modified) (history)
  • /branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js (modified) (history)
  • /branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
@@ -324,7 +324,8 @@
325325 options: {
326326 pre: "{| class=\"wikitable\" border=\"1\"\n|",
327327 periMsg: 'edittoolbar-tool-table-example-old',
328 - post: "\n|}"
 328+ post: "\n|}",
 329+ ownline: true
329330 }
330331 }
331332 },
Property changes on: branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
___________________________________________________________________
Name: svn:mergeinfo
332333 - /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
333334 + /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
Index: branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
@@ -19,7 +19,7 @@
2020 /* Configuration */
2121
2222 // Bump the version number every time you change any of the .css/.js files
23 -$wgEditToolbarStyleVersion = 33;
 23+$wgEditToolbarStyleVersion = 34;
2424
2525 // Set this to true to simply override the stock toolbar for everyone
2626 $wgEditToolbarGlobalEnable = false;
Property changes on: branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar
___________________________________________________________________
Name: svn:mergeinfo
2727 + /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

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r56417UsabilityInitiative:...catrope15:33, 16 September 2009
r56424EditToolbar: Fix for r56417: put inserted tables on their own line, like beforecatrope18:12, 16 September 2009

Status & tagging log