aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [task/config-class] Fix db config constructor param orderIgor Wiedler2011-01-112-8/+8
* [task/config-class] Implemented a config class to replace the global array.Nils Adermann2011-01-1020-154/+703
* Merge branch 'ticket/nickvergessen/6109' into developIgor Wiedler2011-01-106-8/+8
|\
| * [ticket/6109] WLM subsilver2 button in the english language package.Joas Schilling2011-01-101-0/+0
| * [ticket/6109] MSN is now called Windows Live Messenger (WLM)Joas Schilling2011-01-105-8/+8
|/
* Merge branch 'develop-olympus' into developIgor Wiedler2011-01-1022-4/+3
|\
| * Merge branch 'ticket/igorw/9987' into develop-olympusIgor Wiedler2011-01-1015-1/+1
| |\
| | * [ticket/9987] Rename test files to include a _test suffixIgor Wiedler2011-01-1015-1/+1
| |/
* | Merge branch 'task/acm-refactor' into developIgor Wiedler2011-01-0925-127/+399
|\ \
| * | [task/acm-refactor] Cleaning up left over mentions of ACM and fixing tests.Nils Adermann2011-01-0913-117/+76
| * | [task/acm-refactor] Refactor the ACM classes to have a common interface.Igor Wiedler2011-01-0923-102/+415
| * | [ticket/9979] Support autoloading in unit testsIgor Wiedler2011-01-097-16/+16
| * | [ticket/9981] Fix unit test dependenciesIgor Wiedler2011-01-092-0/+2
* | | Merge branch 'ticket/igorw/9979' into developIgor Wiedler2011-01-097-16/+16
|\ \ \
| * | | [ticket/9979] Support autoloading in unit testsIgor Wiedler2011-01-077-16/+16
* | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-01-092-0/+2
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Merge branch 'ticket/igorw/9981' into develop-olympusIgor Wiedler2011-01-092-0/+2
| |\ \
| | * | [ticket/9981] Fix unit test dependenciesIgor Wiedler2011-01-072-0/+2
| |/ /
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-01-074-18/+86
|\ \ \ | |/ /
| * | Merge branch 'ticket/rxu/9933' into develop-olympusAndreas Fischer2011-01-074-18/+86
| |\ \
| | * | [ticket/9933] Create unit test for word censor regular expression.rxu2011-01-071-0/+40
| | * | [ticket/9933] Move word censor regex into separate function in functions.phprxu2011-01-072-18/+43
| | * | [ticket/9933] Wrong handling consecutive multiple asterisks in word censorrxu2011-01-072-2/+5
| |/ /
* | | Merge branch 'develop-olympus' into developNils Adermann2011-01-071-2/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Merge branch 'task/naderman/phpdoc' into develop-olympusNils Adermann2011-01-071-2/+2
| |\
| | * [task/phpdoc] Make phpdoctor output quiet instead of verbose.Nils Adermann2011-01-071-2/+2
* | | Merge branch 'develop-olympus' into developNils Adermann2011-01-072-105/+150
|\ \ \ | |/ /
| * | Merge branch 'task/naderman/phpdoc' into develop-olympusNils Adermann2011-01-072-105/+150
| |\ \ | | |/
| | * [task/phpdoc] Switching from phpDocumentor to phpdoctor.Nils Adermann2011-01-072-105/+150
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-01-0747-678/+128
|\ \ \ | |/ /
| * | Merge branch 'task/phpunit-xml' into develop-olympusIgor Wiedler2011-01-0735-506/+103
| |\ \
| | * | [task/phpunit-xml] Manually blacklisting a few PHPUnit classes from backups.Nils Adermann2011-01-072-0/+30
| | * | [task/phpunit-xml] Only blacklist the tests directory and do not whitelist.Nils Adermann2011-01-071-9/+0
| | * | [task/phpunit-xml] Force error reporting level E_ALL | ~E_DEPRECATED.Nils Adermann2011-01-071-0/+2
| | * | [task/phpunit-xml] Use phpunit.xml for test suiteIgor Wiedler2011-01-0434-506/+80
| * | | Merge branch 'ticket/bantu/9589' into develop-olympusAndreas Fischer2011-01-051-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/9589] nginx.conf.sample -> nginx.sample.confAndreas Fischer2011-01-051-0/+0
* | | | Merge branch 'ticket/bantu/9746' into developIgor Wiedler2011-01-038-5/+331
|\ \ \ \
| * | | | [ticket/9746] Adding some more calls to phpbb_ip_normalise().Andreas Fischer2011-01-033-5/+7
| * | | | [ticket/9746] Update documentation of phpbb_inet_pton().Andreas Fischer2011-01-031-1/+2
| * | | | [ticket/9746] Ease up phpbb_ip_normalise() function.Andreas Fischer2011-01-031-20/+1
| * | | | [ticket/9746] Added PHP implementation of inet_pton and inet_ntop.Marek A. RuszczyƄski2011-01-032-7/+136
| * | | | [ticket/9746] Adding wrapper functions for inet_ntop() and inet_pton().Andreas Fischer2011-01-031-1/+32
| * | | | [ticket/9746] Adding unit tests for inet_ntop() and inet_pton().Andreas Fischer2011-01-032-0/+44
| * | | | [ticket/9746] Adding calls to phpbb_ip_normalise() from session management.Andreas Fischer2011-01-031-0/+18
| * | | | [ticket/9746] Adding new function phpbb_ip_normalise().Andreas Fischer2011-01-031-0/+53
| * | | | [ticket/9746] Adding tests for phpbb_ip_normalise().Andreas Fischer2011-01-032-0/+67
|/ / / /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-12-296-6/+6
|\ \ \ \ | |/ / /
| * | | Merge branch 'ticket/bantu/9859' into develop-olympusAndreas Fischer2010-12-292-2/+2
| |\ \ \
| | * | | [ticket/9859] Remove years from the credit line.Andreas Fischer2010-12-162-2/+2