aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11538] Add optional switch as argument to hex colour validationMarc Alexander2013-05-193-5/+7
| | | | | | | | | The value of $optional will decide whether an empty string will be treated as incorrect input or if it is allowed. The optional argument will default to false and therefore treat an empty string as incorrect unless explicitly told to not do so. PHPBB3-11538
* [ticket/11538] Modify test colour valuesMarc Alexander2013-05-191-2/+3
| | | | PHPBB3-11538
* [ticket/11538] Limit comment in acp_groups to 80 characters per lineMarc Alexander2013-05-191-4/+4
| | | | PHPBB3-11538
* [ticket/11538] Move group ID into abstract test class and add more test casesMarc Alexander2013-05-193-3/+7
| | | | | | | The group ID is defined in the abstract class now and additional test cases for hex colour values have been added. PHPBB3-11538
* [ticket/11538] Merge calls to validate_data() in acp_groupsMarc Alexander2013-05-191-11/+12
| | | | PHPBB3-11538
* [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colourMarc Alexander2013-05-193-4/+5
| | | | PHPBB3-11538
* [ticket/11538] Use abstract class for functional test cases for group colourMarc Alexander2013-05-173-63/+60
| | | | PHPBB3-11538
* Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ↵Marc Alexander2013-05-179-3/+235
|\ | | | | | | ticket/11538
| * Merge remote-tracking branch 'bantu/ticket/11547' into develop-olympusAndreas Fischer2013-05-171-0/+8
| |\ | | | | | | | | | | | | * bantu/ticket/11547: [ticket/11547] Set MySQL charset to UTF8 in database_test_connection_manager.
| | * [ticket/11547] Set MySQL charset to UTF8 in database_test_connection_manager.Andreas Fischer2013-05-171-0/+8
| | | | | | | | | | | | PHPBB3-11547
| * | Merge remote-tracking branch 'nickvergessen/ticket/11542-2' into develop-olympusAndreas Fischer2013-05-172-7/+7
| |\ \ | | | | | | | | | | | | | | | | * nickvergessen/ticket/11542-2: [ticket/11542] Use Czech as example as it contains non-latin characters
| | * | [ticket/11542] Use Czech as example as it contains non-latin charactersJoas Schilling2013-05-172-7/+7
| |/ / | | | | | | | | | PHPBB3-11542
| * | Merge remote-tracking branch 'marc1706/ticket/11544' into develop-olympusAndreas Fischer2013-05-171-0/+44
| |\ \ | | |/ | |/| | | | | | | * marc1706/ticket/11544: [ticket/11544] Add admin_login() method to 3.0 functional test case
| | * [ticket/11544] Add admin_login() method to 3.0 functional test caseMarc Alexander2013-05-141-0/+44
| | | | | | | | | | | | | | | | | | This method is needed in order to be able to properly test acp functions. PHPBB3-11544
| * | Merge remote-tracking branch 'nickvergessen/ticket/11542' into develop-olympusAndreas Fischer2013-05-172-0/+60
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11542: [ticket/11542] Add non-existing default value for language select [ticket/11542] Add lang_english_name to fixture [ticket/11542] Add unit tests for language_select()
| | * | [ticket/11542] Add non-existing default value for language selectJoas Schilling2013-05-161-0/+1
| | | | | | | | | | | | | | | | PHPBB3-11542
| | * | [ticket/11542] Add lang_english_name to fixtureJoas Schilling2013-05-151-0/+3
| | | | | | | | | | | | | | | | PHPBB3-11542
| | * | [ticket/11542] Add unit tests for language_select()Joas Schilling2013-05-142-0/+56
| | | | | | | | | | | | | | | | PHPBB3-11542
| * | | Merge remote-tracking branch 'galaxyAbstractor/ticket/11536' into ↵Andreas Fischer2013-05-161-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * galaxyAbstractor/ticket/11536: [ticket/11536] Fixed incorrect removal of "install" in script_path
| | * | | [ticket/11536] Fixed incorrect removal of "install" in script_pathVictor Nagy2013-05-151-2/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier the script would incorrectly remove the word "install" from the script_path when trying to remove the last folder in the path named "/install". This would lead to issues when the path you are installing phpBB contained "install". For example "/install_test/install" would become "/_test". This change gets the parent folder instead of replacing all "install". $name contains /install_test/install/index.php from start and running dirname() gives /install_test/install. Running dirname once more gives the parent folder of install, /install_test. PHPBB3-11536
| * | | Merge remote-tracking branch 'nickvergessen/ticket/11545' into develop-olympusAndreas Fischer2013-05-162-5/+26
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11545: [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute
| | * | | [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absoluteJoas Schilling2013-05-162-5/+26
| |/ / / | | | | | | | | | | | | | | | | | | | | The given path is an absolute path in general, just not on our current system. PHPBB3-11545
| * | | Merge remote-tracking branch 'nickvergessen/ticket/11541' into develop-olympusAndreas Fischer2013-05-152-0/+64
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11541: [ticket/11541] Add unit tests for style_select()
| | * | | [ticket/11541] Add unit tests for style_select()Joas Schilling2013-05-142-0/+64
| | | |/ | | |/| | | | | | | | | PHPBB3-11541
| * | | Merge remote-tracking branch 'nickvergessen/ticket/11546' into develop-olympusAndreas Fischer2013-05-152-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11546: [ticket/11546] Fix is_absolute() throws E_NOTICE for empty string
| | * | | [ticket/11546] Fix is_absolute() throws E_NOTICE for empty stringJoas Schilling2013-05-152-1/+2
| |/ / / | | | | | | | | | | | | PHPBB3-11546
| * | | Merge remote-tracking branch 'nickvergessen/ticket/11540' into develop-olympusAndreas Fischer2013-05-151-0/+34
| |\ \ \ | | |_|/ | |/| | | | | | | | | | * nickvergessen/ticket/11540: [ticket/11540] Add unit tests for is_absolute()
| | * | [ticket/11540] Add unit tests for is_absolute()Joas Schilling2013-05-141-0/+34
| | |/ | | | | | | | | | PHPBB3-11540
* | | [ticket/11538] Add function phpbb_validate_colour for validating coloursMarc Alexander2013-05-163-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | It will be possible to use this function via the validate_data() function interface that has already been used previously. Thus, this new function will extend the capabilities of validate_data() to checking hex color values. PHPBB3-11538
* | | [ticket/11538] Make sure regex doesn't allow multiple color valuesMarc Alexander2013-05-154-2/+8
| | | | | | | | | | | | | | | | | | | | | This will now make sure that 'AAFF00' will be matched but strings like 'AAFF00 AABB00' will not. PHPBB3-11538
* | | [ticket/11538] Add tests for acp group manage pageMarc Alexander2013-05-141-0/+45
| | | | | | | | | | | | | | | | | | This will currently test if the colour check properly works. PHPBB3-11538
* | | [ticket/11538] Simplify colour value check and remove support for '#'Marc Alexander2013-05-145-21/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The input length for the hex color is now limited to 6 characters and the support for colors starting with a '#' has been dropped. The allowed input length of 7 in prosilver seems to have been a relict from old ages of phpBB3. In order to have proper support for correct checking of the colour value, the new code was also ported to the ACP groups manage page. The tests have been modified to reflect the changes to the behavior of the color check. Tests for the ACP will follow. PHPBB3-11538
* | | [ticket/11538] Fix incorrect regex and test for duplicate # in color stringMarc Alexander2013-05-142-1/+2
| | | | | | | | | | | | PHPBB3-11538
* | | [ticket/11538] Use regex for testing color value and improve testsMarc Alexander2013-05-143-42/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | We are now using a regex with preg_match() in order to properly check if the entered color value is in hex color format or not. A proper error message is triggered if an incorrect color value is entered and the prepended '#' is removed if necessary. PHPBB3-11538
* | | [ticket/11538] Make sure group color can't exceed maximum of 6 charactersMarc Alexander2013-05-142-0/+71
|/ / | | | | | | | | | | | | In order to prevent future issues with this, a basic set of functional tests for the UCP groups manage page have been added. PHPBB3-11538
* | Merge pull request #1403 from bantu/ticket/11105Nils Adermann2013-05-122-2/+2
|\ \ | |/ |/| [ticket/11105] Add mandatory space to content part of meta http-equiv=re...
| * [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.gamerchan2013-05-122-2/+2
| | | | | | | | | | | | | | | | There was no space between ; and the string "url=". But according to w3c, we should have atleast one space between them. So, added space characters accordingly. PHPBB3-11105
* | Merge pull request #1396 from bantu/ticket/11324Nils Adermann2013-05-091-4/+0
|\ \ | |/ |/| [ticket/11324] PHP 5.5 is in RC state. No longer allow failure on travis...
| * [ticket/11324] PHP 5.5 is in RC stage. No longer allow failure on travis.Andreas Fischer2013-05-091-4/+0
| | | | | | | | PHPBB3-11324
* | Merge remote-tracking branch 'naderman/ticket/11529' into develop-olympusAndreas Fischer2013-05-091-3/+5
|\ \ | |/ |/| | | | | | | * naderman/ticket/11529: [ticket/11529] Format markdown code correctly [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.md
| * [ticket/11529] Format markdown code correctlyNils Adermann2013-05-091-3/+5
| | | | | | | | PHPBB3-11529
| * [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.mdNils Adermann2013-05-091-0/+0
|/ | | | PHPBB3-11529
* Merge pull request #1387 from bantu/ticket/11513Nils Adermann2013-05-096-17/+483
|\ | | | | [ticket/11513] Install PHPUnit via Composer
| * [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.Andreas Fischer2013-05-091-3/+8
| | | | | | | | PHPBB3-11513
| * [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.Andreas Fischer2013-05-093-7/+9
| | | | | | | | PHPBB3-11513
| * [ticket/11513] Use PHPUnit from composer in .travis.yml.Andreas Fischer2013-05-091-5/+3
| | | | | | | | PHPBB3-11513
| * [ticket/11513] Update (all) composer dependencies.Andreas Fischer2013-05-091-1/+460
| | | | | | | | PHPBB3-11513
| * [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.Andreas Fischer2013-05-091-1/+3
|/ | | | PHPBB3-11513
* Merge pull request #1393 from bantu/ticket/11526Nils Adermann2013-05-092-145/+135
|\ | | | | [ticket/11526] Increase composer minimum-stability from beta to stable
| * [ticket/11526] Update all dependencies / regenerate composer.lock.Andreas Fischer2013-05-091-144/+135
| | | | | | | | PHPBB3-11526