Siebrand Mazeland [Fri, 9 May 2014 17:56:05 +0000 (19:56 +0200)]
Pass phpcs-strict on includes/upload
Change-Id: I80eaa22398227a4edb7160d560b625102c7436ac
Siebrand Mazeland [Fri, 9 May 2014 14:53:19 +0000 (16:53 +0200)]
Update formatting of includes/upload/
Change-Id: I8cf59cd3bb6dd8de2ed6509b7bc2ef9ff7c5caf1
jenkins-bot [Fri, 9 May 2014 14:19:50 +0000 (14:19 +0000)]
Merge "Add missing variantname messages for Uzbek"
robin [Fri, 9 May 2014 15:28:59 +0000 (17:28 +0200)]
Add missing variantname messages for Uzbek
Related to bug 42420 and bug 42397
Change-Id: If7c35e84e684c6e30438d0708683c15975b475cb
jenkins-bot [Fri, 9 May 2014 13:03:57 +0000 (13:03 +0000)]
Merge "Expose server name in rc feed"
jenkins-bot [Fri, 9 May 2014 11:33:46 +0000 (11:33 +0000)]
Merge "Update OOjs UI to v0.1.0-pre (
7b3672591f)"
jenkins-bot [Fri, 9 May 2014 11:29:31 +0000 (11:29 +0000)]
Merge "Fix Oracle 1.23 missing patches (rebase)"
James D. Forrester [Fri, 9 May 2014 11:27:09 +0000 (13:27 +0200)]
Update OOjs UI to v0.1.0-pre (
7b3672591f)
New changes:
5556abf demo: Make demo console more generic
142bd44 Dialog demos
6f65873 demo/widgets: Bring dev console back
32055e9 Minor refactor of widgets demo
d6b80e7 Watch dot files
7b36725 Localisation updates from https://translatewiki.net.
Change-Id: I1ea5c113b24c1c1a1d853cfda3fccfcfd13140cc
jenkins-bot [Fri, 9 May 2014 10:25:13 +0000 (10:25 +0000)]
Merge "Content: Deprecate and stop using getHighlightHtml()"
jenkins-bot [Fri, 9 May 2014 10:18:09 +0000 (10:18 +0000)]
Merge "Add $wgServerName"
Bartosz Dziewoński [Mon, 5 May 2014 15:59:54 +0000 (17:59 +0200)]
Content: Deprecate and stop using getHighlightHtml()
That function was clearly a bad idea, everyone should just use
getHtml() instead. It was supposed to allow extensions to extend
the content formatting process, but actually doesn't.
A better hook-based solution follows in separate commit I979e2438.
Split off from original I979e2438 and rebased with minor changes
(updated documentation comments, etc.).
Co-Authored-By: daniel <daniel.kinzler@wikimedia.de>
Co-Authored-By: Bartosz Dziewoński <matma.rex@gmail.com>
Change-Id: I76412f9d28bb145fb5975f59e538f6560e50472f
Ori Livneh [Tue, 6 May 2014 01:07:16 +0000 (18:07 -0700)]
Expose server name in rc feed
Reviewers of Id819246a9 (Tim, Timo, Chad) have commented that it
would be preferable to identify wikis by their canonical hostname
rather than the value of $wgDBname. Exposing it here so that
the rcstream server can filter subscriptions by it.
Change-Id: I503a0134a8613daddaae9d8df29a1e27fbfd93bc
Ori Livneh [Tue, 6 May 2014 09:31:24 +0000 (02:31 -0700)]
Add $wgServerName
This partially reverts r73950 which removed $wgServerName on the ground that it
was only used for {{SERVERNAME}}. When it was pointed out that $wgServerName was
also used by several extensions, the response was not to restore the variable, but
to proceed to remove it from extensions as well.
It is a useful variable to have, as the discussion on Id819246a9 makes clear
(see Tim's comment on PS12 and Timo's reply). So let's reintroduce it, and expose
it in mw.config and ApiQuerySiteInfo as well.
Change-Id: I40a6fd427d38c64c628f70a2f407b145443ea204
jenkins-bot [Fri, 9 May 2014 09:13:15 +0000 (09:13 +0000)]
Merge "Add jQuery Migrate"
jenkins-bot [Fri, 9 May 2014 08:49:57 +0000 (08:49 +0000)]
Merge "ResourceLoaderModule: Add @since annotations to new methods"
Brian Wolff [Sun, 27 Oct 2013 20:18:06 +0000 (17:18 -0300)]
Throw an error if calling parser recursively
People accidentally (or sometimes intentionally) calling the
parser recursively has been a major source of bugs over the
years. I think its much better to fail suddenly, instead
of having unclear signs like UNIQ's all over the place.
Change-Id: I0e42aa69835c15a5df7aecb0dc5c3dec946bdf6a
Timo Tijhof [Mon, 5 May 2014 16:33:23 +0000 (18:33 +0200)]
Add jQuery Migrate
We're currently on jQuery v1.8.3. jQuery v1.9 introduces breaking
changes. The jQuery Migrate plugin adds a compatibility layer
that brings back most removed or altered functionality.
It can also be loaded on an older version of jQuery to make use
of the plugins' accessor tracking that helps finding code
that makes use of the deprecated functionality prior to upgrading.
Code:
http://code.jquery.com/jquery-migrate-1.2.1.js
Info:
http://blog.jquery.com/2013/01/15/jquery-1-9-final-jquery-2-0-beta-migrate-final-released/
http://jquery.com/upgrade-guide/1.9/#jquery-migrate-plugin
https://github.com/jquery/jquery-migrate/
> The plugin can be included with versions of jQuery as old as
> 1.6.4 to identify potential upgrade issues via its JQMIGRATE
> console warnings. However, the plugin is only required for
> version 1.9.0 or higher to restore deprecated and removed
> functionality.
Loading it alongside jquery.js should be harmless. However to
benefit performance, I'm only loading it in debug mode.
Plus, there's a small chance that it does actually change
functionality because of the way it is implemented. The plugin
always overloads the methods with compatibility versions, which
should effectively be a no-op on top of old version of jQuery
like ours (one that already has the old functionality), but it
feels too risky at this stage when our only intent is
instrumentation.
Bug: 44740
Change-Id: I468d6b45eae8368fac6af746bbb2ccb702f862ff
Addshore [Thu, 8 May 2014 23:41:01 +0000 (23:41 +0000)]
Merge "Fix CodeSniffer errors and warnings in includes/utils/"
Translation updater bot [Thu, 8 May 2014 20:44:47 +0000 (20:44 +0000)]
Localisation updates from https://translatewiki.net.
Change-Id: I8b8596065dd60b84be5b34be6a2795d97b982da1
Bartosz Dziewoński [Thu, 8 May 2014 20:26:42 +0000 (22:26 +0200)]
ResourceLoaderModule: Add @since annotations to new methods
Change-Id: I91434fcdc87efdf6d49ec94348f26d20c840abad
jenkins-bot [Thu, 8 May 2014 20:03:10 +0000 (20:03 +0000)]
Merge "Fix declaration of ForeignDBFile::delete()"
Siebrand Mazeland [Thu, 8 May 2014 19:15:09 +0000 (21:15 +0200)]
Fix CodeSniffer errors and warnings in includes/utils/
Change-Id: I5e59dd8136fcbd8dc833d7c9f6288656e13df6e9
Faidon Liambotis [Wed, 7 May 2014 17:01:16 +0000 (20:01 +0300)]
img_auth: handle files in the transcoded zone
img_auth.php does not currently handle filepaths for transcoded videos
at all, and instead falls back attempting to open files out of the
public zone, which obviously fails as these files do not exist there.
Add a branch that handles transcoded containers in the same manner as
thumbs and thus allowing access to those files from private wiki.
Bug: 65007
Change-Id: I7182206ba09dd2466fc51aa1d51116dd13db980c
Timo Tijhof [Thu, 8 May 2014 11:03:30 +0000 (13:03 +0200)]
mediawiki.user.test: Remove dated comment about "qunit/index.html"
That file was removed in MediaWiki 1.20.
Change-Id: Iffeb039bbbc6843a83d3796541ebb1773281c01f
Siebrand Mazeland [Wed, 7 May 2014 12:37:59 +0000 (14:37 +0200)]
Fix i18n issue in Special:NewImages
As Rillke has reported in
https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Showhidebots/en
the text for the check box was incorrect. It turned out to be a strange
re-use of messages. Replaced it with a proper message.
No re-uses in core. Remaining re-use outside of core has been taken care of
in I4458ab7f6e53
Change-Id: I48042d0e60ce213db3db123179d9658cdd013a8f
umherirrender [Wed, 7 May 2014 17:42:35 +0000 (19:42 +0200)]
Fix declaration of ForeignDBFile::delete()
Strict Standards: Declaration of ForeignDBFile::delete() should be
compatible with that of LocalFile::delete()
Followed-Up: I60cab27e0708a818c77791cc89194b6dd726da0b
Change-Id: I11d32c0a529ec76978cde38c038b4984ca13e8ba
Siebrand Mazeland [Wed, 7 May 2014 12:16:24 +0000 (14:16 +0200)]
Convert leading spaces to tabs
Change-Id: I416376c861661fdd34ab42675e06c8c43041a978
Translation updater bot [Wed, 7 May 2014 19:53:34 +0000 (19:53 +0000)]
Localisation updates from https://translatewiki.net.
Change-Id: Ie146731bd82d74d95820be5b8fc0df914f7f4abc
jenkins-bot [Wed, 7 May 2014 19:46:25 +0000 (19:46 +0000)]
Merge "mediawiki.page.watch.ajax: Don't use deprecated tooltipAccessKeyRegexp"
Timo Tijhof [Wed, 7 May 2014 17:49:25 +0000 (19:49 +0200)]
mediawiki.page.watch.ajax: Don't use deprecated tooltipAccessKeyRegexp
Remove dependency on 'mediawiki.page.startup' since this is no
longer needed (it was there to ensure mw.util.init, which used to
populate mw.util.tooltipAccessKeyRegexp, ran first).
Change-Id: Iceecc228bce676de84de35220fa4d217be0f0b75
jenkins-bot [Wed, 7 May 2014 13:32:50 +0000 (13:32 +0000)]
Merge "Release notes for Ib5032e4e"
jenkins-bot [Wed, 7 May 2014 12:27:47 +0000 (12:27 +0000)]
Merge "mediawiki.action.edit.editWarning: Reuse jQuery collections"
Derk-Jan Hartman [Tue, 6 May 2014 11:25:57 +0000 (13:25 +0200)]
mediawiki.action.edit.editWarning: Reuse jQuery collections
Change-Id: I3084efe5962bb6a13700f95745c415fb074bc7bd
Bartosz Dziewoński [Wed, 7 May 2014 12:14:07 +0000 (14:14 +0200)]
Release notes for Ib5032e4e
Change-Id: I47899d0a8a6ae01fc71d76b9c913e170e87fa9c1
jenkins-bot [Wed, 7 May 2014 11:46:09 +0000 (11:46 +0000)]
Merge "resourceloader: Report problematic modules in only=styles as well"
Timo Tijhof [Tue, 6 May 2014 23:29:37 +0000 (01:29 +0200)]
mediawiki.toc: Clean up left overs
Follows-up
d7a40c8 which creates the mediawiki.toc module and
moved the tocToggle method from mediawiki.util.
The tocToggle callback used to be a public method and therefore
had two things about that that are obsolete:
* Taking the toggle as parameter.
This is a private method now, and we already have a reference
to the toggle.
* Asserting that the #toc has an <ul>.
There is no need to defer this check this far in, nor to repeat
it on each click. The old code checked it earlier was well, but
we used to repeat the check here as the method was public.
Now that it is a private helper method we can simply return
early before setting it all up in the first place.
Also:
* Removed jsduck-like construction. This file is being indexed,
as part of src/mediawiki/, but turning this into a class seems
odd. It doesn't really have any structure to it.
It's just UI glue. Turned it into an ignored file (no doc blocks).
Change-Id: I21d4f735032b96f00291502e06d9d35a74648143
jenkins-bot [Wed, 7 May 2014 02:38:09 +0000 (02:38 +0000)]
Merge "Clarify docs for wgCookieExpiration"
Matthew Flaschen [Wed, 7 May 2014 02:33:18 +0000 (22:33 -0400)]
Clarify docs for wgCookieExpiration
Change-Id: Ie6c77c5251e906dcee1650b3a4598da6adb30e30
Antoine Musso [Tue, 6 May 2014 19:28:22 +0000 (21:28 +0200)]
API: Expose git branch in siteinfo
For browser testing, I need a reliable way to determine the branch in use
on a target wiki. One could parse the generator name forged when
querying the siteinfo, but that yields:
MediaWiki 1.24alpha instead of master
MediaWiki 1.24wmf2 instead of wmf/1.24wmf2
I am not really willing to reverse engineer the version to figure out
the branch, instead just expose it over the API.
Bug: 62509
Change-Id: If3db8f480ce0d590522741d40fb8e43b753efb41
Fomafix [Tue, 6 May 2014 20:08:46 +0000 (20:08 +0000)]
mediawiki.toc: Hide toc without animation in initial collapsed state
Bug: 64927
Change-Id: I5b46390b3dc6e42031f636119673892507151f54
jenkins-bot [Tue, 6 May 2014 21:20:21 +0000 (21:20 +0000)]
Merge "Pass $user to LocalFileDeleteBatch"
jenkins-bot [Tue, 6 May 2014 20:32:48 +0000 (20:32 +0000)]
Merge "Make gallery properties publically accessible."
Translation updater bot [Tue, 6 May 2014 20:03:57 +0000 (20:03 +0000)]
Merge "Localisation updates from https://translatewiki.net."
Translation updater bot [Tue, 6 May 2014 19:51:14 +0000 (19:51 +0000)]
Localisation updates from https://translatewiki.net.
Change-Id: Ieca93135f7af56bc2079362cc763e7204a8024cb
umherirrender [Tue, 6 May 2014 19:03:45 +0000 (21:03 +0200)]
Pass $user to LocalFileDeleteBatch
This avoids the use of $wgUser
Change-Id: I60cab27e0708a818c77791cc89194b6dd726da0b
Bryan Davis [Tue, 6 May 2014 19:15:09 +0000 (13:15 -0600)]
Check for valid git repository in GitInfo::getHeadCommitDate
Ensure that GitInfo::getHead returns a valid value before attempting to
use the git binary to extract a commit date.
Bug: 64948
Change-Id: Ib0d245306842706dbb5d4b9522bb381a5f55526c
jenkins-bot [Tue, 6 May 2014 19:04:05 +0000 (19:04 +0000)]
Merge "Fix typo for system message name"
Chad Horohoe [Tue, 6 May 2014 16:04:28 +0000 (16:04 +0000)]
Merge "SpecialSearch: Get title from one we already have on hand in the context"
withoutaname [Sun, 27 Apr 2014 21:11:07 +0000 (14:11 -0700)]
Fix typo for system message name
Change-Id: Ic23f71ab9f6018152f89f35a944c9daae9f94970
jenkins-bot [Tue, 6 May 2014 13:04:41 +0000 (13:04 +0000)]
Merge "Add version comments for 1.24 to all updaters"
jenkins-bot [Tue, 6 May 2014 13:03:42 +0000 (13:03 +0000)]
Merge "Special:BookSources: Remove link to PriceSCAN"
jenkins-bot [Tue, 6 May 2014 12:18:59 +0000 (12:18 +0000)]
Merge "Fix missing import in mediawiki.ui"
jenkins-bot [Tue, 6 May 2014 10:24:29 +0000 (10:24 +0000)]
Merge "resourceloader: Use $.ajax instead of duplicating its "script" logic"
jenkins-bot [Tue, 6 May 2014 10:18:51 +0000 (10:18 +0000)]
Merge "Move profile In/OUT call out of MWPHPUnitCommand"
jenkins-bot [Tue, 6 May 2014 10:16:26 +0000 (10:16 +0000)]
Merge "mediawiki.util: Clean up mw.util.$content"
Timo Tijhof [Wed, 30 Apr 2014 14:40:06 +0000 (16:40 +0200)]
resourceloader: Use $.ajax instead of duplicating its "script" logic
Also removed isFunction check. This is an internal method and the
parameter is either a function or omitted/nulled. No need for aggressive
validation.
Change-Id: I6bbd82ca1b986b45a2f4653427396b9a6fceb6e8
jenkins-bot [Tue, 6 May 2014 10:13:59 +0000 (10:13 +0000)]
Merge "Move teardownTestDB and wfLogProfilingData out of MWPHPUnitCommand"
Timo Tijhof [Wed, 30 Apr 2014 18:33:15 +0000 (20:33 +0200)]
mediawiki.util: Clean up mw.util.$content
* Document how to use it (including the tricky bit with it needing
a dependency on mediawiki.page.startup).
* Refer to mw.hook and #mw-content-text as recommended method of
getting just the wikipage content.
* Remove the deprecated backwards-compatibility selectors.
The core skins (Vector, Monobook, Modern, CologneBlue) all
have mw-body now. Third-party skins should adopt those if they
haven't already.
Change-Id: I30bdd893e0a0a340076efa7ce32fbd4b775bc3db
jenkins-bot [Tue, 6 May 2014 10:00:16 +0000 (10:00 +0000)]
Merge "Remove includepath stuff from MediaWikiPHPUnitCommand"
Gilles Dubuc [Tue, 6 May 2014 09:11:37 +0000 (11:11 +0200)]
Fix missing import in mediawiki.ui
The .box-sizing() LESS function was moved in:
https://gerrit.wikimedia.org/r/#/c/127843/
And the usage in forms.less wasn't finding it anymore.
Change-Id: I7ae97bd5d4aa113af039182ff39817926bbbf3ed
Timo Tijhof [Tue, 6 May 2014 00:40:51 +0000 (02:40 +0200)]
Vector: Don't supress focus outline on watch star
This is an old remnant that was intended to remove outline from
images inside anchor links. However the watch star is no longer
implemented this way and this is doing nothing. Except when
the element is focussed (using keyboard tab index), then this
rule is overriding the default :focus and causing the user to
potentially get confused since it is no longer clear where the
focus has gone to.
Bug: 64934
Change-Id: I57ee089c1ae18bb7a6c55ae17eab3a06f9e1f7d2
Bryan Davis [Mon, 28 Apr 2014 19:50:03 +0000 (13:50 -0600)]
Support precomputed data in GitInfo
Support reading git repository information from a JSON file in the cache
directory. When present, this file serves to provide information needed
by getHead, getHeadSHA1, getHeadCommitDate, getCurrentBranch and a new
getRemoteUrl method. A GitInfo::precomputeValues method is also provided
which can generate the cache file for a given GitInfo instance.
This support can be combined with a deployment step to reduce the need
to repeatedly gather information from the .git files/git binary. It also
allows computing information that can be lost when directory structures
differ between deployment staging hosts and hosts running MediaWiki.
This change also adds memoization of computed values for a given GitInfo
instance which may provide a small performance boost even for
deployments which are not using precomputed cache files.
Bug: 53972
Change-Id: I66e058acc5a71e5d82644f85d819f49d6ee9d1e6
jenkins-bot [Mon, 5 May 2014 23:41:47 +0000 (23:41 +0000)]
Merge "mediawiki.mixins: Move .box-sizing mixin from mediawiki.ui utilities"
jenkins-bot [Mon, 5 May 2014 23:22:04 +0000 (23:22 +0000)]
Merge "Don't call legalSearchChars() statically so it can properly inherit"
Chad Horohoe [Mon, 5 May 2014 16:26:40 +0000 (09:26 -0700)]
SpecialSearch: Get title from one we already have on hand in the context
Change-Id: Id7e761ad4882ec5c5f9324644eca143b727b0ad9
Jeff [Wed, 23 Apr 2014 06:56:23 +0000 (23:56 -0700)]
PostgreSQL: decode image.img_metadata
The img_metadata field was not being decoded from bytea into text.
This change to core fixes the reported problem with PdfHandler against
1.22.6, origin/REL1_23 and git head.
Bug: 59147
Change-Id: I285a317a57a29713af1f7f630b340278bd5400da
jenkins-bot [Mon, 5 May 2014 22:51:17 +0000 (22:51 +0000)]
Merge "PostgreSQL: Make l10n_cache.lc_value binary"
Timo Tijhof [Sun, 4 May 2014 14:46:16 +0000 (16:46 +0200)]
resourceloader: Report problematic modules in only=styles as well
Similar to how we do with other exceptions that we don't log on
the server but want a client to be able to debug, report modules
that were not included in the response.
Especially when debugging a load.php?only=styles request that
contains lots of different modules., there was no way of knowing
certain modules were excluded (e.g. because they aren't
registered), other than to try and remove them from the request
one by one until you're left with non-zero modules in the request
and an empty string as response body.
This change prepends a comment like the following to the response.
/*
Problematic modules: {
"foo": "missing"
}
*/
Bug: 64826
Change-Id: If5136c60ff7168dac5d6cdebd487824767c0ec16
jenkins-bot [Mon, 5 May 2014 21:21:28 +0000 (21:21 +0000)]
Merge "Update OOjs UI to v0.1.0-pre (
7d2507b267)"
James D. Forrester [Mon, 5 May 2014 21:13:21 +0000 (14:13 -0700)]
Update OOjs UI to v0.1.0-pre (
7d2507b267)
New changes:
9ccab2d Use .isDisabled() instead of .disabled to support inheriting
8f2a439 Localisation updates from https://translatewiki.net.
5f49c04 Remove unnecessary space in footless dialog
11dde77 Make autoFocus default to true
Change-Id: I9ae775a7c2a167d66542436ebd21064d8d254cc4
jrobson [Tue, 29 Apr 2014 22:42:43 +0000 (15:42 -0700)]
mediawiki.api: Fix API postWithToken method
Referred to "this" instead of "api" ("this" here refers to the Deferred object).
Fixes "Uncaught TypeError: Cannot read property 'ajax' of undefined".
Change-Id: I78ba47a614512f6218e23d03e7c688e2c9efbe45
Chad Horohoe [Mon, 5 May 2014 20:33:22 +0000 (13:33 -0700)]
Don't call legalSearchChars() statically so it can properly inherit
Change-Id: Iaabc10ce2905eefe9de8bceeec3290082ba9eb2e
Aaron Schulz [Mon, 5 May 2014 18:43:21 +0000 (11:43 -0700)]
Set Redis::OPT_READ_TIMEOUT by default
* The value is also configurable just like connectTimeout
* This deals with problems like https://github.com/nicolasff/phpredis/issues/99
and https://github.com/nicolasff/phpredis/issues/70
Change-Id: I05e91e05764020854d04673b7decae30359f57e9
Translation updater bot [Mon, 5 May 2014 20:12:09 +0000 (20:12 +0000)]
Localisation updates from https://translatewiki.net.
Change-Id: I72e85ae5bf1ff819f8ee6e1a7d89c7828b940379
jenkins-bot [Mon, 5 May 2014 19:53:21 +0000 (19:53 +0000)]
Merge "Avoid raw sql in LocalFileDeleteBatch::doDBInserts"
jenkins-bot [Mon, 5 May 2014 19:52:20 +0000 (19:52 +0000)]
Merge "Fix doc for Revision::newFromPageId"
Marius Hoch [Mon, 5 May 2014 19:45:53 +0000 (21:45 +0200)]
Fix doc for Revision::newFromPageId
Change-Id: Ice5b7f42facd30f856f06c1bc1f4408d61a4121d
jenkins-bot [Mon, 5 May 2014 19:35:36 +0000 (19:35 +0000)]
Merge "Maintain remember me state on password change"
umherirrender [Mon, 5 May 2014 19:28:32 +0000 (21:28 +0200)]
Avoid raw sql in LocalFileDeleteBatch::doDBInserts
Use Database::conditional instead of raw sql.
Change-Id: Ic00146e9ec582a263b9dec117b12532fdc24789e
jenkins-bot [Mon, 5 May 2014 18:54:08 +0000 (18:54 +0000)]
Merge "TextContent: Document parameters to convert()"
umherirrender [Sat, 26 Apr 2014 17:03:29 +0000 (19:03 +0200)]
Add version comments for 1.24 to all updaters
pp_sortkey was added with I217c42656fb877ff35a36eb446a22bdaf119faac,
which is part of 1.24, so adding the comment before that.
Change-Id: I7b970705ad7de75cb9542f8a5a963697386940a7
jenkins-bot [Mon, 5 May 2014 18:25:07 +0000 (18:25 +0000)]
Merge "Removed unused getZoneHandlerUrl() method"
Jeff Janes [Mon, 5 May 2014 18:20:52 +0000 (11:20 -0700)]
PostgreSQL: Make l10n_cache.lc_value binary
Change-Id I427c6de5a0a29b43cff755db0eb8a750db620173 increases the
probability that a null byte will attempt to be stored in the
lc_value column. PostgreSQL does not allow that byte in a text
column, so convert the column to bytea.
If the column already contains corrupted data, the upgrade routine
might fail. To prevent this, delete the contents of the table before
changing the type.
Bug: 62098
Change-Id: Ie8368bde398b2ae4d3cfc9ee7bf35874bd2ded68
jenkins-bot [Mon, 5 May 2014 17:53:54 +0000 (17:53 +0000)]
Merge "PostgreSQL: Fix syntax error in page_props index"
Jeff Janes [Tue, 29 Apr 2014 18:11:58 +0000 (11:11 -0700)]
PostgreSQL: Fix syntax error in page_props index
Follows up I217c42656fb877ff35a36eb446a22bdaf119faac
That change introduced a syntax error during update. I have verified
that this fixes the syntax problem so that update.php runs, but have
not verified that the new functionality behaves as intended.
Also, the PostgreSQL schema changes introduced during the update
process were not present at all in a fresh install to PostgreSQL. Add
analogous changes to tables.sql.
Bug: 64807
Change-Id: I736344839ec478216402fdfe260968afbd663498
jenkins-bot [Mon, 5 May 2014 16:44:23 +0000 (16:44 +0000)]
Merge "API: Check return value from $gitInfo->getHeadCommitDate()"
daniel [Mon, 5 May 2014 16:04:43 +0000 (18:04 +0200)]
TextContent: Document parameters to convert()
Mostly extracted from I979e2438.
Change-Id: I764aae970a2ad90a54aa9816d81070d0899fd10a
jenkins-bot [Mon, 5 May 2014 15:13:07 +0000 (15:13 +0000)]
Merge "Documentation cleanup in Content-related files"
Bartosz Dziewoński [Mon, 5 May 2014 15:04:10 +0000 (17:04 +0200)]
Documentation cleanup in Content-related files
Mostly extracted from I979e2438.
Change-Id: I6562d111c15425957eaaad31ded175811d7abf1c
Brad Jorsch [Mon, 5 May 2014 14:23:30 +0000 (10:23 -0400)]
API: Check return value from $gitInfo->getHeadCommitDate()
action=query&meta=siteinfo&siprop=extensions calls
$gitInfo->getHeadCommitDate() to attempt to find the commit date, but
does not check whether that function returned false before using the
value. This resulted in displaying the current date for "vcs-date" when
the function failed.
Bug: 64821
Change-Id: Ic39a74abe5160b3b7fbfb7c15323328d6b317560
addshore [Mon, 5 May 2014 12:53:26 +0000 (13:53 +0100)]
Move profile In/OUT call out of MWPHPUnitCommand
Change-Id: I710fddc20e88745c9091432dff87b5e361c1f71a
addshore [Mon, 5 May 2014 12:43:00 +0000 (13:43 +0100)]
Move teardownTestDB and wfLogProfilingData out of MWPHPUnitCommand
Change-Id: Ic175c1457e7f76a2b5232a2b5d3563c5982cfee2
jenkins-bot [Mon, 5 May 2014 12:25:49 +0000 (12:25 +0000)]
Merge "Remove color opt setting from MediaWikiPHPUnitCommand"
addshore [Mon, 5 May 2014 12:17:22 +0000 (13:17 +0100)]
Remove includepath stuff from MediaWikiPHPUnitCommand
Change-Id: I949c1ca350a28c606fba7406e9904e836e596b49
addshore [Mon, 5 May 2014 11:39:40 +0000 (12:39 +0100)]
Remove color opt setting from MediaWikiPHPUnitCommand
Change-Id: I08d3b53f80520452aef3fcf2017747406a38664d
jenkins-bot [Mon, 5 May 2014 11:25:13 +0000 (11:25 +0000)]
Merge "Vector: Restore collapsibleNav design improvements"
jenkins-bot [Mon, 5 May 2014 09:23:25 +0000 (09:23 +0000)]
Merge "Fix typos in WikitextContent.php"
jenkins-bot [Mon, 5 May 2014 06:38:40 +0000 (06:38 +0000)]
Merge "Return $wgSitename as displayname for local repo in filerepoinfo API"
withoutaname [Mon, 5 May 2014 05:17:11 +0000 (22:17 -0700)]
Fix typos in WikitextContent.php
Fix typos in documentation for
/core/includes/content/WikitextContent.php
Change-Id: Idc0d4d9101309cea858473c86a4b12cf6e5f5ee4
Timo Tijhof [Sun, 4 May 2014 20:10:33 +0000 (22:10 +0200)]
Vector: Restore collapsibleNav design improvements
Follows-up
db13c65 and
c3d544412, which removed the
collapsibleNav module. However it also undid various design
changes that really should not have been part of the
collapsibleNav module but were significant, I've restored those.
Basically, this merges the old collapsibleNav.less into
navigation.less. I won't list all chnages, but here's a few:
* Increase spacing between heading and side of portal (via margin and
padding on the portal, not on the heading itself).
The headings were almost against the browser edge.
* Change color of heading slightly (#4d4d4d instead of #444).
* Move separator line from below each heading to between sidebar
sections.
* Change spacing between list items from 0.5 on the bottom to
0.25em on top and bottom (effectively the same, except aligns
the first and last item better in relation to the heading and
the separator line).
* (js-only enhancement) Mark first section with class "first",
and remove the separator line, heading and offset from that one.
Also:
* Clean up 'h3' padding/margin situation.
They were inheriting 0.3em of bottom margin from the global
'h3' selector for content. This was a bit of a fragile
dependency and was just a coincidence. Reset the margin against
the global selector and added it to the local padding instead.
No visual change.
* Remove unused less variables.
Change-Id: I979179a82c1de9b1b7d66310ebd5daf8e6aa1802