aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ticket/bantu/9166' into develop-olympusOleg Pudeyev2011-01-274-11/+35
|\
| * [ticket/9166] Fixed CSS element order in subsilver.Schnorrer422011-01-281-4/+10
| * [ticket/9166] Fixed CSS element order in prosilver.Schnorrer422011-01-283-7/+25
|/
* Merge branch 'ticket/bantu/10007' into develop-olympusOleg Pudeyev2011-01-261-0/+2
|\
| * [ticket/10007] Add directive 'internal' to blocked folders in nginx config.Andreas Fischer2011-01-241-0/+2
|/
* Merge branch 'task/naderman/session-tests' into develop-olympusNils Adermann2011-01-238-1/+378
|\
| * [task/session-tests] Renamed assertSqlResultEquals and fixed its param orderNils Adermann2011-01-211-1/+1
| * [task/session-tests] Test additional combinations of session_begin.Nils Adermann2011-01-201-12/+46
| * [task/session-tests] Added tests for the session class.Nils Adermann2011-01-208-1/+344
* | Merge branch 'ticket/rxu/8779' into develop-olympusNils Adermann2011-01-231-2/+3
|\ \ | |/ |/|
| * [ticket/8779] Slow search for 'View unread posts'rxu2011-01-241-2/+3
|/
* Merge branch 'ticket/bantu/9859' into develop-olympusNils Adermann2011-01-1628-150/+31
|\
| * [ticket/9859] Remove the years from the copyright statements in docs files.Andreas Fischer2011-01-168-8/+8
| * [ticket/9859] Remove the year from the copyright meta tag in docs/*.htmlAndreas Fischer2011-01-167-7/+7
| * [ticket/9859] Remove the meta copyright tag as well.Andreas Fischer2011-01-165-5/+0
| * [ticket/9859] Remove the credit line comment from all html files.Andreas Fischer2011-01-1611-116/+2
| * [ticket/9859] Remove years in credit line from some more files.Andreas Fischer2011-01-1614-14/+14
* | Merge branch 'ticket/bantu/9933' into develop-olympusIgor Wiedler2011-01-162-17/+27
|\ \ | |/ |/|
| * [ticket/9933] Remove empty word check.rxu2011-01-161-5/+0
| * [ticket/9933] Add $use_unicode parameter to get_censor_preg_expression().Andreas Fischer2011-01-162-8/+19
| * [ticket/9933] Adjust word censor regex for non-unicode mode.rxu2011-01-161-4/+8
|/
* Merge branch 'ticket/igorw/9990' into develop-olympusNils Adermann2011-01-127-2/+364
|\
| * [ticket/9990] Add docs for running slow testsIgor Wiedler2011-01-122-0/+34
| * [ticket/9990] Integrate utf normalizer tests into test suiteIgor Wiedler2011-01-115-2/+330
* | Merge branch 'ticket/bantu/9764' into develop-olympusIgor Wiedler2011-01-103-4/+4
|\ \ | |/ |/|
| * [ticket/9764] Allow $config['mime_triggers'] to be an empty string.Andreas Fischer2010-10-283-4/+4
* | 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 'ticket/igorw/9981' into develop-olympusIgor Wiedler2011-01-092-0/+2
|\ \
| * | [ticket/9981] Fix unit test dependenciesIgor Wiedler2011-01-072-0/+2
|/ /
* | 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 '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 '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 '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/9859' into develop-olympusAndreas Fischer2010-12-292-2/+2
|\ \ \ \
| * | | | [ticket/9859] Remove years from the credit line.Andreas Fischer2010-12-162-2/+2
* | | | | Merge branch 'ticket/bantu/9348' into develop-olympusAndreas Fischer2010-12-291-1/+1
|\ \ \ \ \
| * | | | | [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.Richard Foote2010-12-281-1/+1
* | | | | | Merge branch 'ticket/noxwizard/9953' into develop-olympusAndreas Fischer2010-12-292-2/+2
|\ \ \ \ \ \