aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ticket/11568' into ticket/11568-developJoas Schilling2013-05-301-20/+4
|\
| * [ticket/11568] Remove unused methodJoas Schilling2013-05-301-19/+0
| * [ticket/11568] Only assert string when doctype is there at allJoas Schilling2013-05-301-1/+4
* | [ticket/develop/11568] Fix some more tests in 3.1Joas Schilling2013-05-303-6/+7
* | [ticket/develop/11568] Remove php extension parameterJoas Schilling2013-05-301-1/+1
* | [ticket/develop/11568] Remove unneccessary calls to assert_response_success()Joas Schilling2013-05-289-26/+2
* | [ticket/develop/11568] Do not directly access $client from testsJoas Schilling2013-05-286-17/+13
* | Merge branch 'ticket/11568' into ticket/11568-developJoas Schilling2013-05-285-64/+133
|\ \ | |/
| * [ticket/11568] Add method to get page contentJoas Schilling2013-05-281-0/+10
| * [ticket/11568] Allow different status codesJoas Schilling2013-05-281-2/+2
| * [ticket/11568] Trim the output to allow Tabs before INCLUDE overall_headerJoas Schilling2013-05-281-1/+1
| * [ticket/11568] Fix common_groups_test.php form handlingJoas Schilling2013-05-271-2/+1
| * [ticket/11568] Make CookieJar static aswellJoas Schilling2013-05-271-6/+7
| * [ticket/11568] Remove manual calls to assert_response_success()Joas Schilling2013-05-273-11/+1
| * [ticket/11568] Only use a static version of the clientJoas Schilling2013-05-271-59/+60
| * [ticket/11568] Any output before the doc type means there was an errorJoas Schilling2013-05-271-8/+6
| * [ticket/11568] Set client manually so we can increase the cURL timeoutJoas Schilling2013-05-271-0/+7
| * [ticket/11568] Use Goutte Client to install the board for functional testsJoas Schilling2013-05-271-39/+105
* | Merge remote-tracking branch 'nickvergessen/ticket/encryptedmind/11516' into ...Andreas Fischer2013-05-281-1/+1
|\ \
| * | [ticket/11516] Upgrading the .live jquery function because it is deprecated.Jesús Rafael Cova Huerta2013-05-281-1/+1
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-281-1/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'nickvergessen/ticket/11580' into develop-olympusAndreas Fischer2013-05-281-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/11580] Enable prefer-source option (should error way less)Joas Schilling2013-05-271-1/+1
| | * | [ticket/11580] Enable --no-interaction option on composer for travisJoas Schilling2013-05-271-1/+1
| |/ /
* | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-271-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Merge remote-tracking branch 'marc1706/ticket/11578' into develop-olympusJoas Schilling2013-05-271-1/+1
| |\
| | * [ticket/11578] Add missing underscore after 'validate' function prefixmarc17062013-05-271-1/+1
| |/
* | Merge remote-tracking branch 'bantu/ticket/11573' into developJoas Schilling2013-05-272-0/+20
|\ \
| * | [ticket/11573] Honor MySQL STRICT_TRANS_TABLES in phpbb_user_loader_test.Andreas Fischer2013-05-271-0/+16
| * | [ticket/11573] Honor MySQL STRICT_TRANS_TABLES in test_style_select.Andreas Fischer2013-05-271-0/+4
* | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-271-0/+14
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'bantu/ticket/11576' into develop-olympusJoas Schilling2013-05-271-0/+14
| |\ \
| | * | [ticket/11576] MySQL unit tests: Enable STRICT_TRANS_TABLES and others.Andreas Fischer2013-05-271-0/+14
* | | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-270-0/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge remote-tracking branch 'bantu/ticket/11575' into develop-olympusJoas Schilling2013-05-271-1/+1
| |\ \ | | |/ | |/|
| | * [ticket/11575] Correct test_cross_join() to test_order_lower().Andreas Fischer2013-05-271-1/+1
* | | Merge branch 'develop-olympus' into developJoas Schilling2013-05-273-15/+126
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'remotes/bantu/ticket/11538' into develop-olympusJoas Schilling2013-05-273-15/+126
| |\ \ | | |/ | |/|
| | * [ticket/11538] Cut functional tests down a bit as these are more expensive.Andreas Fischer2013-05-261-14/+4
| | * [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass.Andreas Fischer2013-05-261-1/+1
| | * [ticket/11538] Add unit tests for phpbb_validate_hex_colour().Andreas Fischer2013-05-261-0/+121
| |/
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-268-20/+153
|\ \ | |/
| * Merge remote-tracking branch 'marc1706/ticket/11538' into develop-olympusAndreas Fischer2013-05-268-7/+145
| |\
| | * [ticket/11538] Add optional switch as argument to hex colour validationMarc Alexander2013-05-193-5/+7
| | * [ticket/11538] Modify test colour valuesMarc Alexander2013-05-191-2/+3
| | * [ticket/11538] Limit comment in acp_groups to 80 characters per lineMarc Alexander2013-05-191-4/+4
| | * [ticket/11538] Move group ID into abstract test class and add more test casesMarc Alexander2013-05-193-3/+7
| | * [ticket/11538] Merge calls to validate_data() in acp_groupsMarc Alexander2013-05-191-11/+12
| | * [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colourMarc Alexander2013-05-193-4/+5
| | * [ticket/11538] Use abstract class for functional test cases for group colourMarc Alexander2013-05-173-63/+60