Catrope [Tue, 8 May 2012 21:54:22 +0000 (21:54 +0000)]
Merge "Re-enable css @import unit tests"
Translation updater bot [Tue, 8 May 2012 20:51:32 +0000 (20:51 +0000)]
Localisation updates from translatewiki.net.
Change-Id: I787349e3479ad12431d82ead7c9ae58f3675fd66
Brion VIBBER [Tue, 8 May 2012 20:47:59 +0000 (20:47 +0000)]
Merge "Show descriptive error message on invalid title instead of showing an empty line"
Brion VIBBER [Tue, 8 May 2012 20:30:55 +0000 (20:30 +0000)]
Merge "Optimized SqlBagOStuff::getBatch() a bit."
Brion VIBBER [Tue, 8 May 2012 20:26:28 +0000 (20:26 +0000)]
Merge "(bug 35993) gettoken should go die in a fire (part 1)"
Brion VIBBER [Tue, 8 May 2012 20:24:27 +0000 (20:24 +0000)]
Merge "Make backupTestPass.inc require_once by itself its dependence on backup.inc Change path-less requires to full path ones."
Brion VIBBER [Tue, 8 May 2012 20:21:44 +0000 (20:21 +0000)]
Merge "[FileRepo] Locking and transaction fixes."
Brion VIBBER [Tue, 8 May 2012 20:15:52 +0000 (20:15 +0000)]
Merge "Add new-inline-tags to tidy.conf"
Alexandre Emsenhuber [Tue, 8 May 2012 19:34:40 +0000 (21:34 +0200)]
Show descriptive error message on invalid title instead of showing an empty line
Change-Id: Ided20c465fee37087239a0caef01c7427c5ceeef
Brion VIBBER [Tue, 8 May 2012 18:56:41 +0000 (18:56 +0000)]
Merge "(bug 36568) Fixed "Illegal string offset 'LIMIT'" warnings in updater"
Aaron Schulz [Tue, 8 May 2012 18:50:14 +0000 (18:50 +0000)]
Merge "Don't make two database requests to load the same object, again."
Brion VIBBER [Tue, 8 May 2012 18:36:05 +0000 (18:36 +0000)]
Merge "(bug 20189) Added 'Show/hide selected revisions' button and checkboxes to Special:Log."
Brion VIBBER [Tue, 8 May 2012 18:30:18 +0000 (18:30 +0000)]
Merge "[FileBackend] File locking fixes."
Brion VIBBER [Tue, 8 May 2012 18:28:30 +0000 (18:28 +0000)]
Merge "Make getContinueStr protected as it's used in subclass by TMH"
Brion VIBBER [Tue, 8 May 2012 18:27:46 +0000 (18:27 +0000)]
Merge "Include the namespace of the page in the "target" parameter of the form to confirm display of a deleted file."
Brion VIBBER [Tue, 8 May 2012 18:10:37 +0000 (18:10 +0000)]
Merge "ORDER BY/GROUP BY accept arrays"
Reedy [Tue, 8 May 2012 18:08:43 +0000 (19:08 +0100)]
Make getContinueStr protected as it's used in subclass by TMH
Change-Id: I3bd265805122d3ae12b986d1396ca634ca9f8097
Aaron Schulz [Tue, 8 May 2012 17:23:38 +0000 (17:23 +0000)]
Merge "Fix comment ResourceLoader::tryRespondFromFileCache()."
Hashar [Tue, 8 May 2012 16:12:58 +0000 (16:12 +0000)]
Merge "Added Linker::getInvalidTitleDescription() to display invalid title entries in various places."
Nikerabbit [Tue, 8 May 2012 15:58:29 +0000 (15:58 +0000)]
Merge "Use CamelCase in both ConfirmEmail and InvalidateEmail page names."
Alexandre Emsenhuber [Tue, 8 May 2012 15:53:59 +0000 (17:53 +0200)]
Fix comment ResourceLoader::tryRespondFromFileCache().
Mention ResourceFileCache instead of ObjectFileCache for the $fileCache parameter since the signature is
function tryRespondFromFileCache( ResourceFileCache $fileCache, ResourceLoaderContext $context )
Change-Id: I8e738c847ea358117a2a9b54f41fdb10308e2656
Alexandre Emsenhuber [Tue, 8 May 2012 12:51:21 +0000 (14:51 +0200)]
Added missing GPLv2 headers in some places.
Also made file/class documentation more consistent.
Change-Id: I604ed8ddc572e89001e49df6740ab42307bc0330
Alexandre Emsenhuber [Fri, 4 May 2012 12:32:10 +0000 (14:32 +0200)]
Include the namespace of the page in the "target" parameter of the form to confirm display of a deleted file.
Currently the name of the file is sent without the "File:" prefix making MediaWiki think we want to display a page in the main namespace.
Change-Id: I5a42764c8e9289d13b95a1989be63fdf357bc6ef
Liangent [Tue, 8 May 2012 09:25:03 +0000 (17:25 +0800)]
Use CamelCase in both ConfirmEmail and InvalidateEmail page names.
Change-Id: I2685023eff58479f0eecd3d6ff416cbe22ee425a
Aaron Schulz [Wed, 11 Apr 2012 04:56:42 +0000 (21:56 -0700)]
[FileBackend] File locking fixes.
* Fixed unlocking logic in FSLockManager for case when an EX lock was made, then an SH one, and then the EX one was "unlocked"
* Avoid hiding useful unlink() warnings in FSLockManager
* Reduced locking use in test cleanup code
* Added a simple testLockCalls() test function
* Made a few cleanups & fixes to backend tests
Change-Id: I1110d9b537c450d9feca5a2fb35519c22435e81d
Alex Monk [Tue, 8 May 2012 01:32:15 +0000 (02:32 +0100)]
(bug 20189) Added 'Show/hide selected revisions' button and checkboxes to Special:Log.
Change-Id: I2c4d4e1234d5ab9f7d514831351ea3b298811165
Tim Starling [Tue, 8 May 2012 01:02:55 +0000 (11:02 +1000)]
Fix for r113993: don't log UsageException instances
Change-Id: I205252534fcf7a0ee486938123c1e15cd036f4f1
Demon [Tue, 8 May 2012 00:06:03 +0000 (00:06 +0000)]
Merge "Make $wgShowExceptionDetails=false more feasible for production"
Tim Starling [Mon, 7 May 2012 23:53:58 +0000 (09:53 +1000)]
Make $wgShowExceptionDetails=false more feasible for production
* Make the HTML error message prettier, with a nice red box and
instructions to modify LocalSettings.php hidden in an HTML comment.
* Show the exception class name, since that's pretty safe.
* Show a random "log ID" to the user, and also send it to the exception
log, to allow easier log correlation.
* Optionally send backtraces to the error log, enabled by default.
Change-Id: Ie92e46032b3d194c4217119567847a38a53be577
Kaldari [Mon, 7 May 2012 23:30:48 +0000 (16:30 -0700)]
Fixing fatal error - you can't call getUser on a WebRequest object
Change-Id: I323e9c39cd89673b7e369df3b77573e51f4ea2e3
Aaron Schulz [Mon, 7 May 2012 23:21:56 +0000 (23:21 +0000)]
Merge "Treat truncated HTTP requests as errors."
Aaron Schulz [Mon, 7 May 2012 23:03:02 +0000 (23:03 +0000)]
Merge "add type check and bail out when title could not be created"
Aaron Schulz [Mon, 7 May 2012 22:59:22 +0000 (22:59 +0000)]
Merge "Let tablesUsed imply needsDB in MediaWikiTestCase."
Aaron Schulz [Mon, 7 May 2012 22:56:45 +0000 (22:56 +0000)]
Merge "fix 2 missing "local var" JavaScript statements"
Aaron Schulz [Mon, 7 May 2012 22:53:13 +0000 (22:53 +0000)]
Merge "Adding $this->tablesUsed to RevisionStorageTest."
daniel [Wed, 2 May 2012 17:35:42 +0000 (19:35 +0200)]
Adding test case for basic WikiPage functionality, including database interaction.
New tests are added to avoid regressions when the ContentHandler facility
is introduced.
Changeset 3: use tablesUsed to allow database cleanup after test, as per
Aaron's suggestion.
Changeset 4: use array_merge instead of +=.
Changeset 5: trying dumber rollback test to see of jenkins likes it better.
Change-Id: I0a9f8dfd30031baa4b12cc128a39059868149884
daniel [Fri, 4 May 2012 14:02:09 +0000 (16:02 +0200)]
Let tablesUsed imply needsDB in MediaWikiTestCase.
If the test says it uses database tables, then it needs the database.
And while we are at it, make the check for the test group declaration
more lenient.
Patch set 2: tweaked according to demon's comments.
Change-Id: Ib123745d45b85cebeab5ec87ea7d8227ec3d1dea
Platonides [Mon, 7 May 2012 21:13:04 +0000 (23:13 +0200)]
Treat truncated HTTP requests as errors.
We detect such prematurely ended request when there's a Content-Length
greater than the body we got. A strict comparison would easily fail
when there was a content encoding layer, but hopefully we won't hit
a compressed request _larger_ than the original content.
See http://thread.gmane.org/gmane.org.wikimedia.mediawiki/39622
for breakage caused by truncated HTTP replies.
Change-Id: I71418424730d46a781bde5cbfda8038457ec79c5
daniel [Wed, 2 May 2012 17:34:35 +0000 (19:34 +0200)]
Adding $this->tablesUsed to RevisionStorageTest.
This is a follow-up to I6934d03e (no 6414).
Declare tables in $this->tablesUsed to allow for database clenaup,
as Aaron suggested.
Change-Id: Iac05b0428b335879729f6d3b993eac0d3151429c
Antoine Musso [Mon, 7 May 2012 21:39:14 +0000 (21:39 +0000)]
Merge "(bug 36603) Make DumpFilter::$sink public again"
Antoine Musso [Mon, 7 May 2012 21:34:07 +0000 (14:34 -0700)]
(bug 36603) Make DumpFilter::$sink public again
This is required by dump unit testing for now. The change was introduced
by commit
ab6e54e0 https://gerrit.wikimedia.org/r/#/c/6089/
We will have to update the Dump tests to no more reference sink directly
but use a proper accessing method that has yet to be written.
Change-Id: I1246739c4ea174b13af475db8cfcb48740ecc2df
Translation updater bot [Mon, 7 May 2012 21:19:42 +0000 (21:19 +0000)]
Localisation updates from translatewiki.net.
Added language file for "sat", updated Names.php and RELEASE-NOTES.
Change-Id: I2dbe696fbe5b98352895fe1be2de96eb767b2b0b
Aaron Schulz [Mon, 7 May 2012 17:44:34 +0000 (17:44 +0000)]
Merge "Made WikiPage recall the source of the data used to load its state."
Hashar [Mon, 7 May 2012 16:39:14 +0000 (16:39 +0000)]
Merge "Adding tests for dumps"
Alexandre Emsenhuber [Tue, 10 Apr 2012 09:28:48 +0000 (11:28 +0200)]
Added Linker::getInvalidTitleDescription() to display invalid title entries in various places.
This method will use two new messages 'invalidtitle-knownnamespace' and 'invalidtitle-unknownnamespace' depending on the fact that the given namespace number exists or not.
I did put that method in Linker because I plan to use it in various places, notably in other QueryPage and Pager subclasses.
Change-Id: I13e7cdc2c0a8e86dc5e4b144b6012f3864d2ec06
Alexandre Emsenhuber [Mon, 7 May 2012 13:52:55 +0000 (15:52 +0200)]
(bug 36568) Fixed "Illegal string offset 'LIMIT'" warnings in updater
No RELEASE-NOTES entry since this is going to be backported and RELEASE-NOTES-1.19 is out of sync.
Change-Id: I1ec6c824677606ac6f93cc43345942e4de8bd3f4
Demon [Mon, 7 May 2012 12:32:20 +0000 (12:32 +0000)]
Merge "Localisation updates from translatewiki.net."
Demon [Mon, 7 May 2012 12:26:34 +0000 (12:26 +0000)]
Merge "(bug 36537) Rename wfArrayToCGI to wfArrayToCgi"
Siebrand [Mon, 7 May 2012 10:22:46 +0000 (10:22 +0000)]
Merge "Pass the result of the database queries in Title::getPreviousRevisionID() and Title::getNextRevisionID() into intval()."
Alexandre Emsenhuber [Thu, 26 Apr 2012 20:59:19 +0000 (22:59 +0200)]
Made WikiPage recall the source of the data used to load its state.
In WikiPage.php:
* Added WikiPage::$mDataLoadedFrom to store the source of the data used to load the state of the object and four new WikiPage::DATA_* constants for its possible values.
* Added WikiPage::convertSelectType() to convert 'fromdb', 'fromdbmaster' and 'forupdate' to the new WikiPage::DATA_* constants.
* Added $options to WikiPage::pageData(), WikiPage::pageDataFromTitle() and WikiPage::pageDataFromId() so that the "FOR UPDATE" option can be passed to DatabaseBase::select().
* Added new possibility "forupdate" to WikiPage::loadPageData() load the data from the master database using SELECT FOR UPDATE; this avoids to have to do this by LinkCache (via Title::getArticleID( Title::GAID_FOR_UPDATE ) )).
* Changed WikiPage::doDeleteArticleReal() to use this new feature so that all the data stored in WikiPage is up-to-date.
My point is also to deprecate the loading using SELECT FOR UPDATE in Title and remove LinkCache::forUpdate() at some point (there are still one usage in Title::moveTo(), two other in UploadFromUrlTest plus some in extensions).
In EditPage.php:
* Don't call WikiPage::clear() after fetching informations from master, this destroys all we work we did to get the correct data.
* Reload the whole data from master using SELECT FOR UPDATE directly in WikiPage and not only in Title. The problem was that before, the up-to-date information was only available in Title and not in WikiPage.
Consider the following sequence from a MySQL prompt (where both revision 1 and 2 belong to page one, revision #2 being the current one):
mysql> UPDATE page SET page_latest=1 WHERE page_id=1;
mysql> COMMIT;
// Now grad the edit form for page #1 from the web and do some changes
mysql> BEGIN;
mysql> SELECT page_latest FROM page WHERE page_id=1 FOR UPDATE;
// Now submit the web form
mysql> UPDATE page SET page_latest=2 WHERE page_id=1;
mysql> COMMIT;
Before you ended-up with a "edit conflict" form with revision #1's text being displayed as current text (even if the texts are mergeable), due to the fact that
in the submit request the WikiPage object was loaded at the moment where page_latest was 1 (certainly due to MySQL's "consistent read" feature) making the
"UPDATE page SET ... WHERE page_id=1 AND page_latest=1" query of WikiPage::updateRevisionOn() return zero row, and thus WikiPage::doEdit returing a fatal Status object with message "edit-conflict".
Now the SELECT FOR UPDATE is done in the WikiPage, meaning that the object has the correct data and EditPage will correctly try to merge the revisions (and show the correct edit conflict if needed).
Change-Id: Ic4878ddb4dd96432b7ecaf43f9f359458d966999
Alexandre Emsenhuber [Mon, 7 May 2012 07:11:33 +0000 (09:11 +0200)]
Added missing GPLv2 headers in some places.
Also made file/class documentation more consistent.
Change-Id: Iad15427368d13a6cc11c8512b7265e8c7b8878a5
Aaron Schulz [Mon, 7 May 2012 06:28:03 +0000 (23:28 -0700)]
[FileRepo] Locking and transaction fixes.
* Make sure locks for file moves cover the whole operation.
* Pushed purging out of the move/delete/restore transactions.
Change-Id: I398c5627808fa79739f0dee632c4edf7416507c1
Aaron Schulz [Mon, 7 May 2012 01:13:04 +0000 (01:13 +0000)]
Merge "$wgGitRepositoryViewers to link to gitweb"
Siebrand [Sun, 6 May 2012 21:12:29 +0000 (21:12 +0000)]
Merge "Added missing GPLv2 headers in some places."
Platonides [Sun, 6 May 2012 20:31:03 +0000 (22:31 +0200)]
Make backupTestPass.inc require_once by itself its dependence on backup.inc
Change path-less requires to full path ones.
Change-Id: Ida37a3ec9bb1d5c99f4bbbf6d967cb40d0442e38
Jan Gerber [Wed, 2 May 2012 12:49:35 +0000 (14:49 +0200)]
Add new-inline-tags to tidy.conf
by default tidy does not support html5 tags.
TimedMediaHandler outputs video, audio and source
To make TimedMediaHandler work with $wgUseTidy = true,
those tags need to be allowed in tidy.conf:
new-inline-tags: video,audio,source,track
Fixes #30541
Change-Id: I528c9521e9277be308a6a75cc3fc57c83905b5df
saper [Sun, 6 May 2012 20:12:14 +0000 (22:12 +0200)]
$wgGitRepositoryViewers to link to gitweb
My git remote is configured just to be ssh://review/mediawiki/core.git
and I have "review" set up in $HOME/.ssh/config.
Unfortunately, I need to change git remote URLs to make sure
the repository is linked from Special:Version.
This shouldn't be necessary; either we should fallback to the
official MediaWiki git repository or we should add the configuration
option to adapt to local needs.
Change-Id: I2e0b6470c16ec36d0e94cceab844f4a4c4334067
Translation updater bot [Sun, 6 May 2012 18:31:11 +0000 (18:31 +0000)]
Localisation updates from translatewiki.net.
Change-Id: I731ab96929dac09112de978b4ed387b044893d36
Szymon Świerkosz [Sun, 6 May 2012 14:43:09 +0000 (16:43 +0200)]
(bug 35993) gettoken should go die in a fire (part 1)
Mark gettoken param as deprecated, so users can fix their tools.
The second part will remove the support for gettoken from ApiMain,
but that is in the future.
Change-Id: I369ddc740c38d80aa8389544087ac6671cabc618
Szymon Świerkosz [Fri, 4 May 2012 10:31:08 +0000 (12:31 +0200)]
Move optionstoken from meta=userinfo to action=tokens.
Follow up to I0d6c654a7354ba77e65e338423952a6a78c1150f.
I have also added a URL to a help page on mw.org.
Change-Id: Ie223930cfc313aff150e2dcfd70b74bf4360a8a8
Alexandre Emsenhuber [Sun, 6 May 2012 05:50:15 +0000 (07:50 +0200)]
Added missing GPLv2 headers in some places.
Also made file/class documentation more consistent.
Change-Id: I1615bf268515ed7169e33173cea6ec30402451dc
umherirrender [Sat, 5 May 2012 17:29:48 +0000 (19:29 +0200)]
(bug 33224) add variants of content language to meta=siteinfo
Change-Id: I0b92e1e626f0c5bc543c5d134eb44d7ca7722217
Erik Moeller [Sat, 5 May 2012 22:35:06 +0000 (15:35 -0700)]
Fix typo and small error in release notes.
Change-Id: I6855a441c2924a0c7d659909b825c79e324a51a7
umherirrender [Sat, 5 May 2012 18:08:58 +0000 (20:08 +0200)]
(bug 28814) add properties to output of action=parse
Change-Id: I27cf2daaf6f34596bc34aac230601d5688a0066f
umherirrender [Sat, 5 May 2012 18:24:27 +0000 (20:24 +0200)]
(bug 34927) Output media_type for list=filearchive
Change-Id: I7c9b2f614ab319facfc9fb30893d82a9427e4253
Timo Tijhof [Sat, 5 May 2012 17:02:58 +0000 (19:02 +0200)]
(bug 36537) Rename wfArrayToCGI to wfArrayToCgi
- For consistency with wfCgiToArray()
This way instead of the other way around to keep lowerCamelCase natural.
Change-Id: If4528f6572afeab42ef0602a427ac44da9830a3f
umherirrender [Sat, 5 May 2012 14:08:47 +0000 (16:08 +0200)]
Use right case for Title::makeTitle
Change-Id: Ia91b3679f03eefb9970a790c784a92ea6fb0c274
vlakoff [Sat, 5 May 2012 13:55:50 +0000 (15:55 +0200)]
fix 2 missing "local var" JavaScript statements
Change-Id: I0e8a5824be635e526c385f3168ffc6269928a05c
umherirrender [Sat, 5 May 2012 13:29:08 +0000 (15:29 +0200)]
ORDER BY/GROUP BY accept arrays
renaming all variable which hold "' DESC'" to $sort
to keep it all the same
Change-Id: I75118f8cdd701f53949fe5cdd7155fb07f78ff65
Aaron Schulz [Sat, 5 May 2012 09:32:28 +0000 (09:32 +0000)]
Merge "Use $wgExpensiveParserFunctionLimit over ParserOptions"
umherirrender [Sat, 5 May 2012 09:24:07 +0000 (11:24 +0200)]
Do not treat EXPLAIN as write query
Change-Id: Idb15955b94ee6977f3a4692df44d445d3450b1a5
Aaron Schulz [Sat, 5 May 2012 08:51:12 +0000 (08:51 +0000)]
Merge "Show Highest expansion depth in limit report"
Aaron Schulz [Sat, 5 May 2012 08:46:31 +0000 (08:46 +0000)]
Merge "Use local context to get messages and time formatting methods of Language class"
Aaron Schulz [Sat, 5 May 2012 08:41:29 +0000 (08:41 +0000)]
Merge "Add MWNamespace::isNonincludableNamespace"
umherirrender [Sat, 5 May 2012 08:22:28 +0000 (10:22 +0200)]
Add MWNamespace::isNonincludableNamespace
Method is a wrapper around $wgNonincludableNamespaces,
replaced the one place in parser and
add it as info to api's meta=siteinfo
Change-Id: I501b811137c39f5c2d9ea35c78fef8ae22d21bfe
awjrichards [Sat, 5 May 2012 00:01:24 +0000 (00:01 +0000)]
Merge "Use Title::legalChars()"
Reedy [Fri, 4 May 2012 23:35:52 +0000 (23:35 +0000)]
Merge "Only use per-template profiling for one-time profiling output."
Aaron [Thu, 3 May 2012 20:02:27 +0000 (13:02 -0700)]
Only use per-template profiling for one-time profiling output.
Change-Id: Ib89ce14310ccac529684f0ada71f60744319eb3e
Reedy [Fri, 4 May 2012 23:10:51 +0000 (00:10 +0100)]
Kill off pre php 5.3.2 back compat hacks
Change-Id: I5b806a5d8fd4ec6914e3786a4a9aefba4ad6faa6
Aaron [Fri, 4 May 2012 22:39:30 +0000 (15:39 -0700)]
[FileBackend] Removed PHP < 5.3 b/c cruft.
Change-Id: Ied29fab9c2582384fd95b76831649f77639a3647
Catrope [Fri, 4 May 2012 22:26:50 +0000 (22:26 +0000)]
Merge "[FileBackend] Added copy() sanity checks to FSFileBackend."
Aaron [Fri, 4 May 2012 22:23:57 +0000 (15:23 -0700)]
[FileBackend] Added copy() sanity checks to FSFileBackend.
Change-Id: I3c7db46d74f744fbe877222639e78ea7318f8507
umherirrender [Fri, 4 May 2012 20:44:14 +0000 (22:44 +0200)]
Show Highest expansion depth in limit report
With 1.20wmf2 we get a tracking category with all the problem pages,
seeing the limit for a page is a helpful information than
Change-Id: I1916e5fa6de06b923a01cf1f0ca9362287a9fd70
Translation updater bot [Fri, 4 May 2012 20:32:55 +0000 (20:32 +0000)]
Localisation updates from translatewiki.net.
Change-Id: I5e25a15e29414d6fd4408d40c835c03086c7ec1a
Alexandre Emsenhuber [Sat, 28 Apr 2012 13:45:37 +0000 (15:45 +0200)]
Don't make two database requests to load the same object, again.
I know there's no second parameter to WikiPage::newFromID(), but this will change soon.
This follows-up I098dd36619fff3610be6894037220d3472b809d5.
Change-Id: Ic28b7e05db51e55a5f49fed70c042ba11e4d97fe
umherirrender [Fri, 4 May 2012 19:47:00 +0000 (21:47 +0200)]
Use Title::legalChars()
Change-Id: I6b29f29875fa54196b5899042a8f576c82a8943f
Reedy [Fri, 4 May 2012 19:08:23 +0000 (20:08 +0100)]
Update both the MediaWiki version and the min required PHP version in PHPVersionError.php
Change-Id: Ia7db1c90854b30aee17cc180381fdd9dc2f9c90b
umherirrender [Fri, 4 May 2012 18:56:28 +0000 (20:56 +0200)]
Use $wgExpensiveParserFunctionLimit over ParserOptions
This allows extensions to set the value
Change-Id: I4a935a00fe02a2bb88a14942e5e3ec6f4e5e833e
umherirrender [Sat, 21 Apr 2012 13:12:08 +0000 (15:12 +0200)]
(bug 32604) Some messages needs escaping of wikitext inside username
Change-Id: I223a5fb8d110ceace122acb7045bc6a925bfda66
Aaron Schulz [Fri, 4 May 2012 17:09:39 +0000 (17:09 +0000)]
Merge "Credits/RN for bug 5445 /
7694faf68"
Demon [Fri, 4 May 2012 14:09:05 +0000 (14:09 +0000)]
Merge "Use the same object when checking if the user is blocked instead of creating a new one."
Demon [Fri, 4 May 2012 13:50:45 +0000 (13:50 +0000)]
Merge "[FileRepo] Various ForeignApiRepo fixes."
Reedy [Fri, 4 May 2012 13:46:26 +0000 (13:46 +0000)]
Merge "Added missing GPLv2 headers in some places."
Tim Starling [Fri, 4 May 2012 12:44:57 +0000 (12:44 +0000)]
Merge "Various updates needed to bump min php version to 5.3.2"
Tim Starling [Fri, 4 May 2012 07:58:16 +0000 (07:58 +0000)]
Merge "(bug 29296) Expanded Blacklist for SVG Files"
Alexandre Emsenhuber [Fri, 4 May 2012 06:29:11 +0000 (08:29 +0200)]
Added missing GPLv2 headers in some places.
Also made file/class documentation more consistent.
Change-Id: I1deb70318d01a257b51948ba806d80cd1a239f4f
Antoine Musso [Fri, 4 May 2012 06:42:06 +0000 (08:42 +0200)]
Credits/RN for bug 5445 /
7694faf68
Change-Id: I41db0c0946bcef79a00d6d66e34114baaebe2ddc
Alexandre Emsenhuber [Wed, 2 May 2012 21:13:47 +0000 (23:13 +0200)]
Use local context to get messages and time formatting methods of Language class
Change-Id: I04d460a63f40e13e7f84cb168a9001516b1215fa
Werdna [Fri, 4 May 2012 05:53:05 +0000 (05:53 +0000)]
Merge "(bug 18195) Allow changing preferences via API"
Aaron Schulz [Fri, 4 May 2012 00:12:16 +0000 (00:12 +0000)]
Merge "(bug 5445) remove autoblocks when user is unblocked"