Merge "Add possibility to filter for log_action in all core logs"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 9 Apr 2016 15:06:31 +0000 (15:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 9 Apr 2016 15:06:31 +0000 (15:06 +0000)
1  2 
includes/DefaultSettings.php
languages/i18n/en.json
languages/i18n/qqq.json

@@@ -585,9 -585,10 +585,9 @@@ $wgLockManagers = []
   * Requires PHP's Exif extension: http://www.php.net/manual/en/ref.exif.php
   *
   * @note FOR WINDOWS USERS:
 - * To enable Exif functions, add the following lines to the "Windows
 + * To enable Exif functions, add the following line to the "Windows
   * extensions" section of php.ini:
   * @code{.ini}
 - * extension=extensions/php_mbstring.dll
   * extension=extensions/php_exif.dll
   * @endcode
   */
@@@ -2287,7 -2288,7 +2287,7 @@@ $wgSessionsInObjectCache = true
  $wgObjectCacheSessionExpiry = 3600;
  
  /**
 - * @deprecated since 1.27, MediaWiki\\Session\\SessionManager doesn't use PHP session storage.
 + * @deprecated since 1.27, MediaWiki\Session\SessionManager doesn't use PHP session storage.
   */
  $wgSessionHandler = null;
  
@@@ -7239,12 -7240,36 +7239,36 @@@ $wgActionFilteredLogs = 
                'reblock' => [ 'reblock' ],
                'unblock' => [ 'unblock' ],
        ],
+       'contentmodel' => [
+               'change' => [ 'change' ],
+               'new' => [ 'new' ],
+       ],
        'delete' => [
                'delete' => [ 'delete' ],
                'restore' => [ 'restore' ],
                'event' => [ 'event' ],
                'revision' => [ 'revision' ],
        ],
