Commit graph

55526 commits

Author SHA1 Message Date
Aaron Schulz
c6a7a3a9ed 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
2014-05-05 20:25:09 +00:00
Translation updater bot
12ba77be1c Localisation updates from https://translatewiki.net.
Change-Id: I72e85ae5bf1ff819f8ee6e1a7d89c7828b940379
2014-05-05 20:12:09 +00:00
jenkins-bot
33bc31488d Merge "Avoid raw sql in LocalFileDeleteBatch::doDBInserts" 2014-05-05 19:53:21 +00:00
jenkins-bot
e441caba01 Merge "Fix doc for Revision::newFromPageId" 2014-05-05 19:52:20 +00:00
Marius Hoch
92c4dffd55 Fix doc for Revision::newFromPageId
Change-Id: Ice5b7f42facd30f856f06c1bc1f4408d61a4121d
2014-05-05 21:45:53 +02:00
jenkins-bot
c6773e26ea Merge "Maintain remember me state on password change" 2014-05-05 19:35:36 +00:00
umherirrender
3cca294d75 Avoid raw sql in LocalFileDeleteBatch::doDBInserts
Use Database::conditional instead of raw sql.

Change-Id: Ic00146e9ec582a263b9dec117b12532fdc24789e
2014-05-05 21:28:32 +02:00
jenkins-bot
2b4ac9e6f1 Merge "TextContent: Document parameters to convert()" 2014-05-05 18:54:08 +00:00
jenkins-bot
6bbc1064f2 Merge "Removed unused getZoneHandlerUrl() method" 2014-05-05 18:25:07 +00:00
jenkins-bot
e6dd1aa418 Merge "PostgreSQL: Fix syntax error in page_props index" 2014-05-05 17:53:54 +00:00
Jeff Janes
3fcfced5ad 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
2014-05-05 10:14:02 -07:00
jenkins-bot
22e045ab12 Merge "API: Check return value from $gitInfo->getHeadCommitDate()" 2014-05-05 16:44:23 +00:00
daniel
12f4689cc8 TextContent: Document parameters to convert()
Mostly extracted from I979e2438.

Change-Id: I764aae970a2ad90a54aa9816d81070d0899fd10a
2014-05-05 18:27:35 +02:00
jenkins-bot
50297e20f4 Merge "Documentation cleanup in Content-related files" 2014-05-05 15:13:07 +00:00
Bartosz Dziewoński
c3f7f91705 Documentation cleanup in Content-related files
Mostly extracted from I979e2438.

Change-Id: I6562d111c15425957eaaad31ded175811d7abf1c
2014-05-05 17:04:10 +02:00
Brad Jorsch
986d3ef2c1 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
2014-05-05 10:23:30 -04:00
jenkins-bot
9b15c15c32 Merge "Remove color opt setting from MediaWikiPHPUnitCommand" 2014-05-05 12:25:49 +00:00
addshore
fefc843bd7 Remove color opt setting from MediaWikiPHPUnitCommand
Change-Id: I08d3b53f80520452aef3fcf2017747406a38664d
2014-05-05 13:09:56 +01:00
jenkins-bot
93ed211c7e Merge "Vector: Restore collapsibleNav design improvements" 2014-05-05 11:25:13 +00:00
jenkins-bot
d0d4a9227c Merge "Fix typos in WikitextContent.php" 2014-05-05 09:23:25 +00:00
jenkins-bot
c0cdf0e911 Merge "Return $wgSitename as displayname for local repo in filerepoinfo API" 2014-05-05 06:38:40 +00:00
withoutaname
652fdc09b7 Fix typos in WikitextContent.php
Fix typos in documentation for
/core/includes/content/WikitextContent.php

