aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9675] Add option to delete template/theme/imageset when deleting style.Joas Schilling2011-02-083-2/+121
| | | | PHPBB3-9675
* Merge branch 'ticket/bantu/10007' into develop-olympusOleg Pudeyev2011-01-261-0/+2
|\ | | | | | | | | * ticket/bantu/10007: [ticket/10007] Add directive 'internal' to blocked folders in nginx config.
| * [ticket/10007] Add directive 'internal' to blocked folders in nginx config.Andreas Fischer2011-01-241-0/+2
|/ | | | | | | | | | | | | | | | | The "deny" and "access" directives are IP-based in general. Both directives only support IPv6 from nginx 0.8.22 onwards, on older versions of nginx those directives have no effect on IPv6 requests. Thus they do not block access for IPv6 requests. Adding the "internal" directive blocks external access in general (both IPv4 and IPv6) and makes the web server return a status code 404 (Not Found) response. See: http://nginx.org/en/CHANGES http://wiki.nginx.org/HttpCoreModule#internal PHPBB3-10007
* Merge branch 'task/naderman/session-tests' into develop-olympusNils Adermann2011-01-238-1/+378
|\ | | | | | | | | | | | | * task/naderman/session-tests: [task/session-tests] Renamed assertSqlResultEquals and fixed its param order [task/session-tests] Test additional combinations of session_begin. [task/session-tests] Added tests for the session class.
| * [task/session-tests] Renamed assertSqlResultEquals and fixed its param orderNils Adermann2011-01-211-1/+1
| | | | | | | | PHPBB3-9732
| * [task/session-tests] Test additional combinations of session_begin.Nils Adermann2011-01-201-12/+46
| | | | | | | | PHPBB3-9732
| * [task/session-tests] Added tests for the session class.Nils Adermann2011-01-208-1/+344
| | | | | | | | | | | | | | | | | | | | | | Two first simple tests to check functionality of session_begin and session_create. Added a mock class for the cache as well as a subclass of session which has its cookie handling function mocked out to avoid header sending problems. PHPBB3-9732
* | Merge branch 'ticket/rxu/8779' into develop-olympusNils Adermann2011-01-231-2/+3
|\ \ | |/ |/| | | | | * ticket/rxu/8779: [ticket/8779] Slow search for 'View unread posts'
| * [ticket/8779] Slow search for 'View unread posts'rxu2011-01-241-2/+3
|/ | | | | | Adjust SQL query to speedup search for unread posts (thanks naderman). PHPBB3-8779
* Merge branch 'ticket/bantu/9859' into develop-olympusNils Adermann2011-01-1628-150/+31
|\ | | | | | | | | | | | | | | | | * ticket/bantu/9859: [ticket/9859] Remove the years from the copyright statements in docs files. [ticket/9859] Remove the year from the copyright meta tag in docs/*.html [ticket/9859] Remove the meta copyright tag as well. [ticket/9859] Remove the credit line comment from all html files. [ticket/9859] Remove years in credit line from some more files.
| * [ticket/9859] Remove the years from the copyright statements in docs files.Andreas Fischer2011-01-168-8/+8
| | | | | | | | PHPBB3-9859
| * [ticket/9859] Remove the year from the copyright meta tag in docs/*.htmlAndreas Fischer2011-01-167-7/+7
| | | | | | | | PHPBB3-9859
| * [ticket/9859] Remove the meta copyright tag as well.Andreas Fischer2011-01-165-5/+0
| | | | | | | | PHPBB3-9859
| * [ticket/9859] Remove the credit line comment from all html files.Andreas Fischer2011-01-1611-116/+2
| | | | | | | | PHPBB3-9859
| * [ticket/9859] Remove years in credit line from some more files.Andreas Fischer2011-01-1614-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | Standard HTML output now includes: Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group Print output now includes: Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/ This also fixes an inconsistency where "phpBB Group" was linked instead of "phpBB". PHPBB3-9859
* | Merge branch 'ticket/bantu/9933' into develop-olympusIgor Wiedler2011-01-162-17/+27
|\ \ | |/ |/| | | | | | | | | * ticket/bantu/9933: [ticket/9933] Remove empty word check. [ticket/9933] Add $use_unicode parameter to get_censor_preg_expression(). [ticket/9933] Adjust word censor regex for non-unicode mode.
| * [ticket/9933] Remove empty word check.rxu2011-01-161-5/+0
| | | | | | | | PHPBB3-9933
| * [ticket/9933] Add $use_unicode parameter to get_censor_preg_expression().Andreas Fischer2011-01-162-8/+19
| | | | | | | | | | | | | | | | | | Rename $unicode to $unicode_support, pass in $use_unicode defaulting to true. In unit tests we can now pass in $use_unicode as false and also test the code path that is taken when PCRE does not support unicode. PHPBB3-9933
| * [ticket/9933] Adjust word censor regex for non-unicode mode.rxu2011-01-161-4/+8
|/ | | | PHPBB3-9933
* Merge branch 'ticket/igorw/9990' into develop-olympusNils Adermann2011-01-127-2/+364
|\ | | | | | | | | | | * ticket/igorw/9990: [ticket/9990] Add docs for running slow tests [ticket/9990] Integrate utf normalizer tests into test suite
| * [ticket/9990] Add docs for running slow testsIgor Wiedler2011-01-122-0/+34
| | | | | | | | PHPBB3-9990
| * [ticket/9990] Integrate utf normalizer tests into test suiteIgor Wiedler2011-01-115-2/+330
| | | | | | | | PHPBB3-9990
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | explode('|', '') and explode('|', NULL) both return array(0 => '') which can cause filespec::check_content() to reject everything starting with a '<' character in case $config['mime_triggers'] is an empty string or not set. fileupload::set_disallowed_content() now filters out empty strings by calling array_diff() on the passed array, so setting $config['mime_triggers'] to an empty string will turn off mime checking completely. On the other side we want to fail safe if $config['mime_triggers'] is not set at all. To do this, the array fileupload::$disallowed_content now contains some default strings to be filtered out. PHPBB3-9764
* | 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
|/ / | | | | | | PHPBB3-9987
* | Merge branch 'ticket/igorw/9981' into develop-olympusIgor Wiedler2011-01-092-0/+2
|\ \ | | | | | | | | | | | | * ticket/igorw/9981: [ticket/9981] Fix unit test dependencies
| * | [ticket/9981] Fix unit test dependenciesIgor Wiedler2011-01-072-0/+2
|/ / | | | | | | PHPBB3-9981
* | Merge branch 'ticket/rxu/9933' into develop-olympusAndreas Fischer2011-01-074-18/+86
|\ \ | | | | | | | | | | | | | | | | | | * ticket/rxu/9933: [ticket/9933] Create unit test for word censor regular expression. [ticket/9933] Move word censor regex into separate function in functions.php [ticket/9933] Wrong handling consecutive multiple asterisks in word censor
| * | [ticket/9933] Create unit test for word censor regular expression.rxu2011-01-071-0/+40
| | | | | | | | | | | | PHPBB3-9933
| * | [ticket/9933] Move word censor regex into separate function in functions.phprxu2011-01-072-18/+43
| | | | | | | | | | | | PHPBB3-9933
| * | [ticket/9933] Wrong handling consecutive multiple asterisks in word censorrxu2011-01-072-2/+5
|/ / | | | | | | | | | | Fix consecutive asterisks issue in word censor. PHPBB3-9933
* | Merge branch 'task/naderman/phpdoc' into develop-olympusNils Adermann2011-01-071-2/+2
|\ \ | | | | | | | | | | | | * task/naderman/phpdoc: [task/phpdoc] Make phpdoctor output quiet instead of verbose.
| * | [task/phpdoc] Make phpdoctor output quiet instead of verbose.Nils Adermann2011-01-071-2/+2
| | | | | | | | | | | | PHPBB3-9943
* | | Merge branch 'task/naderman/phpdoc' into develop-olympusNils Adermann2011-01-072-105/+150
|\ \ \ | |/ / | | | | | | | | | * task/naderman/phpdoc: [task/phpdoc] Switching from phpDocumentor to phpdoctor.
| * | [task/phpdoc] Switching from phpDocumentor to phpdoctor.Nils Adermann2011-01-072-105/+150
| | | | | | | | | | | | | | | | | | You can get phpdoctor from https://github.com/peej/phpdoctor PHPBB3-9943
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The blacklisting of these static variables is necessary because code coverage will otherwise consume too much memory. The problem did not exist in earlier PHPUnit versions because all classes beginning with PHPUnit are automatically blacklisted, and code coverage as well as a few other internal classes were still internal parts of PHPunit. These were now moved to PHP_ namespace, causing the problem with backupStaticAttributes. PHPBB3-9967
| * | | [task/phpunit-xml] Only blacklist the tests directory and do not whitelist.Nils Adermann2011-01-071-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It would be ideal if we could whitelist the entire phpBB directory or at least includes, but at present that still breaks because of classes with the same name. PHPBB3-9967
| * | | [task/phpunit-xml] Force error reporting level E_ALL | ~E_DEPRECATED.Nils Adermann2011-01-071-0/+2
| | | | | | | | | | | | | | | | PHPBB3-9967
| * | | [task/phpunit-xml] Use phpunit.xml for test suiteIgor Wiedler2011-01-0434-506/+80
| | | | | | | | | | | | | | | | PHPBB3-9967
* | | | Merge branch 'ticket/bantu/9589' into develop-olympusAndreas Fischer2011-01-051-0/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * ticket/bantu/9589: [ticket/9589] nginx.conf.sample -> nginx.sample.conf
| * | | [ticket/9589] nginx.conf.sample -> nginx.sample.confAndreas Fischer2011-01-051-0/+0
| | | | | | | | | | | | | | | | PHPBB3-9589
* | | | Merge branch 'ticket/bantu/9859' into develop-olympusAndreas Fischer2010-12-292-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9859: [ticket/9859] Remove years from the credit line.
| * | | | [ticket/9859] Remove years from the credit line.Andreas Fischer2010-12-162-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9859
* | | | | Merge branch 'ticket/bantu/9348' into develop-olympusAndreas Fischer2010-12-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9348: [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.
| * | | | | [ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.Richard Foote2010-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call phpbb_set_encoding() on 'default_dateformat' to properly re-encode non-ascii characters that might be in default_dateformat. E.g. "d M Y à H:i" PHPBB3-9348
* | | | | | Merge branch 'ticket/noxwizard/9953' into develop-olympusAndreas Fischer2010-12-292-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/noxwizard/9953: [ticket/9953] Set focus to password on re-authentication
| * | | | | | [ticket/9953] Set focus to password on re-authenticationPatrick Webster2010-12-282-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sets the login focus to the password field when prompting for admin re-authentication, rather than the username field. PHPBB3-9953
* | | | | | Merge branch 'ticket/noxwizard/9905' into develop-olympusAndreas Fischer2010-12-291-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | * ticket/noxwizard/9905: [ticket/9905] Add SQLite to the DSN description