+       'import' => [
+               'interwiki' => [ 'interwiki' ],
+               'upload' => [ 'upload' ],
+       ],
+       'managetags' => [
+               'create' => [ 'create' ],
+               'delete' => [ 'delete' ],
+               'activate' => [ 'activate' ],
+               'deactivate' => [ 'deactivate' ],
+       ],
+       'move' => [
+               'move' => [ 'move' ],
+               'move_redir' => [ 'move_redir' ],
+       ],
+       'newusers' => [
+               'create' => [ 'create', 'newusers' ],
+               'create2' => ['create2' ],
+               'autocreate' => [ 'autocreate' ],
+               'byemail' => [ 'byemail' ],
+       ],
        'patrol' => [
                'patrol' => [ 'patrol' ],
                'autopatrol' => [ 'autopatrol' ],
                'protect' => [ 'protect' ],
                'modify' => [ 'modify' ],
                'unprotect' => [ 'unprotect' ],
+               'move_prot' => ['move_prot'],
+       ],
+       'rights' => [
+               'rights' => [ 'rights' ],
+               'autopromote' => [ 'autopromote' ],
+       ],
+       'suppress' => [
+               'event' => [ 'event' ],
+               'revision' => [ 'revision' ],
+               'delete' => [ 'delete' ],
+               'block' => [ 'block' ],
+               'reblock' => [ 'reblock' ],
        ],
        'upload' => [
                'upload' => [ 'upload' ],
diff --combined languages/i18n/en.json
        "api-error-unknownerror": "Unknown error: \"$1\".",
        "api-error-uploaddisabled": "Uploading is disabled on this wiki.",
        "api-error-verification-error": "This file might be corrupt, or have the wrong extension.",
 +      "api-error-was-deleted": "A file of this name has been previously uploaded and subsequently deleted.",
        "duration-seconds": "$1 {{PLURAL:$1|second|seconds}}",
        "duration-minutes": "$1 {{PLURAL:$1|minute|minutes}}",
        "duration-hours": "$1 {{PLURAL:$1|hour|hours}}",
        "sessionprovider-nocookies": "Cookies may be disabled. Ensure you have cookies enabled and start again.",
        "randomrootpage": "Random root page",
        "log-action-filter-block": "Type of block:",
+       "log-action-filter-contentmodel": "Type of contentmodel modification:",
        "log-action-filter-delete": "Type of deletion:",
+       "log-action-filter-import": "Type of import:",
+       "log-action-filter-managetags": "Type of tag management action:",
+       "log-action-filter-move": "Type of move:",
+       "log-action-filter-newusers": "Type of account creation:",
        "log-action-filter-patrol": "Type of patrol:",
        "log-action-filter-protect": "Type of protection:",
+       "log-action-filter-rights": "Type of right change",
+       "log-action-filter-suppress": "Type of suppression",
        "log-action-filter-upload": "Type of upload:",
        "log-action-filter-all": "All",
        "log-action-filter-block-block": "Block",
        "log-action-filter-block-reblock": "Block modification",
        "log-action-filter-block-unblock": "Unblock",
+       "log-action-filter-contentmodel-change": "Change of Contentmodel",
+       "log-action-filter-contentmodel-new": "Creation of page with non-standard Contentmodel",
        "log-action-filter-delete-delete": "Page deletion",
        "log-action-filter-delete-restore": "Page undeletion",
        "log-action-filter-delete-event": "Log deletion",
        "log-action-filter-delete-revision": "Revision deletion",
+       "log-action-filter-import-interwiki": "Transwiki import",
+       "log-action-filter-import-upload": "Import by XML upload",
+       "log-action-filter-managetags-create": "Tag creation",
+       "log-action-filter-managetags-delete": "Tag deletion",
+       "log-action-filter-managetags-activate": "Tag activation",
+       "log-action-filter-managetags-deactivate": "Tag deactivation",
+       "log-action-filter-move-move": "Move without overwriting of redirects",
+       "log-action-filter-move-move_redir": "Move with overwriting of redirects",
+       "log-action-filter-newusers-create": "Creation by anonymous user",
+       "log-action-filter-newusers-create2": "Creation by registered user",
+       "log-action-filter-newusers-autocreate": "Automatic creation",
+       "log-action-filter-newusers-byemail": "Creation with password sent by e-mail",
        "log-action-filter-patrol-patrol": "Manual patrol",
        "log-action-filter-patrol-autopatrol": "Automatic patrol",
        "log-action-filter-protect-protect": "Protection",
        "log-action-filter-protect-modify": "Protection modification",
        "log-action-filter-protect-unprotect": "Unprotection",
+       "log-action-filter-protect-move_prot": "Moved protection",
+       "log-action-filter-rights-rights": "Manual change",
+       "log-action-filter-rights-autopromote": "Automatic change",
+       "log-action-filter-suppress-event": "Log suppression",
+       "log-action-filter-suppress-revision": "Revision suppression",
+       "log-action-filter-suppress-delete": "Page suppression",
+       "log-action-filter-suppress-block": "User supppression by block",
+       "log-action-filter-suppress-reblock": "User suppression by reblock",
        "log-action-filter-upload-upload": "New upload",
        "log-action-filter-upload-overwrite": "Reupload"
  }
diff --combined languages/i18n/qqq.json
        "api-error-unknownerror": "API error message that can be used for client side localisation of API errors.\n\nParameters:\n* $1 - an unknown error message\n{{Identical|Unknown error}}",
        "api-error-uploaddisabled": "API error message that can be used for client side localisation of API errors.",
        "api-error-verification-error": "The word \"extension\" refers to the part behind the last dot in a file name, that by convention gives a hint about the kind of data format which a files contents are in.",
 +      "api-error-was-deleted": "API error message that can be used for client side localisation of API errors.",
        "duration-seconds": "Used as duration. Parameters:\n* $1 - number of seconds\n{{Related|Duration}}\n{{Identical|Second}}",
        "duration-minutes": "Used as duration. Parameters:\n* $1 - number of minutes\n{{Related|Duration}}\n{{Identical|Minute}}",
        "duration-hours": "Used as duration. Parameters:\n* $1 - number of hours\n{{Related|Duration}}",
        "sessionprovider-nocookies": "Used to inform the user that sessions may be missing due to lack of cookies.",
        "randomrootpage": "{{doc-special|RandomRootPage}}",
        "log-action-filter-block": "Which type of action to filter for in this log",