Change-Id: Idc0d4d9101309cea858473c86a4b12cf6e5f5ee4
2014-05-04 22:17:52 -07:00
Timo Tijhof
761cd66744 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
2014-05-04 20:13:46 +00:00
Translation updater bot
39aa51bfbe Localisation updates from https://translatewiki.net.
Change-Id: I3cfce4dbbfe6c17713ad4d824d2514feb9e2fb67
2014-05-04 20:05:50 +00:00
Timo Tijhof
c3d5444126 Vector: Remove unused collapsibleNav.less
Follows-up db13c65.

Change-Id: I5fbfe4df5a7b7b3df8a295957eb8db1f2363014e
2014-05-04 19:54:56 +02:00
rillke
4ffb4cf0b0 mediawiki.api: Don't apply file extension stripping to category names
`mw.Title#getNameText()` strips anything following a dot (.), assuming
it's a file name (which doesn't make sense for category names).

C.f. https://doc.wikimedia.org/mediawiki-core/master/js/#!/api/mw.Title-method-getMainText

This causes some trouble in UploadWizard's category-suggestion system.

This bug has been there since the very first version (cb0cf72eba)
which, ironically, was specifically written for UploadWizard.

Bug: 64764
Change-Id: I2925e1050215272cdf03c8c6b1de6ba79348f6a5
2014-05-04 16:01:30 +02:00
Timo Tijhof
9db61c9ab5 JSDuck-ify /resources/mediawiki.special/*
- Adds mw.special.recentchanges to the index.
- Adds mw.special.upload to the index.
- Register File as valid value type. Relates to the
  "File" interface (from HTML5 File APIs; http://dev.w3.org/2006/webapi/FileAPI/#dfn-file)
- Sort directories in jsduck/config.json alphabetically.

Change-Id: I282cbeeec60b9f527879aedd90ba824a833438b7
2014-05-03 21:16:18 -07:00
jenkins-bot
1080837570 Merge "mwjsduck-gen: Abort early and report exit code" 2014-05-04 02:44:55 +00:00
jenkins-bot
51a6d0676b Merge "Revert "jquery.textSelection: Remove hardcoded checks for removed WikiEditor iframe mode"" 2014-05-04 02:39:01 +00:00
Alex Monk
3c65da7e73 Revert "jquery.textSelection: Remove hardcoded checks for removed WikiEditor iframe mode"
Appears to have broken CodeEditor

This reverts commit c40b6fa9b0.

Change-Id: I6d04cb91527defe1fdb0d7fb2a324fe1417a89f7
2014-05-04 02:24:33 +00:00
Federico Leva
db13c65237 Remove collapsibleNav: performance cost too high
Appears to be unused by any extension in gerrit.

Bug: 39035
Change-Id: I220057c799bef7e8c4d964f47d56f61ec120d8c2
2014-05-04 00:59:24 +00:00
jenkins-bot
b4fc677524 Merge "Add action-history" 2014-05-04 00:54:45 +00:00
Ocean behind ears
0b597664a4 Add action-history
Bug: 48619
Change-Id: Iac95e401e6d9b3e67512c512221557d3b9b7a5bf
2014-05-03 20:48:11 -04:00
jenkins-bot
0de509b756 Merge "Improve in-line documentation of $wgUrlProtocols; add 'redis://'" 2014-05-03 22:04:36 +00:00
Ori Livneh
62b1fbd5f4 Improve in-line documentation of $wgUrlProtocols; add 'redis://'
* RedisPubSubFeedEngine uses 'redis://' URLs. So does redis-py and many other
  client libraries. It should be recognized by MediaWiki. So add it.
* Remove in-line comments justifying each individual URL scheme.
  DefaultSettings.php is long enough; it doesn't need to moonlight as
  the annals of the history of MediaWiki development.
* Make the documentation of $wgUrlProtocols a bit more useful.

Change-Id: I4c2de67cc4e243659b0bed674e0ccd48221c57f3
2014-05-03 14:55:04 -07:00
Timo Tijhof
1361523f69 mwjsduck-gen: Abort early and report exit code
This bash script is supposed to abort early with a non-zero
exit code if the jsduck test found any errors or warnings.

Change-Id: I2ae0976be866519dd9f41f4c02d78d300a494328
2014-05-03 20:47:18 +00:00
Translation updater bot
50efc7adc5 Localisation updates from https://translatewiki.net.
Change-Id: I5b35bd80d643c943aeb9a608b3299fd7d45cbf00
2014-05-03 19:57:04 +00:00
Gergő Tisza
277ecacff2 Return $wgSitename as displayname for local repo in filerepoinfo API
displayname is used in user interface texts to tell the user what
is the source of a file so returning null does not make sense
here.

Bug: 64800
Change-Id: Iafbc1a8e63b512d1515215fa1295e5b7434f1861
2014-05-03 18:37:06 +00:00
Ori Livneh
1f3f032f2a JSON RC format: cast 'patrolled' and 'minor' to boolean
This makes them consistent with 'bot'.

Change-Id: Id4342eedee8176b0b76458bdaf8ca69c89857d47
2014-05-03 11:30:05 -07:00
jenkins-bot
ae318c1fc4 Merge "Use an actual URL for helppage in enotif_body" 2014-05-03 16:00:59 +00:00
Federico Leva
dccbb7b402 Use an actual URL for helppage in enotif_body
The helppage can be a full URL, which canonicalurl doesn't like.

This means that if a wiki
* has a custom enotif_body which uses canonicalurl + helppage, but
* doesn't have helppage defined locally (as local/interwiki title),
then it will still have to fix either of the two locally.

Bug: 63269
Change-Id: I82d26b648ef23b69ae4fbd0a74ffa23eb7a93dae
2014-05-03 15:38:19 +02:00
jenkins-bot
810a29e73c Merge "Check for the namespace correctly in Special:Allmessages" 2014-05-03 08:33:09 +00:00
Aaron Schulz
5d286fad03 Added missing File::RENDER_NOW flag to thumb.php
Change-Id: I5f05b09272ebcad5cf8409af7ad61d9e9004a2f0
2014-05-02 16:33:14 -07:00
Aaron Schulz
f98ecde834 Removed unused getZoneHandlerUrl() method
* This was not terribly well conceived and is not used by anything.

Change-Id: Icb03477e2b33621949fab7c39fd06e28ac0777fc
2014-05-02 15:22:46 -07:00
csteipp
1f7038363f Maintain remember me state on password change
Fix regression from https://gerrit.wikimedia.org/r/#/c/94614/

Ensure that when users login with "remember me" selected, they get a
new remember me token after changing their password.

Change-Id: Ibbf0d823bd5ef5304bf6ad1b67966d18dfb3580c
2014-05-02 15:11:02 -07:00
jenkins-bot
c203dbda18 Merge "Update OOjs UI to v0.1.0-pre (9a6c625f5f)" 2014-05-02 21:57:37 +00:00
jenkins-bot
773882adbf Merge "Update OOjs UI to v0.1.0-pre (e6edd86d37)" 2014-05-02 21:57:35 +00:00
Translation updater bot
c8bf15eaf7 Merge "Localisation updates from https://translatewiki.net." 2014-05-02 20:12:29 +00:00
Translation updater bot
f2b516d2be Localisation updates from https://translatewiki.net.
Change-Id: I65fccf05eac621d55e6404631359d5add9499b1f
2014-05-02 19:47:25 +00:00
Timo Tijhof
1b658bf072 Restore mediawiki.toc dependency on mediawiki.util
Follows-up If0438b7b6f4649, which broken the toc toggle module
since it was no longer part of a global module (mediawiki.util)
but only added to individual pages by the parser.

While that is a superior load mechanism, it broke existing pages
due to parser cache. Not the general html cache for logged-out
users but the main parser cache, which affects logged-in users
as well.

Bug: 64765
Change-Id: Ia12998fb11c686e1cc965578f7beb31c79b1b12c
2014-05-02 21:45:44 +02:00