aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1403 from bantu/ticket/11105Nils Adermann2013-05-122-2/+2
|\
| * [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.gamerchan2013-05-122-2/+2
* | Merge pull request #1396 from bantu/ticket/11324Nils Adermann2013-05-091-4/+0
|\ \ | |/ |/|
| * [ticket/11324] PHP 5.5 is in RC stage. No longer allow failure on travis.Andreas Fischer2013-05-091-4/+0
* | Merge remote-tracking branch 'naderman/ticket/11529' into develop-olympusAndreas Fischer2013-05-091-3/+5
|\ \ | |/ |/|
| * [ticket/11529] Format markdown code correctlyNils Adermann2013-05-091-3/+5
| * [ticket/11529] Rename RUNNING_TESTS.txt to RUNNING_TESTS.mdNils Adermann2013-05-091-0/+0
|/
* Merge pull request #1387 from bantu/ticket/11513Nils Adermann2013-05-096-17/+483
|\
| * [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.Andreas Fischer2013-05-091-3/+8
| * [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.Andreas Fischer2013-05-093-7/+9
| * [ticket/11513] Use PHPUnit from composer in .travis.yml.Andreas Fischer2013-05-091-5/+3
| * [ticket/11513] Update (all) composer dependencies.Andreas Fischer2013-05-091-1/+460
| * [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.Andreas Fischer2013-05-091-1/+3
|/
* Merge pull request #1393 from bantu/ticket/11526Nils Adermann2013-05-092-145/+135
|\
| * [ticket/11526] Update all dependencies / regenerate composer.lock.Andreas Fischer2013-05-091-144/+135
| * [ticket/11526] Increase composer minimum stability in olympus to stable.Andreas Fischer2013-05-091-1/+0
| * Merge branch 'ticket/11527' into ticket/11526Andreas Fischer2013-05-091-0/+0
| |\
* | \ Merge pull request #1392 from bantu/ticket/11527Nils Adermann2013-05-091-0/+0
|\ \ \ | |/ / |/| / | |/
| * [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.Andreas Fischer2013-05-091-0/+0
|/
* Merge remote-tracking branch 'MGaetan89/ticket/11144' into develop-olympusAndreas Fischer2013-05-067-28/+42
|\
| * [ticket/11144] Add missing {FORUM_NAME} variableGaëtan Muller2013-05-061-1/+1
| * [ticket/11144] Add missing {FORUM_NAME} variableGaëtan Muller2013-05-067-28/+42
* | Merge remote-tracking branch 'hjpotter92/ticket/11517' into develop-olympusAndreas Fischer2013-05-021-1/+1
|\ \
| * | [ticket/11517] Fix list numberinghjpotter922013-05-021-1/+1
|/ /
* | Merge pull request #1358 from MGaetan89/ticket/9975Nils Adermann2013-04-242-1/+2
|\ \ | |/ |/|
| * [ticket/9975] Translate missing style error messageGaëtan Muller2013-04-212-1/+2
|/
* Merge remote-tracking branch 'dhruvgoel92/ticket/11493' into develop-olympusAndreas Fischer2013-04-151-0/+3
|\
| * [ticket/11493] add checks for Notice and WarningDhruv2013-04-151-0/+2
| * [ticket/11493] add check for phpBB Debug in functional testsDhruv2013-04-151-0/+1
* | Merge branch 'ticket/11358' into develop-olympusNils Adermann2013-04-121-41/+42
|\ \ | |/ |/|
| * [ticket/11358] Removed all trailing white spaces.erangamapa2013-04-121-4/+4
| * [ticket/11358] Fixed the code according to coding guidlines.erangamapa2013-04-121-42/+43
* | Merge remote-tracking branch 'remotes/marc/ticket/6723' into develop-olympusNathaniel Guse2013-03-022-2/+2
|\ \
| * | [ticket/6723] Show info that message has been deleted before deliveryMarc Alexander2013-03-032-2/+2
* | | Merge remote-tracking branch 'remotes/bantu/ticket/11368' into develop-olympusNathaniel Guse2013-03-021-1/+1
|\ \ \ | |/ / |/| |
| * | [ticket/11368] Fix background color for PM report rows by using accessing var.Andreas Fischer2013-02-261-1/+1
|/ /
* | Merge remote-tracking branch 'naderman/ticket/10986' into develop-olympusAndreas Fischer2013-02-241-1/+23
|\ \
| * | [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generatedNils Adermann2013-02-241-1/+23
|/ /
* | Merge branch 'ticket/11358' into develop-olympusNils Adermann2013-02-241-18/+32
|\ \ | |/
| * [ticket/11358] Changed the name of post parameter.erangamapa2013-02-241-2/+2
| * [ticket/11358] Changed the action parameter value to represent the link.erangamapa2013-02-241-20/+30
| * [ticket/11358] Enabled link making all users default for a group.erangamapa2013-02-241-2/+40
| * [ticket/11358] Removed redundant code and referred proper variable.erangamapa2013-02-241-40/+2
| * [ticket/11358] Success message even without selecting a user.erangamapa2013-02-241-0/+4
|/
* Merge branch 'ticket/11355' into develop-olympusNils Adermann2013-02-241-1/+5
|\
| * [ticket/11355] Referred proper variable when validating selection.erangamapa2013-02-241-1/+1
| * [ticket/11355] Wrong error message when no user is selected.erangamapa2013-02-241-1/+5
|/
* Merge remote-tracking branch 'github-bantu/ticket/11361' into develop-olympusNils Adermann2013-02-241-1/+2
|\
| * [ticket/11361] Make sure that array passed to strtr() has the proper format.Andreas Fischer2013-02-231-1/+2
* | Merge remote-tracking branch 'github-exreaction/ticket/10896' into develop-ol...Nils Adermann2013-02-244-3/+10
|\ \