| Index: branches/wmf/1.18wmf1/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php |
| — | — | @@ -53,8 +53,8 @@ |
| 54 | 54 | 'articlefeedbackv5-form-hide' => 'Hide this ($1)', |
| 55 | 55 | 'articlefeedbackv5-form-abuse' => 'Flag as abuse ($1)', |
| 56 | 56 | 'articlefeedbackv5-form-header' => 'Feedback #$1, at $2', |
| 57 | | - 'articlefeedbackv5-form1-header-found' => '$1 found what they were looking for:', |
| 58 | | - 'articlefeedbackv5-form1-header-not-found' => '$1 did not find what they were looking for:', |
| | 57 | + 'articlefeedbackv5-form1-header-found' => '{{GENDER:$1|$1}} found what they were looking for:', |
| | 58 | + 'articlefeedbackv5-form1-header-not-found' => '{{GENDER:$1|$1}} did not find what they were looking for:', |
| 59 | 59 | 'articlefeedbackv5-form2-header' => '$1 had a $2:', |
| 60 | 60 | 'articlefeedbackv5-form3-header' => '$1 rated this page $2/5', |
| 61 | 61 | 'articlefeedbackv5-form4-header' => 'User was presented with the CTA-only form.', |
| Property changes on: branches/wmf/1.18wmf1/extensions/ArticleFeedbackv5 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 62 | 62 | Merged /trunk/extensions/ArticleFeedbackv5:r107050,107337 |
| Index: branches/wmf/1.18wmf1/extensions/ApiSandbox/ext.apiSandbox.js |
| — | — | @@ -398,6 +398,10 @@ |
| 399 | 399 | s = s.replace( /\n\s+\*?([^\n]*)/g, '\n<li>$1</li>' ); // <li> around bulleted lines |
| 400 | 400 | } |
| 401 | 401 | s = s.replace( /\n(?!<)/, '\n<br/>' ); |
| | 402 | + s = s.replace( /(?:https?:)?\/\/[^\s<>]+/g, function( s ) { |
| | 403 | + // linkify URLs, input is already HTML-escaped above |
| | 404 | + return '<a href="' + s + '">' + s + '</a>'; |
| | 405 | + } ); |
| 402 | 406 | return s; |
| 403 | 407 | } |
| 404 | 408 | |
| Index: branches/wmf/1.18wmf1/extensions/ApiSandbox/ext.apiSandbox.css |
| — | — | @@ -36,3 +36,10 @@ |
| 37 | 37 | height: 15em; |
| 38 | 38 | overflow: scroll; |
| 39 | 39 | } |
| | 40 | + |
| | 41 | +/* override enwiki's insane styles */ |
| | 42 | +div.mw-collapsible { |
| | 43 | + border: none !important; |
| | 44 | + text-align: left !important; |
| | 45 | + font-size: 100% !important; |
| | 46 | +} |
| Index: branches/wmf/1.18wmf1/extensions/CodeReview/CodeReview.i18n.php |
| — | — | @@ -92,6 +92,7 @@ |
| 93 | 93 | 'code-rev-purge-link' => 'purge', |
| 94 | 94 | 'code-rev-total' => 'Total number of results: $1', |
| 95 | 95 | 'code-rev-not-found' => "Revision '''$1''' does not exist!", |
| | 96 | + 'code-rev-history-link' => 'history', |
| 96 | 97 | 'code-status-new' => 'new', |
| 97 | 98 | 'code-status-desc-new' => 'Revision is pending an action (default status).', |
| 98 | 99 | 'code-status-fixme' => 'fixme', |
| Index: branches/wmf/1.18wmf1/extensions/CodeReview/ui/CodeRevisionView.php |
| — | — | @@ -285,6 +285,10 @@ |
| 286 | 286 | $path = preg_replace( '/ \([^\)]+\)$/', '', $path ); |
| 287 | 287 | $viewvc = $this->mRepo->getViewVcBase(); |
| 288 | 288 | $diff = ''; |
| | 289 | + $hist = $this->skin->link( |
| | 290 | + SpecialPage::getTitleFor( 'Code', $this->mRepo->getName() ), |
| | 291 | + wfMsg( 'code-rev-history-link' ), array(), array( 'path' => $path ) |
| | 292 | + ); |
| 289 | 293 | $safePath = wfUrlEncode( $path ); |
| 290 | 294 | if ( $viewvc ) { |
| 291 | 295 | $rev = $this->mRev->getId(); |
| — | — | @@ -312,7 +316,7 @@ |
| 313 | 317 | } else { |
| 314 | 318 | $link = $safePath; |
| 315 | 319 | } |
| 316 | | - return "<li><b>$link</b> ($desc)$diff</li>\n"; |
| | 320 | + return "<li><b>$link</b> ($desc) ($hist)$diff</li>\n"; |
| 317 | 321 | } |
| 318 | 322 | |
| 319 | 323 | protected function tagForm() { |
| Property changes on: branches/wmf/1.18wmf1/extensions/CodeReview |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 320 | 324 | Merged /trunk/extensions/CodeReview:r95614,104865,105908,107050,107337 |
| Property changes on: branches/wmf/1.18wmf1/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 321 | 325 | Merged /trunk/extensions:r95614,104865,105908,107050,107337 |