+       "log-action-filter-contentmodel": "Which type of action to filter for in this log",
        "log-action-filter-delete": "Which type of action to filter for in this log",
+       "log-action-filter-import": "Which type of action to filter for in this log",
+       "log-action-filter-managetags": "Which type of action to filter for in this log",
+       "log-action-filter-move": "Which type of action to filter for in this log",
+       "log-action-filter-newusers": "Which type of action to filter for in this log",
        "log-action-filter-patrol": "Which type of action to filter for in this log",
        "log-action-filter-protect": "Which type of action to filter for in this log",
+       "log-action-filter-rights": "Which type of action to filter for in this log",
+       "log-action-filter-suppress": "Which type of action to filter for in this log",
        "log-action-filter-upload": "Which type of action to filter for in this log",
        "log-action-filter-all": "All types of action are allowed\n{{Identical|All}}",
        "log-action-filter-block-block": "Action to filter for in this log\n{{Identical|Block}}",
        "log-action-filter-block-reblock": "Action to filter for in this log",
        "log-action-filter-block-unblock": "Action to filter for in this log\n{{Identical|Unblock}}",
+       "log-action-filter-contentmodel-change": "Action to filter for in this log",
+       "log-action-filter-contentmodel-new": "Action to filter for in this log",
        "log-action-filter-delete-delete": "Action to filter for in this log",
        "log-action-filter-delete-restore": "Action to filter for in this log",
        "log-action-filter-delete-event": "Action to filter for in this log",
        "log-action-filter-delete-revision": "Action to filter for in this log",
+       "log-action-filter-import-interwiki": "Action to filter for in this log",
+       "log-action-filter-import-upload": "Action to filter for in this log",
+       "log-action-filter-managetags-create": "Action to filter for in this log",
+       "log-action-filter-managetags-delete": "Action to filter for in this log",
+       "log-action-filter-managetags-activate": "Action to filter for in this log",
+       "log-action-filter-managetags-deactivate": "Action to filter for in this log",
+       "log-action-filter-move-move": "Action to filter for in this log",
+       "log-action-filter-move-move_redir": "Action to filter for in this log",
+       "log-action-filter-newusers-create": "Action to filter for in this log",
+       "log-action-filter-newusers-create2": "Action to filter for in this log",
+       "log-action-filter-newusers-autocreate": "Action to filter for in this log",
+       "log-action-filter-newusers-byemail": "Action to filter for in this log",
        "log-action-filter-patrol-patrol": "Action to filter for in this log",
        "log-action-filter-patrol-autopatrol": "Action to filter for in this log",
        "log-action-filter-protect-protect": "Action to filter for in this log",
        "log-action-filter-protect-modify": "Action to filter for in this log",
        "log-action-filter-protect-unprotect": "Action to filter for in this log",
+       "log-action-filter-protect-move_prot": "Action to filter for in this log",
+       "log-action-filter-rights-rights": "Action to filter for in this log",
+       "log-action-filter-rights-autopromote": "Action to filter for in this log",
+       "log-action-filter-suppress-event": "Action to filter for in this log",
+       "log-action-filter-suppress-revision": "Action to filter for in this log",
+       "log-action-filter-suppress-delete": "Action to filter for in this log",
+       "log-action-filter-suppress-block": "Action to filter for in this log",
+       "log-action-filter-suppress-reblock": "Action to filter for in this log",
        "log-action-filter-upload-upload": "Action to filter for in this log",
        "log-action-filter-upload-overwrite": "Action to filter for in this log"
  }