Demon [Mon, 2 Apr 2012 15:22:21 +0000 (15:22 +0000)]
Merge "anchor to jump to editform when previewing changes"
Antoine Musso [Mon, 2 Apr 2012 13:33:43 +0000 (15:33 +0200)]
Regroup all API tests in the 'API' PHPUnit group
That will let us tests all the API tests by using PHPUnit group
filtering such as:
php phpunit.php --group API
Also cleaned some whitespaces
Patchset-4: skipped files that had only whitespace changes
Change-Id: I51e03d910521b061f505e3a9b11a08c7b95f1538
Amir E. Aharoni [Sat, 31 Mar 2012 08:17:44 +0000 (11:17 +0300)]
Adding .*.swp, vi temporary files, to .gitignore.
Change-Id: Ia5ca3b8a20de1ba7cb0fec3826138f82dbc578cf
Aaron Schulz [Sun, 1 Apr 2012 02:08:00 +0000 (02:08 +0000)]
Merge "(bug 18062) new message when edit or create the local page of a shared file"
Platonides [Sat, 31 Mar 2012 22:13:59 +0000 (00:13 +0200)]
Add an independent entry of the 5.0.2 mysql bump.
Follow up r104437
Change-Id: I20d64ed20d1ecf73ad5712819ee0d5a8a3f6c111
Aaron Schulz [Sat, 31 Mar 2012 21:28:48 +0000 (21:28 +0000)]
Merge "(bug 34334) add a footer to Special:Contributions for newbie mode"
Hashar [Sat, 31 Mar 2012 18:50:34 +0000 (18:50 +0000)]
Merge ".gitignore for generated html doc"
Christian Aistleitner [Sat, 31 Mar 2012 18:16:05 +0000 (20:16 +0200)]
.gitignore for generated html doc
Change-Id: I38c66fe3a219d36d935da9a1c31ac3182bb2dbd9
umherirrender [Sat, 31 Mar 2012 14:17:10 +0000 (16:17 +0200)]
(bug 18062) new message when edit or create the local page of a shared
file
Change-Id: I2b7f76bd759b815a87b306fd97a97097b4731f8d
Amir E. Aharoni [Sat, 31 Mar 2012 10:19:37 +0000 (13:19 +0300)]
Adding getDirMarkEntity().
This function is similar to getDirMark(), but it adds HTML entities
instead of invisible Unicode characters.
It's based on MaxSem's suggestion in
https://gerrit.wikimedia.org/r/#change,3929
Change-Id: I5bd362d6e6a56478bf9f58b2b81fcad31be12d35
Umherirrender [Fri, 30 Mar 2012 18:15:58 +0000 (20:15 +0200)]
(bug 34334) add a footer to Special:Contributions for newbie mode
Also rewrote logic that select the footer message so it is easier to
follow.
Change-Id: I8dbf445acc2246cda96a653a35523cbd988834b8
Reedy [Sat, 31 Mar 2012 01:14:23 +0000 (01:14 +0000)]
Merge "Stop PHP notices fouling up XML, when exporting all pages"
Reedy [Sat, 31 Mar 2012 01:11:09 +0000 (01:11 +0000)]
Merge "Avoid doubling dump output"
Christian Aistleitner [Fri, 30 Mar 2012 21:01:06 +0000 (23:01 +0200)]
Stop PHP notices fouling up XML, when exporting all pages
Change-Id: I330fd34daeb2ad82d8d8a63b0ef2cb11f52f1170
Demon [Fri, 30 Mar 2012 20:42:53 +0000 (20:42 +0000)]
Merge "Removed unused saveTempUploadedFile() function"
Demon [Fri, 30 Mar 2012 20:38:36 +0000 (20:38 +0000)]
Merge "* (bug 35567) The whole password reminder e-mail is now sent in the same language"
Christian Aistleitner [Fri, 30 Mar 2012 20:27:43 +0000 (22:27 +0200)]
Avoid doubling dump output
Change-Id: Ied8b8730cf1cd4a77346fbcae9013c9b6493dc8f
mrbluesky [Fri, 30 Mar 2012 20:00:25 +0000 (22:00 +0200)]
(bug 30963): Follow-up to change I335c54f3: update messages.inc
Change-Id: I985d582e9c228d72ffdbbc7d459df3df46a9fdc8
Alexandre Emsenhuber [Fri, 30 Mar 2012 17:43:07 +0000 (19:43 +0200)]
* (bug 35567) The whole password reminder e-mail is now sent in the same language
Change-Id: Id57c916388edfd1347bedde28af872c81301f99e
Erik Moeller [Fri, 30 Mar 2012 07:18:18 +0000 (00:18 -0700)]
anchor to jump to editform when previewing changes
Provide a handy link back to the edit form from the preview warning.
Tiny UX/accessibility improvement copied from German Wikipedia,
hopefully uncontroversial. :-)
Change-Id: Ieba9b640bca719e8eedd7c204f3516700dcf15fe
Aaron Schulz [Fri, 30 Mar 2012 01:54:26 +0000 (18:54 -0700)]
Removed unused saveTempUploadedFile() function
Change-Id: I262936a2a68b745f6fb3235a21652a4ad3737e39
Aaron Schulz [Thu, 29 Mar 2012 23:31:39 +0000 (16:31 -0700)]
Added user Id sanity check to setUsernameBitfields() for bug 34755.
Change-Id: I44288d199d86045151f8184f7abaa3df886d9d99
Platonides [Thu, 29 Mar 2012 22:06:58 +0000 (00:06 +0200)]
Unneeded globals after
e2ee009e5 (aka. r114233)
Change-Id: I2ee0f3946e2b584db9952926900d425b8af1dd3b
Amir E. Aharoni [Thu, 29 Mar 2012 20:01:20 +0000 (22:01 +0200)]
Added *.kate-swp to .gitignore.
These are temporary files created by Kate, a popular text editor in KDE.
Change-Id: I72e3eca752940e864c257a23014e335f4d181f4a
Aaron Schulz [Thu, 29 Mar 2012 15:55:11 +0000 (15:55 +0000)]
Merge "Bug 35583 - GitInfo::isSHA1 returns true for non-sha1 values"
Reedy [Thu, 29 Mar 2012 14:54:41 +0000 (14:54 +0000)]
Merge "Use local context to get messages"
Reedy [Thu, 29 Mar 2012 14:38:36 +0000 (15:38 +0100)]
Bug 35583 - GitInfo::isSHA1 returns true for non-sha1 values
Patch by Alexis
Change-Id: I6c69d017d2d6ad1237b0c34ffa8a7ae5fb518178
Alexandre Emsenhuber [Wed, 28 Mar 2012 18:42:03 +0000 (20:42 +0200)]
Refactor Profiler to get the actual and initial time:
* Added $metric parameter to Profiler::getTime() and
Profiler::getInitialTime() so that the time calculating method can be
easily overriden
* Added 'cpu' time metric (for ProfilerSimple)
* Made Profiler::getInitialTime() protected so that it can be used by
ProfilerSimple and ProfilerSimpleTrace
Change-Id: I12d1bcb43ec179396a3f8ed46ba4128412e2f65b
Alexandre Emsenhuber [Thu, 29 Mar 2012 08:57:00 +0000 (10:57 +0200)]
Use local context to get messages
Change-Id: I9bad983b6deffa1f79770663010252730d1b1eb5
Aaron Schulz [Thu, 29 Mar 2012 06:05:38 +0000 (06:05 +0000)]
Merge "(bug 30963) Option to hide redirects in Allpages and Prefixindex"
Aaron Schulz [Thu, 29 Mar 2012 05:32:38 +0000 (05:32 +0000)]
Merge "(bug 33689) Fix incomplete query on constraints"
Aaron Schulz [Thu, 29 Mar 2012 05:02:34 +0000 (05:02 +0000)]
Merge "Show the git revision and git branch in the debug toolbar if available."
Aaron Schulz [Thu, 29 Mar 2012 05:00:25 +0000 (05:00 +0000)]
Merge "Avoid setting multiple Content-Type headers."
Max Semenik [Wed, 28 Mar 2012 22:39:32 +0000 (02:39 +0400)]
(bug 35565) Special:Log/patrol doesn't indicate whether patrolling was automatic
Change-Id: Ia4d9ffcfda719fd94ac5e01f0e35c4c5823d7d72
saper [Wed, 28 Mar 2012 21:23:13 +0000 (23:23 +0200)]
(bug 33689) Fix incomplete query on constraints
Upgrade to 1.19 on Postgres fails due to incomplete query when trying to
defer foreign key for externallinks
* FieldInfo::conname() should return NULL not "" when constraint
is not present
* Re-create missing constraint on schema update
Change-Id: I7ca351e07d228afdf4a5c3bef365f42a27c9ac45
mrbluesky [Wed, 28 Mar 2012 20:28:31 +0000 (22:28 +0200)]
(bug 30963) Option to hide redirects in Allpages and Prefixindex
Add an option to SpecialAllpages and SpecialPrefixindex to hide
redirects.
Change-Id: I335c54f31ef841dd0c2e51a2ec8b17f234308b0e
Alexandre Emsenhuber [Wed, 28 Mar 2012 10:43:35 +0000 (12:43 +0200)]
Show the git revision and git branch in the debug toolbar if available.
The git version is displayed for consistency with other locations where the MediaWiki version is displayed and I always the branch on which I am :)
Change-Id: Icf041eabe49f03350536f212753e46f8e3468614
Mark A. Hershberger [Wed, 28 Mar 2012 18:53:41 +0000 (14:53 -0400)]
Avoid setting multiple Content-Type headers.
Necessary for JSON-RPC where Content-Type has to be set to
application/json on POST.
Change-Id: I0d974c98d914a22d0150a198a9f630206bb01d64
Nikerabbit [Wed, 28 Mar 2012 16:09:24 +0000 (16:09 +0000)]
Merge "Use local context to get messages"
Nikerabbit [Wed, 28 Mar 2012 15:41:07 +0000 (15:41 +0000)]
Merge "Add phpunit testcases for Bug 30681"
Niklas Laxström [Wed, 28 Mar 2012 13:41:19 +0000 (13:41 +0000)]
(bug 35541) ns gender aliases for Croatian (hr)
Change-Id: If1d0c0c69b5944b8ed2f8bf36c5a55028d9cf0ac
Alexandre Emsenhuber [Wed, 28 Mar 2012 10:34:34 +0000 (12:34 +0200)]
Use local context to get messages
Change-Id: Ic173f92f56f74261a34c896fbd1f45ec097129d6
Niklas Laxström [Wed, 28 Mar 2012 09:36:20 +0000 (09:36 +0000)]
gitignore mwsql script history file
sql.php attempts to generates an history file in the user homedir and
fallback on using maintenance/.mwsql_history
Change-Id: Iad23df30fd00e5d99242d34e7338f9caeedb09e4
Santhosh Thottingal [Wed, 28 Mar 2012 10:06:23 +0000 (15:36 +0530)]
Add phpunit testcases for Bug 30681
- The fix was done in https://gerrit.wikimedia.org/r/3842
Change-Id: I9874604828c1ae4ce0948ed7533a57dea9ac736d
Santhosh Thottingal [Wed, 28 Mar 2012 05:55:45 +0000 (11:25 +0530)]
Fix Bug 30681 - Wrong escaping for inexistent messages.
- If the message does not exist, do an early return from the toString method, instead of going through replaceParameter and format comparisons.
- Avoid getMessageText method.
- If the format is plain, do not escape the angle brackets.
Change-Id: I4561ee75d991ef8df3399ab17e5d75cb81f63f8f
Aaron Schulz [Tue, 27 Mar 2012 18:45:48 +0000 (11:45 -0700)]
[FileBackend] Moved scoped timeout stuff to its own file. Also removed some commented-out code (such a call would belong in LocalFile more so than here).
Change-Id: I0f0b7fe1a0f1da3fffe57c58b9f4d5a77d97cd29
Alexandre Emsenhuber [Tue, 27 Mar 2012 15:54:54 +0000 (17:54 +0200)]
Follow-up
c7df7ade694d38cddc8ec358fe0453cffd6ef379 (r3532):
* Forgot to change that instance of __construct() to addInitialStack()
Change-Id: If639ebe9ba53206108642bd3880058e7388aaa98
Hashar [Tue, 27 Mar 2012 15:32:39 +0000 (15:32 +0000)]
Merge "Improved the comment about Special:Contributions."
Demon [Tue, 27 Mar 2012 13:14:32 +0000 (13:14 +0000)]
Merge "Use local context to get messages"
Amir E. Aharoni [Tue, 27 Mar 2012 12:09:25 +0000 (14:09 +0200)]
Improved the comment about Special:Contributions.
It was prompted by an IRC discussion with SrikanthLogic,
who found the comment hard to understand.
Change-Id: Idd686257bc4d44f93e06b5645bdc1531bb2b4a2e
Amir E. Aharoni [Tue, 27 Mar 2012 12:00:18 +0000 (14:00 +0200)]
Fix language names:
* ab - suggested at ab.wikipedia.org village pump.
* bh - added a clarification about the name in a comment.
* bug - improved the name.
* ckb - added a clarification about the name in a comment.
* dz - changed the name in the comment.
* ike-latn - capitalized the Latin name.
* inh - only the Cyrillic name is needed.
* ks - consistent slash usage.
* mo - added a comment saying that it's deprecated.
* new - fixed the name in the comment.
* pi - fixed the native name according to the Wikipedia article and the dictionaries i have.
* tg-latn - capitalized the Latin name.
* tly - capitalized the Cyrillic name.
* ug-latn - removed unneeded LRM.
* uz - fixed the apostrophe.
* vep - fixed the apostrophe.
Change-Id: Ibd3d145426d71d46393ab330ac9ee63a4c737041
Alexandre Emsenhuber [Tue, 27 Mar 2012 10:51:16 +0000 (12:51 +0200)]
Use local context to get messages
Change-Id: I2c6fad30e2c4eaebf1223d94820dae917231e882
tstarling [Tue, 27 Mar 2012 04:23:44 +0000 (15:23 +1100)]
Split hashar's patchset2 into its own commit
* updated FileBackend constructor documentation
* squash change 3321 (r113742)
Change-Id: I6bb054ac6aaeee38a03880558c918963138330c4
Aaron Schulz [Tue, 13 Mar 2012 01:46:33 +0000 (01:46 +0000)]
[FileBackend]
* Added FileJournal class to log file changes for file backends. This can be used for migrations (like moving to Swift), syncing mirror repos, consistency checks, finishing/reverting operation batches, and such. The default journal is the "null" journal, which simply does nothing.
* Added the optional schema change required for using the DBFileJournal (MySQL, SQLite).
Change-Id: I33c9f9a598ba1f164c862b9dc3c718f9172db02b
tstarling [Tue, 27 Mar 2012 00:12:35 +0000 (11:12 +1100)]
Fix typo in comment
Change-Id: I5861982d91a32b5f65c250dde38fc5ce8f5c2693
tstarling [Mon, 26 Mar 2012 23:53:48 +0000 (10:53 +1100)]
Revert previous commit: accidental branch merge
This reverts commit
685fffec2049e1e152105dae919b58ed8876d04e, reversing
changes made to
59a68b48a74763af58ad7d62820ae1e7b0639476.
Change-Id: I5ed9f66e6afd5004ed5ee0f00e46888359376689
tstarling [Mon, 26 Mar 2012 23:47:04 +0000 (23:47 +0000)]
Merge "Fix typo in comment"
tstarling [Mon, 26 Mar 2012 23:44:24 +0000 (10:44 +1100)]
Fix typo in comment
Change-Id: Ia0af1e53c11c371f70dd60acdf5d32485bd8b3bc
Brion VIBBER [Mon, 26 Mar 2012 22:09:20 +0000 (22:09 +0000)]
Merge "Sync HISTORY with RELEASE-NOTES from REL1_18"
Aaron Schulz [Mon, 26 Mar 2012 22:04:55 +0000 (22:04 +0000)]
Merge "First half of fix for bug #30332 ("API spamblocklist error should provide *all* blocked URLs, not just one")."
jarry1250 [Mon, 26 Mar 2012 21:50:34 +0000 (22:50 +0100)]
First half of fix for bug #30332 ("API spamblocklist error should provide *all* blocked URLs, not just one").
Allow spamPageWithContent() to accept an array of matches, rather than just one.
Not dependent on other half of fix.
Change-Id: I75faac51f24bbb2569b36bc2e44f3cd5c43b1bd7
Alexandre Emsenhuber [Mon, 26 Mar 2012 20:57:32 +0000 (22:57 +0200)]
Sync HISTORY with RELEASE-NOTES from REL1_18
Change-Id: Iedb39de2c357ecb5b36bcb277722825d89a86031
Alexandre Emsenhuber [Mon, 26 Mar 2012 19:59:23 +0000 (21:59 +0200)]
Use local context to get messages
Change-Id: Ibbe6cd92ad3057742a6193471971fb11244e843b
Alexandre Emsenhuber [Mon, 26 Mar 2012 18:26:32 +0000 (20:26 +0200)]
* (bug 35446) Using "{{nse:}}" with an invalid namespace name no longer throws a PHP warning
Change-Id: I8e7611cdb03558af13ec5b96e02857ff5b16b571
Aaron Schulz [Mon, 26 Mar 2012 18:17:21 +0000 (18:17 +0000)]
Merge "Closing dump buffers on stream end"
Liangent [Mon, 26 Mar 2012 13:36:24 +0000 (21:36 +0800)]
Was causing Notice: Array to string conversion in .../includes/api/ApiBase.php on line 285 and examples of list=allimages are not displayed properly
Change-Id: I4fde14245ac19716957beb634a274c3a6042d776
Reedy [Thu, 22 Mar 2012 19:52:37 +0000 (19:52 +0000)]
* (bug 34212) ApiBlock/ApiUnblock allow action to take place without a token parameter present
* (bug 35317) CSRF in Special:Upload
Revert r56793, which removed the CSRF check for Special:Upload for normal file
uploads. Cross-site posting of file uploads without user interaction has been
possible since at least as early as Chrome 8 (late 2010) and Firefox 6 (mid
2011).
Commonist has used api.php since version 0.4.0 (April 2010), and the API
already requires an edit token, so Commonist 0.4.0+ is not affected by this
change.
* (bug 34907) Fix for CSRF vulnerability due to mw.user.tokens. Patch by Roan
Kattouw and Tim Starling.
* Filter out private modules early in ResourceLoader::makeResponse() and just
pretend they weren't specified. This means these modules cannot be loaded
through load.php . This filtering must not happen in makeModuleResponse(),
because that would break inlining.
* Force inlining of private modules in OutputPage::makeResourceLoaderLink(),
disregarding $wgResourceLoaderInlinePrivateModules
* Remove $wgResourceLoaderInlinePrivateModules
* Remove special treatment of private modules ($private) in
ResourceLoader::makeResponse() and sendResponseHeaders(), because we're not
allowing private modules to be loaded through here any more
* Remove identity checks in ResourceLoaderUserOptionsModule and
ResourceLoaderUserCSSPrefsModule, they didn't make a lot of sense before but
they're certainly useless now.
* Factored out error comment construction in ResourceLoader.php and stripped
comment terminations from exception messages. I didn't find an XSS
vulnerability but it looked scary.
Patchset2:
Removes whitespace error that prevented automatic merge by Gerrit:
includes/resourceloader/ResourceLoaderUserOptionsModule.php
Change-Id: I2dec8b8caf9db3c64919763865cc10cccdd6a1a3
Christian Aistleitner [Mon, 26 Mar 2012 09:26:48 +0000 (11:26 +0200)]
Closing dump buffers on stream end
Change-Id: I7bef095f2f9189fb20064da4fd09ed4caa7a90e5
Aaron Schulz [Mon, 26 Mar 2012 06:30:04 +0000 (06:30 +0000)]
Merge "No more undefined usage of rev{Start,End}Id warnings"
Aaron Schulz [Mon, 26 Mar 2012 05:35:07 +0000 (05:35 +0000)]
Merge "Same as #3715, but for master: * Moved the new entry to a new section "Changes since 1.19 beta 2" (did not see that the beta 2 was out)"
Aaron Schulz [Mon, 26 Mar 2012 05:31:51 +0000 (05:31 +0000)]
Merge "Use local context to get message"
Daniel Friesen [Mon, 26 Mar 2012 03:44:57 +0000 (20:44 -0700)]
Fix broken email confirmation expiration caused by MWCryptRand changes.
Change-Id: I7ef0913074f372b5ace3d14993e0e3a914b9f22c
Tim Starling [Mon, 26 Mar 2012 03:45:23 +0000 (03:45 +0000)]
Merge "Localisation updates for namespace names for core from translatewiki.net."
Alexandre Emsenhuber [Sun, 25 Mar 2012 20:10:09 +0000 (22:10 +0200)]
Use local context to get message
Change-Id: Ieeb4b20591baa3b6ceebdef55953648142622b44
Christian Aistleitner [Sun, 25 Mar 2012 19:32:18 +0000 (21:32 +0200)]
No more undefined usage of rev{Start,End}Id warnings
Change-Id: Id9754e430a566f79acbac3a7839a26cfd70db51c
Alexandre Emsenhuber [Sun, 25 Mar 2012 15:24:05 +0000 (17:24 +0200)]
Same as #3715, but for master:
* Moved the new entry to a new section "Changes since 1.19 beta 2" (did not see that the beta 2 was out)
Change-Id: Id2f39240ecac47a5ac70bc668f353adbac81428a
Greg Sabino Mullane [Sat, 24 Mar 2012 21:14:09 +0000 (17:14 -0400)]
Fix whitespace; change tabs to spaces.
Change-Id: I0c95653b47295e4bd84dec1ae74a850ca6598d9a
Alexandre Emsenhuber [Sat, 24 Mar 2012 18:45:05 +0000 (19:45 +0100)]
Use local context to get messages
Change-Id: I1a00bdca30132380640e872a5aa01c658d238202
Demon [Sat, 24 Mar 2012 15:50:36 +0000 (15:50 +0000)]
Merge "[FileRepo] * Added getReadOnlyReason() function to FileRepo to check read-only status. Added such checks to the File object functions that mutate files in storage. This should make read-only mode more tolerable (which is needed at least briefly when switching backends). * Added lock()/unlock() calls to File restore() function. * Use proper isOK() accessor for Status objects."
Reedy [Sat, 24 Mar 2012 15:23:30 +0000 (15:23 +0000)]
Merge "Put the sha1 tag in <revision> and not wrongly in <page>"
Marcin Cieślak [Wed, 14 Mar 2012 20:20:53 +0000 (20:20 +0000)]
Rename "user" and "text" when upgrading on PostgreSQL
Follow-up to r15791.
You can lie to me, but not to your installer.
Make DatabasePostgres::tableExists to check for real table names, not
faked ones.
DatabasePostgres is currently lying to the rest of the MediaWiki that
"mwuser" table is actually called "user" and that "pagecontents" is
called "text". While MediaWiki does not care, the installer (and updater
do).
This allows us to overcome first hurdle in getting MediaWiki 1.7.3 to
update to trunk on PostgreSQL and uncover further bugs.
For this commit to actually do something, we rename those tables when
upgrading to match what we have in maintenance/postgres/tables.sql
And by the way, tell installer not to check for "user" table, since most
PostgreSQL users will have "mwuser" instead. Picking "archive" instead.
Patchset2: wrapped commit message at 72 chars
Change-Id: Ic874e92bb1adda3430d3292423d4f3617c25456c
Aaron Schulz [Sat, 24 Mar 2012 07:30:31 +0000 (07:30 +0000)]
Merge "* (bug 35449) Removed double call to OutputPage::setRobotPolicy() in SpecialWatchlist::execute() (the other one is hidden in SpecialPage::setHeaders()) * Special:Watchlist no longer sets links to feed when the user is anonymous"
Aaron Schulz [Sat, 24 Mar 2012 07:26:46 +0000 (07:26 +0000)]
Merge "* Added Profiler::addInitialStack() to separate definitions of local variables and insertion of the first stacks * Use it in ProfilerSimple and call $this->profileOut() there to factorise common code"
Alexandre Emsenhuber [Sat, 24 Mar 2012 07:19:40 +0000 (08:19 +0100)]
* (bug 35449) Removed double call to OutputPage::setRobotPolicy() in SpecialWatchlist::execute() (the other one is hidden in SpecialPage::setHeaders())
* Special:Watchlist no longer sets links to feed when the user is anonymous
I did not add a RELEASE-NOTES entry for such trivial change, but rather for the second one which is more problematic that I found while investigating the bug.
Change-Id: I5ca6ccc1339ceacd98371e660d26876b6283decd
bsitu [Fri, 23 Mar 2012 23:57:05 +0000 (16:57 -0700)]
fix and comparison in pingLimiter
Change-Id: Ib8aa8ecf169acdf69c55f8c1dbce0d709fb9e852
Alex Monk [Fri, 23 Mar 2012 22:30:46 +0000 (22:30 +0000)]
Fixed some links from SVN to Git.
Change-Id: If425135e3601f11e42c0fc66b1eff7192b2a0704
preilly [Fri, 23 Mar 2012 22:29:30 +0000 (22:29 +0000)]
Merge "Resolve bug #18704 ("Add an unique CSS class or ID to the tagfilter table row at RecentChanges")"
jarry1250 [Fri, 23 Mar 2012 20:33:45 +0000 (20:33 +0000)]
Resolve bug #18704 ("Add an unique CSS class or ID to the tagfilter table row at RecentChanges")
Effectively followup previous attempt (r111186)
Change-Id: If11e2351ae7553da9ce010fce30354dbaf82b2dd
Hashar [Fri, 23 Mar 2012 21:23:38 +0000 (21:23 +0000)]
Merge "http->https"
Raimond Spekking [Fri, 23 Mar 2012 21:05:08 +0000 (22:05 +0100)]
http->https
Change-Id: I300f05ea4eb273bfa57192e58075bb027c6a02c8
Aaron Schulz [Fri, 23 Mar 2012 20:09:59 +0000 (13:09 -0700)]
Put the sha1 tag in <revision> and not wrongly in <page>
Change 1: while at it, also don't show the SHA1 if rev_deleted is set
Change-Id: I0d94338915e754bdee878d1e6570e2efc481b2b2
Aaron Schulz [Wed, 14 Mar 2012 21:30:26 +0000 (21:30 +0000)]
[FileRepo]
* Added getReadOnlyReason() function to FileRepo to check read-only status. Added such checks to the File object functions that mutate files in storage. This should make read-only mode more tolerable (which is needed at least briefly when switching backends).
* Added lock()/unlock() calls to File restore() function.
* Use proper isOK() accessor for Status objects.
Change-Id: I7368912b01f7fd1ec34125d12c0844388cbb3b2d
Daniel Friesen [Fri, 23 Mar 2012 18:59:30 +0000 (11:59 -0700)]
Update .gitignore for maintenance/
Add maintenance/dev/'s sqlite directory and maintenance/eval.php's history file to .gitignore.
Change-Id: I574532dc1d5475fb929cebd1934bd0149ea27039
Antoine Musso [Fri, 23 Mar 2012 17:18:07 +0000 (18:18 +0100)]
RecentChangeTest use the Database
Moving RecentChangeTest to the Database group will fix Jenkins jobs
handling databaseless tests.
Change-Id: I3f14120e806c35b19e96747aa43d6c64a6b504ca
Platonides [Fri, 23 Mar 2012 16:45:45 +0000 (17:45 +0100)]
API: trunk/phase3 is now mediawiki/core
e7544995a090f98fd4d803686d90087e9273bb41 follow-up.
Change-Id: Ic0c82e0a54cefded24fc3aa260ddc051e30e8ab5
Platonides [Fri, 23 Mar 2012 16:19:02 +0000 (17:19 +0100)]
trunk/phase3 is now mediawiki/core
Change-Id: Ief2721ee6573a5e54a276c91de636d9e1a678b8b
Antoine Musso [Fri, 23 Mar 2012 15:40:32 +0000 (16:40 +0100)]
git ignore almost everything in ./extensions/
Change-Id: I118733a47e154125a3a797c2763ea08b008f831c
Alexandre Emsenhuber [Fri, 23 Mar 2012 15:25:22 +0000 (16:25 +0100)]
* Added Profiler::addInitialStack() to separate definitions of local variables and insertion of the first stacks
* Use it in ProfilerSimple and call $this->profileOut() there to factorise common code
Change-Id: I2eb74088c6087a7c2dd32af1a1f600f327178c67
Demon [Fri, 23 Mar 2012 14:58:37 +0000 (14:58 +0000)]
Merge changes Id8107d24,I8c63dcc8
* changes:
[mediawiki.action.watch] clean up
[mediawiki.action.watch] Move re-used logic into local function * Follows-up r112440, r107969, r107350
Daniel Friesen [Fri, 23 Mar 2012 11:19:13 +0000 (04:19 -0700)]
Add GitInfo class.
This adds GitInfo which is used by Special:Version to get the SHA1 of
the git repo.
It's also useful for development to put blocks of config in
LocalSettings.php that only apply to branches where you are developing
large features:
if ( GitInfo::currentBranch() == 'myrewriteproject' ) {
// […]
}
Change-Id: I2a76662bb40080be6556d4edf60ac6714f36a727