| Property changes on: branches/REL1_18/phase3/maintenance/archives |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1 | 1 | Merged /trunk/phase3/maintenance/archives:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/maintenance/deleteSelfExternals.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2 | 2 | Merged /trunk/phase3/maintenance/deleteSelfExternals.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/maintenance/populateRevisionLength.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3 | 3 | Merged /trunk/phase3/maintenance/populateRevisionLength.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/maintenance/cleanupTable.inc |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 4 | 4 | Merged /trunk/phase3/maintenance/cleanupTable.inc:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/maintenance/mergeMessageFileList.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 5 | 5 | Merged /trunk/phase3/maintenance/mergeMessageFileList.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/maintenance/tables.sql |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 6 | 6 | Merged /trunk/phase3/maintenance/tables.sql:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 7 | 7 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiErrorsNamepageTestCase.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiInstallationMessage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 8 | 8 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiInstallationMessage.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 9 | 9 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiErrorsConnectToDatabasePageTestCase.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiInstallerTestSuite.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 10 | 10 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiInstallerTestSuite.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 11 | 11 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiOnAlreadyInstalledTestCase.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 12 | 12 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiHelpFieldHintTestCase.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiInstallationCommonFunction.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 13 | 13 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiInstallationCommonFunction.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 14 | 14 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiUpgradeExistingDatabaseTestCase.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 15 | 15 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiButtonsAvailabilityTestCase.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 16 | 16 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiMySQLDataBaseTestCase.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiInstallationConfig.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 17 | 17 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiInstallationConfig.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 18 | 18 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiMySQLiteDataBaseTestCase.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 19 | 19 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiRightFrameworkLinksTestCase.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiInstallationVariables.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 20 | 20 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiInstallationVariables.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 21 | 21 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiUserInterfaceTestCase.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 22 | 22 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiDifferntDatabasePrefixTestCase.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/README.txt |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 23 | 23 | Merged /trunk/phase3/tests/selenium/installer/README.txt:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 24 | 24 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiRestartInstallationTestCase.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 25 | 25 | Merged /trunk/phase3/tests/selenium/installer/MediaWikiDifferentDatabaseAccountTestCase.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/parserTests.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 26 | 26 | Merged /trunk/phase3/tests/parserTests.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/phpunit/includes/api/RandomImageGenerator.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 27 | 27 | Merged /trunk/phase3/tests/phpunit/includes/api/RandomImageGenerator.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/phpunit/includes/api/ApiUploadTest.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 28 | 28 | Merged /trunk/phase3/tests/phpunit/includes/api/ApiUploadTest.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/phpunit/includes/api/generateRandomImages.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 29 | 29 | Merged /trunk/phase3/tests/phpunit/includes/api/generateRandomImages.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/phpunit/Makefile |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 30 | 30 | Merged /trunk/phase3/tests/phpunit/Makefile:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/phpunit |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 31 | 31 | Merged /trunk/phase3/tests/phpunit:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/tests/testHelpers.inc |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 32 | 32 | Merged /trunk/phase3/tests/testHelpers.inc:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/upload/UploadBase.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 33 | 33 | Merged /trunk/phase3/includes/upload/UploadBase.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/upload/UploadStash.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 34 | 34 | Merged /trunk/phase3/includes/upload/UploadStash.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/upload/UploadFromFile.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 35 | 35 | Merged /trunk/phase3/includes/upload/UploadFromFile.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/SpecialPageFactory.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 36 | 36 | Merged /trunk/phase3/includes/SpecialPageFactory.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/CategoryPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 37 | 37 | Merged /trunk/phase3/includes/CategoryPage.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/json/Services_JSON.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 38 | 38 | Merged /trunk/phase3/includes/json/Services_JSON.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/GlobalFunctions.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 39 | 39 | Merged /trunk/phase3/includes/GlobalFunctions.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/db/Database.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 40 | 40 | Merged /trunk/phase3/includes/db/Database.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/db/LoadBalancer.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 41 | 41 | Merged /trunk/phase3/includes/db/LoadBalancer.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/filerepo/File.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 42 | 42 | Merged /trunk/phase3/includes/filerepo/File.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 43 | 43 | Merged /trunk/phase3/includes/OutputPage.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/HistoryPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 44 | 44 | Merged /trunk/phase3/includes/HistoryPage.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/installer/DatabaseInstaller.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 45 | 45 | Merged /trunk/phase3/includes/installer/DatabaseInstaller.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/installer |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 46 | 46 | Merged /trunk/phase3/includes/installer:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/interwiki/Interwiki.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 47 | 47 | Merged /trunk/phase3/includes/interwiki/Interwiki.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/api/ApiQueryImageInfo.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 48 | 48 | Merged /trunk/phase3/includes/api/ApiQueryImageInfo.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/api/ApiUpload.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 49 | 49 | Merged /trunk/phase3/includes/api/ApiUpload.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/api |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 50 | 50 | Merged /trunk/phase3/includes/api:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/WebRequest.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 51 | 51 | Merged /trunk/phase3/includes/WebRequest.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/resourceloader/ResourceLoader.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 52 | 52 | Merged /trunk/phase3/includes/resourceloader/ResourceLoader.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/media/Exif.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 53 | 53 | Merged /trunk/phase3/includes/media/Exif.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/media/JpegOrTiff.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 54 | 54 | Merged /trunk/phase3/includes/media/JpegOrTiff.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/WebStart.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 55 | 55 | Merged /trunk/phase3/includes/WebStart.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/Revision.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 56 | 56 | Merged /trunk/phase3/includes/Revision.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/AutoLoader.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 57 | 57 | Merged /trunk/phase3/includes/AutoLoader.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/ChangesList.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 58 | 58 | Merged /trunk/phase3/includes/ChangesList.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/Title.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 59 | 59 | Merged /trunk/phase3/includes/Title.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/RawPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 60 | 60 | Merged /trunk/phase3/includes/RawPage.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/ConfEditor.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 61 | 61 | Merged /trunk/phase3/includes/ConfEditor.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/libs/IEUrlExtension.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 62 | 62 | Merged /trunk/phase3/includes/libs/IEUrlExtension.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/specials/SpecialUploadStash.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 63 | 63 | Merged /trunk/phase3/includes/specials/SpecialUploadStash.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/specials/SpecialBlock.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 64 | 64 | Merged /trunk/phase3/includes/specials/SpecialBlock.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 65 | 65 | Merged /trunk/phase3/includes/specials:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/SpecialPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 66 | 66 | Merged /trunk/phase3/includes/SpecialPage.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes/templates/NoLocalSettings.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 67 | 67 | Merged /trunk/phase3/includes/templates/NoLocalSettings.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 68 | 68 | Merged /trunk/phase3/includes:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/img_auth.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 69 | 69 | Merged /trunk/phase3/img_auth.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/index.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 70 | 70 | Merged /trunk/phase3/index.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/api.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 71 | 71 | Merged /trunk/phase3/api.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/load.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 72 | 72 | Merged /trunk/phase3/load.php:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Property changes on: branches/REL1_18/phase3/languages |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 73 | 73 | Merged /trunk/phase3/languages:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |
| Index: branches/REL1_18/phase3/resources/jquery/jquery.tablesorter.js |
| — | — | @@ -80,14 +80,6 @@ |
| 81 | 81 | debug: false |
| 82 | 82 | }; |
| 83 | 83 | |
| 84 | | - /* debuging utils */ |
| 85 | | - // |
| 86 | | - // function benchmark( s, d ) { |
| 87 | | - // console.log( s + " " + ( new Date().getTime() - d.getTime() ) + "ms" ); |
| 88 | | - // } |
| 89 | | - // |
| 90 | | - // this.benchmark = benchmark; |
| 91 | | - // |
| 92 | 84 | /* parsers utils */ |
| 93 | 85 | |
| 94 | 86 | function buildParserCache( table, $headers ) { |
| — | — | @@ -101,7 +93,7 @@ |
| 102 | 94 | l = cells.length; |
| 103 | 95 | |
| 104 | 96 | for ( var i = 0; i < l; i++ ) { |
| 105 | | - p = false; |
| | 97 | + var p = false; |
| 106 | 98 | sortType = $headers.eq(i).data('sort-type'); |
| 107 | 99 | if ( typeof sortType != 'undefined' ) { |
| 108 | 100 | p = getParserById( sortType ); |
| — | — | @@ -110,9 +102,7 @@ |
| 111 | 103 | if (p === false) { |
| 112 | 104 | p = detectParserForColumn( table, rows, i ); |
| 113 | 105 | } |
| 114 | | - // if ( table.config.debug ) { |
| 115 | | - // console.log( "column:" + i + " parser:" + p.id + "\n" ); |
| 116 | | - // } |
| | 106 | + |
| 117 | 107 | list.push(p); |
| 118 | 108 | } |
| 119 | 109 | } |
| — | — | @@ -264,7 +254,7 @@ |
| 265 | 255 | // } |
| 266 | 256 | //var header_index = computeTableHeaderCellIndexes( table ); |
| 267 | 257 | var realCellIndex = 0; |
| 268 | | - $tableHeaders = $( "thead:eq(0) tr", table ); |
| | 258 | + var $tableHeaders = $( "thead:eq(0) tr", table ); |
| 269 | 259 | if ( $tableHeaders.length > 1 ) { |
| 270 | 260 | $tableHeaders.each(function() { |
| 271 | 261 | if (this.cells.length > maxSeen) { |
| — | — | @@ -299,11 +289,6 @@ |
| 300 | 290 | table.config.headerList[index] = this; |
| 301 | 291 | } ); |
| 302 | 292 | |
| 303 | | - // if ( table.config.debug ) { |
| 304 | | - // benchmark( "Built headers:", time ); |
| 305 | | - // console.log( $tableHeaders ); |
| 306 | | - // } |
| 307 | | - // |
| 308 | 293 | return $tableHeaders; |
| 309 | 294 | |
| 310 | 295 | } |
| — | — | @@ -378,19 +363,11 @@ |
| 379 | 364 | mergeSortHelper(array, begin, beginRight, end, sortList); |
| 380 | 365 | } |
| 381 | 366 | |
| 382 | | - var lastSort = ''; |
| 383 | | - |
| 384 | 367 | function multisort( table, sortList, cache ) { |
| 385 | 368 | //var sortTime = new Date(); |
| 386 | 369 | |
| 387 | 370 | var i = sortList.length; |
| 388 | | - if ( i == 1 && sortList[0][0] === lastSort) { |
| 389 | | - // Special case a simple reverse |
| 390 | | - cache.normalized.reverse(); |
| 391 | | - } else { |
| 392 | | - mergeSort(cache.normalized, 0, cache.normalized.length, sortList); |
| 393 | | - } |
| 394 | | - lastSort = ( sortList.length == 1 ) ? sortList[0][0] : ''; |
| | 371 | + mergeSort(cache.normalized, 0, cache.normalized.length, sortList); |
| 395 | 372 | |
| 396 | 373 | //benchmark( "Sorting in dir " + order + " time:", sortTime ); |
| 397 | 374 | |
| — | — | @@ -453,7 +430,7 @@ |
| 454 | 431 | |
| 455 | 432 | //Build RegEx |
| 456 | 433 | //Any date formated with . , ' - or / |
| 457 | | - ts.dateRegex[0] = new RegExp(/^\s*\d{1,2}[\,\.\-\/'\s]*\d{1,2}[\,\.\-\/'\s]*\d{2,4}\s*?/i); |
| | 434 | + ts.dateRegex[0] = new RegExp(/^\s*\d{1,2}[\,\.\-\/'\s]{1,2}\d{1,2}[\,\.\-\/'\s]{1,2}\d{2,4}\s*?/i); |
| 458 | 435 | |
| 459 | 436 | //Written Month name, dmy |
| 460 | 437 | ts.dateRegex[1] = new RegExp('^\\s*\\d{1,2}[\\,\\.\\-\\/\'\\s]*(' + r + ')' + '[\\,\\.\\-\\/\'\\s]*\\d{2,4}\\s*$', 'i'); |
| — | — | @@ -471,23 +448,33 @@ |
| 472 | 449 | var cell = $( this ); |
| 473 | 450 | var next = cell.parent().nextAll(); |
| 474 | 451 | for ( var i = 0; i < rowSpan - 1; i++ ) { |
| 475 | | - next.eq(0).find( 'td' ).eq( this.cellIndex ).before( cell.clone() ); |
| | 452 | + var td = next.eq( i ).find( 'td' ); |
| | 453 | + if ( !td.length ) { |
| | 454 | + next.eq( i ).append( cell.clone() ); |
| | 455 | + } else if ( this.cellIndex == 0 ) { |
| | 456 | + td.eq( this.cellIndex ).before( cell.clone() ); |
| | 457 | + } else { |
| | 458 | + td.eq( this.cellIndex - 1 ).after( cell.clone() ); |
| | 459 | + } |
| 476 | 460 | } |
| 477 | 461 | }); |
| 478 | 462 | } |
| 479 | 463 | |
| 480 | 464 | function buildCollationTable() { |
| 481 | 465 | ts.collationTable = mw.config.get('tableSorterCollation'); |
| 482 | | - if ( typeof ts.collationTable === "object" ) { |
| 483 | | - ts.collationRegex = []; |
| | 466 | + ts.collationRegex = null; |
| | 467 | + if ( ts.collationTable ) { |
| | 468 | + var keys = []; |
| 484 | 469 | |
| 485 | 470 | //Build array of key names |
| 486 | 471 | for ( var key in ts.collationTable ) { |
| 487 | 472 | if ( ts.collationTable.hasOwnProperty(key) ) { //to be safe |
| 488 | | - ts.collationRegex.push(key); |
| | 473 | + keys.push(key); |
| 489 | 474 | } |
| 490 | 475 | } |
| 491 | | - ts.collationRegex = new RegExp( '[' + ts.collationRegex.join('') + ']', 'ig' ); |
| | 476 | + if (keys.length) { |
| | 477 | + ts.collationRegex = new RegExp( '[' + keys.join('') + ']', 'ig' ); |
| | 478 | + } |
| 492 | 479 | } |
| 493 | 480 | } |
| 494 | 481 | |
| — | — | @@ -496,7 +483,7 @@ |
| 497 | 484 | IPAddress: [new RegExp(/^\d{1,3}[\.]\d{1,3}[\.]\d{1,3}[\.]\d{1,3}$/)], |
| 498 | 485 | currency: [new RegExp(/^[£$€?.]/), new RegExp(/[£$€]/g)], |
| 499 | 486 | url: [new RegExp(/^(https?|ftp|file):\/\/$/), new RegExp(/(https?|ftp|file):\/\//)], |
| 500 | | - isoDate: [new RegExp(/^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/)], |
| | 487 | + isoDate: [new RegExp(/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/)], |
| 501 | 488 | usLongDate: [new RegExp(/^[A-Za-z]{3,10}\.? [0-9]{1,2}, ([0-9]{4}|'?[0-9]{2}) (([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(AM|PM)))$/)], |
| 502 | 489 | time: [new RegExp(/^(([0-2]?[0-9]:[0-5][0-9])|([0-1]?[0-9]:[0-5][0-9]\s(am|pm)))$/)] |
| 503 | 490 | }; |
| — | — | @@ -587,14 +574,14 @@ |
| 588 | 575 | config.sortList.push( [i, this.order] ); |
| 589 | 576 | } |
| 590 | 577 | } |
| 591 | | - setTimeout( function () { |
| 592 | | - // set css for headers |
| 593 | | - setHeadersCss( $this[0], $headers, config.sortList, sortCSS, sortMsg ); |
| 594 | | - appendToTable( |
| 595 | | - $this[0], multisort( |
| 596 | | - $this[0], config.sortList, cache ) ); |
| 597 | | - //benchmark( "Sorting " + totalRows + " rows:", clickTime ); |
| 598 | | - }, 1 ); |
| | 578 | + |
| | 579 | + // set css for headers |
| | 580 | + setHeadersCss( $this[0], $headers, config.sortList, sortCSS, sortMsg ); |
| | 581 | + appendToTable( |
| | 582 | + $this[0], multisort( |
| | 583 | + $this[0], config.sortList, cache ) ); |
| | 584 | + //benchmark( "Sorting " + totalRows + " rows:", clickTime ); |
| | 585 | + |
| 599 | 586 | // stop normal event by returning false |
| 600 | 587 | return false; |
| 601 | 588 | } |
| — | — | @@ -731,7 +718,9 @@ |
| 732 | 719 | l = a.length; |
| 733 | 720 | for ( var i = 0; i < l; i++ ) { |
| 734 | 721 | var item = a[i]; |
| 735 | | - if ( item.length == 2 ) { |
| | 722 | + if ( item.length == 1 ) { |
| | 723 | + r += "00" + item; |
| | 724 | + } else if ( item.length == 2 ) { |
| 736 | 725 | r += "0" + item; |
| 737 | 726 | } else { |
| 738 | 727 | r += item; |
| — | — | @@ -795,7 +784,7 @@ |
| 796 | 785 | format: function ( s, table ) { |
| 797 | 786 | s = $.trim( s.toLowerCase() ); |
| 798 | 787 | |
| 799 | | - for ( i = 1, j = 0; i < 13 && j < 2; i++ ) { |
| | 788 | + for ( var i = 1, j = 0; i < 13 && j < 2; i++ ) { |
| 800 | 789 | s = s.replace( ts.monthNames[j][i], i ); |
| 801 | 790 | if ( i == 12 ) { |
| 802 | 791 | j++; |
| — | — | @@ -813,6 +802,7 @@ |
| 814 | 803 | //Pad Month and Day |
| 815 | 804 | if ( s[0] && s[0].length == 1 ) s[0] = "0" + s[0]; |
| 816 | 805 | if ( s[1] && s[1].length == 1 ) s[1] = "0" + s[1]; |
| | 806 | + var y; |
| 817 | 807 | |
| 818 | 808 | if ( !s[2] ) { |
| 819 | 809 | //Fix yearless dates |
| — | — | @@ -859,4 +849,4 @@ |
| 860 | 850 | type: "numeric" |
| 861 | 851 | } ); |
| 862 | 852 | |
| 863 | | -} )( jQuery ); |
| \ No newline at end of file |
| | 853 | +} )( jQuery ); |
| Property changes on: branches/REL1_18/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 864 | 854 | Merged /trunk/phase3:r90602,90612,90618,90626,90630-90631,90637,90655,90657,90666,90812 |