aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'p/ticket/11248' into develop-olympusIgor Wiedler2012-12-071-51/+50
|\
| * [ticket/11248] Line endings to LF.Oleg Pudeyev2012-12-051-51/+50
* | Merge PR #1101 branch 'Noxwizard/ticket/11219' into develop-olympusOleg Pudeyev2012-12-063-1/+181
|\ \ | |/ |/|
| * [ticket/11219] Coding guidelines and naming consistency changesPatrick Webster2012-12-052-12/+14
| * [ticket/11219] Only update sequences that are affected by a fixturePatrick Webster2012-12-012-36/+55
| * [ticket/11219] Recreate Oracle sequences instead of altering themPatrick Webster2012-11-201-53/+18
| * [ticket/11219] Add unit test for inserting into a sequence columnJoas Schilling2012-11-191-0/+55
| * [ticket/11219] Update sequence values after loading fixturesPatrick Webster2012-11-182-0/+139
* | Merge PR #1053 branch 'p/ticket/10841' into develop-olympusOleg Pudeyev2012-12-053-6/+42
|\ \
| * | [ticket/10841] Revert more whitespace changes.Oleg Pudeyev2012-12-051-2/+2
| * | [ticket/10841] Revert whitespace changes.Oleg Pudeyev2012-12-052-20/+20
| * | [ticket/10841] adding space after ifSenky2012-12-051-2/+2
| * | [ticket/10841] removing unnecessary spacingSenky2012-12-051-2/+2
| * | [ticket/10841] changing affectedrows check to COUNT in sqlSenky2012-12-051-6/+8
| * | [ticket/10841] Modifying style and language selectors in UCPSenky2012-12-053-28/+62
|/ /
* | Merge remote-tracking branch 'p/ticket/10602' into develop-olympusAndreas Fischer2012-12-051-3/+10
|\ \
| * | [ticket/10602] Avoid a race condition.Oleg Pudeyev2012-12-051-2/+4
| * | [ticket/10602] Use last_queue_run for its intended purpose.Oleg Pudeyev2012-12-051-3/+8
|/ /
* | Merge remote-tracking branch 'p/ticket/10716' into develop-olympusAndreas Fischer2012-12-051-0/+74
|\ \
| * | [ticket/10716] Collect standard error from executed php process.Oleg Pudeyev2012-12-041-2/+3
| * | [ticket/10716] Skip test if php is not in PATH.Oleg Pudeyev2012-12-041-0/+8
| * | [ticket/10716] Exclude our dependencies from linting.Oleg Pudeyev2012-12-041-1/+12
| * | [ticket/10716] Only lint on php 5.3+.Oleg Pudeyev2012-12-041-0/+5
| * | [ticket/10716] php parse all php files as part of the test suite.Oleg Pudeyev2012-12-041-0/+49
|/ /
* | Merge PR #1112 branch 'bantu/ticket/11240' into develop-olympusOleg Pudeyev2012-12-042-0/+2
|\ \
| * | [ticket/11240] Enable PHPUnit's verbose mode so we get a list of skipped tests.Andreas Fischer2012-12-042-0/+2
|/ /
* | Merge remote-tracking branch 'p/ticket/11238-olympus' into develop-olympusAndreas Fischer2012-12-032-32/+433
|\ \
| * | [ticket/11238] Set goutte version to 0.1.0.Oleg Pudeyev2012-12-022-32/+433
|/ /
* | Merge PR #893 branch 'nickvergessen/ticket/10184' into develop-olympusOleg Pudeyev2012-12-012-0/+21
|\ \
| * | [ticket/10184] Query bots table to get the user_ids of the botsJoas Schilling2012-12-011-4/+18
| * | [ticket/10184] Disable receiving pms for bots by defaultJoas Schilling2012-12-012-0/+7
* | | Merge remote-tracking branch 'p/ticket/11227' into develop-olympusAndreas Fischer2012-11-2914-18/+18
|\ \ \ | |_|/ |/| |
| * | [ticket/11227] @return void -> @return null in develop-olympus.Oleg Pudeyev2012-11-2914-18/+18
|/ /
* | Merge PR #1074 branch 'bantu/ticket/11192' into develop-olympusOleg Pudeyev2012-11-163-1/+81
|\ \
| * | [ticket/11192] Merge dataProvider arrays because the test is the same now.Andreas Fischer2012-11-161-15/+1
| * | [ticket/11192] Update $value parameter description to support other types.Andreas Fischer2012-11-161-1/+2
| * | [ticket/11192] Mark negative byte numbers as unsupported.Andreas Fischer2012-11-162-17/+1
| * | [ticket/11192] Test strings not converted to int/float before.Andreas Fischer2012-11-161-2/+36
| * | [ticket/11192] Also test strings, e.g. sums returned by the database.Andreas Fischer2012-11-161-0/+10
| * | [ticket/11192] Also test powers of 10 / 1000.Andreas Fischer2012-11-161-0/+7
| * | [ticket/11192] Add tests.Oleg Pudeyev2012-11-151-0/+50
| * | [ticket/11192] Add Tebibyte to get_formatted_filesize().Andreas Fischer2012-11-112-0/+8
* | | Merge PR #1060 branch 'nickvergessen/ticket/11186' into develop-olympusOleg Pudeyev2012-11-151-6/+0
|\ \ \
| * | | [ticket/11186] Database unit tests fail on windows using sqlite2Joas Schilling2012-11-101-6/+0
| | |/ | |/|
* | | Merge remote-tracking branch 'p/ticket/11202-olympus' into develop-olympusAndreas Fischer2012-11-152-1/+19
|\ \ \
| * | | [ticket/11202] Custom message does not make sense here, delete it.Oleg Pudeyev2012-11-151-2/+2
| * | | [ticket/11202] Check response success before content assertions.Oleg Pudeyev2012-11-151-0/+3
| * | | [ticket/11202] Add a heuristic function to check for response success.Oleg Pudeyev2012-11-151-1/+16
* | | | Merge PR #1069 branch 'Fyorl/ticket/11190' into develop-olympusOleg Pudeyev2012-11-151-0/+23
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/11190] Functional tests purge cache before running.Fyorl2012-11-111-0/+23
| | |/ | |/|