aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "[FileRepo] Fixed file move data-loss race condition."Catrope2012-06-051-13/+21
|\
| * [FileRepo] Fixed file move data-loss race condition.Aaron Schulz2012-06-031-13/+21
| | | | | | | | | | | | | | * Update the DB before copying the files over. This fixes a serious regession from 395c5907ff6191afa263e557ce44164e032e15b6. Change-Id: Ibeec2cda839adecf28f4b944fa1cdb6e4eff7e3b
* | Merge "setSquidMaxage() globally if we can purge it, instead of in actions."Aaron Schulz2012-06-053-12/+12
|\ \
| * | setSquidMaxage() globally if we can purge it, instead of in actions.Liangent2012-06-043-12/+12
| | | | | | | | | | | | Change-Id: I404c994616eab0902a9e3650c97028e9bcfb22db
* | | Merge "(bug 32643) Prevent action=purge&forcelinkupdate crash"Aaron Schulz2012-06-052-1/+3
|\ \ \
| * | | (bug 32643) Prevent action=purge&forcelinkupdate crashBrad Jorsch2012-06-022-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | action=purge with forcelinkupdate crashes when the rate limit is reached, because the module passes an array rather than a string to setWarning. The appropriate string is in the 'info' key of the array, so just use that. Change-Id: Ia0215290197e115e7272f945ab1bc5b81aeec80a
* | | | Merge "Localisation updates from http://translatewiki.net."Translation updater bot2012-06-0520-85/+114
|\ \ \ \
| * | | | Localisation updates from http://translatewiki.net.Translation updater bot2012-06-0520-85/+114
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie62a0a9446de17b171b9c7003ead5291b9bb2cbc
* | | | | Merge "Clean up Resources.php"Aaron Schulz2012-06-051-17/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Clean up Resources.phpTimo Tijhof2012-06-051-17/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Trailing whitespace * Array-usage similar to rest of file Change-Id: I08908af2541750cb28474d1209d80ea6072b77cf
* | | | | Fixed bit math logic error in 0e765f8405c3ec1b428994d3149599a7132ae07b.Aaron2012-06-051-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: Idfba3971f9c2d47967d1210352d8fb25583834e0
* | | | Merge "Reverse the dependency for mediawiki.language.data"Krinkle2012-06-054-51/+66
|\ \ \ \
| * | | | Reverse the dependency for mediawiki.language.dataSanthosh Thottingal2012-06-054-51/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Previously mediawiki.language.data depended on mediawiki.language, making any module using langauge data having to explicitly define it as a dependency. This is not good. We should abstract the data generation part and for the users of the module. mediawiki.language should take care of having the required data. * So, reversing the dependency so that mediawiki.language depends on mediawiki.language.data. Then a simple dependency declaration with "mediawiki.language" is enough to have associated data available. This supersedes change set I810fb0a5 Change-Id: Iede836bb3e2fd700cb7c58caeebe9ec2e0043dfb
* | | | | Merge "Add new message 'showhideselectedlogentries' for revdel of logs."Siebrand2012-06-054-9/+12
|\ \ \ \ \
| * | | | | Add new message 'showhideselectedlogentries' for revdel of logs.Liangent2012-06-054-9/+12
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | What we're hiding are not "revisions" here... Change-Id: I3d3d75dea240ff189fc929e0a24f8e5449a4e0c6
* | | | | Merge "(bug 37180) Removed hard coded parentheses in SpecialVersion.php"Siebrand2012-06-051-4/+5
|\ \ \ \ \
| * | | | | (bug 37180) Removed hard coded parentheses in SpecialVersion.phppmolina2012-06-041-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch set 4: * Use params() instead of rawParams() because there is no need for raw. * Specify processing explicitely. Change-Id: If5f1c26f221bdb060b5944ef5e3cdb64d76154e3
* | | | | | (bug 37330) Fix wrong block being displayed due to autoblock in place.Victor Vasiliev2012-06-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autoblocks triggered latest block log entry being displayed, which was naturally the wrong one, since autoblocks are not put into a block log. Change-Id: Ic08880c18a778d5294bb934c764a70dbd7800b70
* | | | | | Merge "[FileBackend] Gave doQuickOperations() some wrapper methods just like ↵Demon2012-06-042-2/+86
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | doOperations()."
| * | | | | | [FileBackend] Gave doQuickOperations() some wrapper methods just like ↵Aaron Schulz2012-05-242-2/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doOperations(). Change-Id: I0186a60bddcb26f008f6a6512eb5190a08142802
* | | | | | | Merge "[FileBackend] Purge Swift process cache before container delete for ↵Demon2012-06-042-4/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | sanity."
| * | | | | | | [FileBackend] Purge Swift process cache before container delete for sanity.Aaron Schulz2012-05-252-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Also tweaked some documentation. Change-Id: I89369d6211de216193ae1d895356137cacded5d7
* | | | | | | | Merge "[FileBackend] Worked around Akamai CDN purge limits."Demon2012-06-041-3/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | [FileBackend] Worked around Akamai CDN purge limits.Aaron Schulz2012-05-231-3/+18
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added swiftCDNTTL to let the cache TTL be configurable * Also added swiftCDNPurgable option to disable purges Change-Id: Ic8e779c20f7501a5a55f4a49fc612923d0dc268c
* | | | | | | | Merge "Fixed destructor in FSLockManager to clear all the locks."Demon2012-06-041-4/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed destructor in FSLockManager to clear all the locks.Aaron Schulz2012-06-021-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I019d24c19f317eb649b5a0415618b453e1ea171b
* | | | | | | | | Merge "[FileRepo] Made getDescription() respect *_deleted fields."Demon2012-06-045-10/+34
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [FileRepo] Made getDescription() respect *_deleted fields.Aaron2012-05-255-10/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1dd54611501d6747fb4ad6cbe6b58b0010b1d6d4
* | | | | | | | | | Merge "document CASE (0th array element) for $magicWords"Demon2012-06-041-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | document CASE (0th array element) for $magicWordsjeremyb2012-06-031-0/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this agrees with the statement at https://www.mediawiki.org/w/index.php?title=Manual:Magic_words&oldid=543077#Mapping_wiki_text_to_magic_word_ids Change-Id: I5036d19b57b5b1be13317e1d6e249eaeee0797c8
* | | | | | | | | | Merge "Made default BagOStuff functions work consistently."Demon2012-06-041-17/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Made default BagOStuff functions work consistently.Aaron Schulz2012-06-031-17/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Made getMulti() only return keys for items that exists. * Made add() return false if the item already exist. * Made replace() return false it the item does not already exist. Change-Id: Idb9d9843ace0c81f71abfc22b90e30eb33d7579d
* | | | | | | | | | | Merge "Changed a call to Title::getEscapedText() which is now deprecated."Demon2012-06-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Changed a call to Title::getEscapedText() which is now deprecated.Alexandre Emsenhuber2012-06-041-1/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3cb6e9b4cf4a70ff3f30662ed12152a6f9d3f170
* | | | | | | | | | | Merge "Added missing GPLv2 headers in some places."Demon2012-06-048-2/+122
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Added missing GPLv2 headers in some places.Alexandre Emsenhuber2012-06-048-2/+122
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also made file/class documentation more consistent. Change-Id: If00cc0c63c49e441de56bc7b55d764d4a9a53ae8
* | | | | | | | | | | Merge "Rename $exclude_patterns to $excludePatterns and $wgDoxyGenerateMan ↵Demon2012-06-041-11/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to $doxyGenerateMan."
| * | | | | | | | | | | Rename $exclude_patterns to $excludePatterns andPlatonides2012-06-031-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $wgDoxyGenerateMan to $doxyGenerateMan. Change-Id: Id6d7d8202c6bdfd31d2bba5603e0682d35c76ad4
* | | | | | | | | | | | Merge "Use canonical class name. Include ORMRowTest.php"Demon2012-06-041-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use canonical class name. Include ORMRowTest.phpPlatonides2012-06-031-1/+3
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia6bc39492056bb3aa3a1a17097b71b70d1344e50
* | | | | | | | | | | | Merge "Improve / add two passing link tests"Demon2012-06-041-0/+30
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Improve / add two passing link testsGabriel Wicke2012-06-041-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add a transition *** -> #** to an existing test * Add a test for interrupted lists Change-Id: I09b81099a7e8a8b08fefb194670f91648c3e077f
* | | | | | | | | | | | | Merge "Add passing test for padleft and padright as substr"Demon2012-06-041-0/+11
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Add passing test for padleft and padright as substrGabriel Wicke2012-06-041-0/+11
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a popular 'misuse' of the padleft/padright functions, which was not tested in the main parser tests so far. Change-Id: Icda02b34101c8c35b13c1e84d9f565867148d8d8
* / | | | | | | | | | | Localisation updates from http://translatewiki.net.Translation updater bot2012-06-047-29/+128
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2fa1ef4bf7e98254343162c4b957e478e029df25
* | | | | | | | / / / MessagesFa.php: whitespace consistencyjeremyb2012-06-041-2/+1
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b8b89f824a8811621471430e2d188a3b1119b30
* | | | | | | | | | Merge "Replace calls to deprecated Article::doWatch and Article::doUnwatch"Aaron Schulz2012-06-031-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Replace calls to deprecated Article::doWatch and Article::doUnwatchPlatonides2012-06-031-2/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7e87b24144cbff01fdf8b40c5e7da783c0c57f24
* | | | | | | | | (bug 37179) Allow undelete revision rows l10nDereckson2012-06-045-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch set 5: Update spacing in changes in SpecialUndelete.php per convention. Change-Id: I95756fa53c1f3b2a62fa9b5f6a63475dd5462442
* | | | | | | | | Merge "(bug 37151) Updating extensions/README file, using Git and https:// ↵Siebrand2012-06-031-3/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the URLs"