| Index: branches/REL1_18/extensions/LiquidThreads/classes/ParserFunctions.php |
| — | — | @@ -168,7 +168,7 @@ |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | $out->mLqtReplacements[$text] = $result; |
| 172 | | - LqtView::addJsAndCss(); |
| | 172 | + $out->addModules( 'ext.liquidThreads' ); |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | return true; |
| Property changes on: branches/REL1_18/extensions/LiquidThreads |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 176 | 176 | Merged /trunk/extensions/LiquidThreads:r92706 |
| Index: branches/REL1_18/extensions/FlaggedRevs/FlaggedRevs.php |
| — | — | @@ -172,11 +172,13 @@ |
| 173 | 173 | |
| 174 | 174 | # Special:Userrights settings |
| 175 | 175 | # # Basic rights for Sysops |
| 176 | | -$wgAddGroups['sysop'][] = 'editor'; |
| 177 | | -$wgRemoveGroups['sysop'][] = 'editor'; |
| 178 | | -# # Extra ones for Bureaucrats (@TODO: remove this) |
| 179 | | -$wgAddGroups['bureaucrat'][] = 'reviewer'; |
| 180 | | -$wgRemoveGroups['bureaucrat'][] = 'reviewer'; |
| | 176 | +$wgAddGroups['sysop'][] = 'editor'; // promote to basic reviewer (established editors) |
| | 177 | +$wgRemoveGroups['sysop'][] = 'editor'; // demote from basic reviewer (established editors) |
| | 178 | +$wgAddGroups['sysop'][] = 'autoreview'; // promote to basic auto-reviewer (semi-trusted users) |
| | 179 | +$wgRemoveGroups['sysop'][] = 'autoreview'; // demote from basic auto-reviewer (semi-trusted users) |
| | 180 | +# # Extra ones for Bureaucrats |
| | 181 | +$wgAddGroups['bureaucrat'][] = 'reviewer'; // promote to full reviewers |
| | 182 | +$wgRemoveGroups['bureaucrat'][] = 'reviewer'; // demote from full reviewers |
| 181 | 183 | |
| 182 | 184 | # How far the logs for overseeing quality revisions and depreciations go |
| 183 | 185 | $wgFlaggedRevsOversightAge = 30 * 24 * 3600; |
| — | — | @@ -222,11 +224,10 @@ |
| 223 | 225 | # array so that it shows up in sp:ListGroupRights... |
| 224 | 226 | $wgGroupPermissions['bot']['autoreview'] = true; |
| 225 | 227 | |
| 226 | | -# Lets some users access the review UI and set some flags |
| 227 | | -$wgAvailableRights[] = 'review'; # review pages to basic levels |
| 228 | | -$wgAvailableRights[] = 'validate'; # review pages to all levels |
| 229 | | -$wgAvailableRights[] = 'autoreview'; # auto-review pages on edit (including rollback) |
| 230 | | -$wgAvailableRights[] = 'autoreviewrestore'; # auto-review on rollback |
| | 228 | +$wgAvailableRights[] = 'review'; # review pages to basic quality levels |
| | 229 | +$wgAvailableRights[] = 'validate'; # review pages to all quality levels |
| | 230 | +$wgAvailableRights[] = 'autoreview'; # auto-review one's own edits (including rollback) |
| | 231 | +$wgAvailableRights[] = 'autoreviewrestore'; # auto-review one's own rollbacks |
| 231 | 232 | $wgAvailableRights[] = 'unreviewedpages'; # view the list of unreviewed pages |
| 232 | 233 | $wgAvailableRights[] = 'movestable'; # move pages with stable versions |
| 233 | 234 | $wgAvailableRights[] = 'stablesettings'; # change page stability settings |
| Index: branches/REL1_18/extensions/FlaggedRevs/presentation/RevisionReviewFormUI.php |
| — | — | @@ -189,7 +189,7 @@ |
| 190 | 190 | # Add the submit buttons |
| 191 | 191 | $form .= self::submitButtons( $rejectId, $frev, (bool)$disabled, $reviewIncludes ); |
| 192 | 192 | # Add "cancel" link |
| 193 | | - $form .= Linker::link( $article->getTitle(), wfMsg( 'revreview-cancel' ) ); |
| | 193 | + #$form .= Linker::link( $article->getTitle(), wfMsg( 'revreview-cancel' ) ); |
| 194 | 194 | |
| 195 | 195 | # Show stability log if there is anything interesting... |
| 196 | 196 | if ( $article->isPageLocked() ) { |
| Property changes on: branches/REL1_18/extensions/FlaggedRevs |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 197 | 197 | Merged /branches/wmf/1.18wmf1/extensions/FlaggedRevs:r99159,100635 |
| 198 | 198 | Merged /trunk/extensions/FlaggedRevs:r100327 |