aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9823] Unit tests for validate_rang.Joas Schilling2011-02-012-0/+187
| | | | PHPBB3-9823
* [ticket/9823] Unit tests for h_radio.Joas Schilling2011-02-013-0/+157
| | | | PHPBB3-9823
* [ticket/9823] Moving the functions. Unit tests for build_select.Joas Schilling2011-02-014-537/+644
| | | | PHPBB3-9823
* Merge branch 'ticket/nickvergessen/8065' into developAndreas Fischer2011-01-301-0/+3
|\ | | | | | | | | * ticket/nickvergessen/8065: [ticket/8065] Option to lock topics while moving them: Add subsilver2 changes.
| * [ticket/8065] Option to lock topics while moving them: Add subsilver2 changes.Joas Schilling2011-01-301-0/+3
| | | | | | | | PHPBB3-8065
* | Merge branch 'ticket/nickvergessen/8065' into developAndreas Fischer2011-01-302-0/+10
|\ \ | |/ | | | | | | * ticket/nickvergessen/8065: [ticket/8065] Add an option to lock topics while moving them.
| * [ticket/8065] Add an option to lock topics while moving them.Joas Schilling2011-01-302-0/+10
|/ | | | PHPBB3-8065
* Merge branch 'develop-olympus' into developAndreas Fischer2011-01-303-13/+7
|\ | | | | | | | | | | * develop-olympus: [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand(). [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
| * Merge branch 'ticket/nickvergessen/9985' into develop-olympusAndreas Fischer2011-01-301-2/+2
| |\ | | | | | | | | | | | | * ticket/nickvergessen/9985: [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().
| | * [ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().Joas Schilling2011-01-301-2/+2
| | | | | | | | | | | | PHPBB3-9985
| * | Merge branch 'ticket/nickvergessen/9989' into develop-olympusAndreas Fischer2011-01-302-11/+5
| |\ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/9989: [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
| | * | [ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.Joas Schilling2011-01-292-11/+5
| | |/ | | | | | | | | | PHPBB3-9989
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-01-274-9/+33
|\ \ \ | |/ / | | | | | | | | | | | | * develop-olympus: [ticket/9166] Fixed CSS element order in subsilver. [ticket/9166] Fixed CSS element order in prosilver.
| * | Merge branch 'ticket/bantu/9166' into develop-olympusOleg Pudeyev2011-01-274-11/+35
| |\ \ | | |/ | |/| | | | | | | | | | * ticket/bantu/9166: [ticket/9166] Fixed CSS element order in subsilver. [ticket/9166] Fixed CSS element order in prosilver.
| | * [ticket/9166] Fixed CSS element order in subsilver.Schnorrer422011-01-281-4/+10
| | | | | | | | | | | | PHPBB3-9166
| | * [ticket/9166] Fixed CSS element order in prosilver.Schnorrer422011-01-283-7/+25
| |/ | | | | | | PHPBB3-9166
* | Merge branch 'develop-olympus' into developOleg Pudeyev2011-01-261-0/+2
|\ \ | |/ | | | | | | * develop-olympus: [ticket/10007] Add directive 'internal' to blocked folders in nginx config.
| * 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 'develop-olympus' into developNils Adermann2011-01-238-1/+322
|\ \ | |/ | | | | | | | | | | | | | | | | * develop-olympus: [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. Conflicts: tests/mock/cache.php
| * 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 'develop-olympus' into developNils Adermann2011-01-231-2/+3
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/8779] Slow search for 'View unread posts'
| * | 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/9790' into developIgor Wiedler2011-01-183-20/+55
|\ \ | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9790: [ticket/9790] Support for lighttpd's X-Sendfile header for attachments. [ticket/9790] Support for nginx's X-Accel-Redirect header for attachments. [ticket/9790] Always call file_gc(false) before sending the file. [ticket/9790] Add $exit parameter to file_gc().
| * | [ticket/9790] Support for lighttpd's X-Sendfile header for attachments.Andreas Fischer2011-01-182-15/+18
| | | | | | | | | | | | PHPBB3-9790
| * | [ticket/9790] Support for nginx's X-Accel-Redirect header for attachments.Andreas Fischer2011-01-172-0/+18
| | | | | | | | | | | | PHPBB3-9790
| * | [ticket/9790] Always call file_gc(false) before sending the file.Andreas Fischer2011-01-171-3/+4
| | | | | | | | | | | | | | | | | | This also unloads the cache before the file is send. PHPBB3-9790
| * | [ticket/9790] Add $exit parameter to file_gc().Andreas Fischer2011-01-171-2/+15
| | | | | | | | | | | | PHPBB3-9790
* | | Merge branch 'develop-olympus' into developNils Adermann2011-01-1628-150/+31
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [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.
| * | 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 'develop-olympus' into developIgor Wiedler2011-01-162-21/+23
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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. Conflicts: phpBB/includes/functions.php Also remove static $unicode_support.
| * | 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 'task/igorw/acm-refactor' into developChris Smith2011-01-131-1/+1
|\ \ | | | | | | | | | | | | * task/igorw/acm-refactor: [task/acm-refactor] Remove includes/cache.php from coding guidelines
| * | [task/acm-refactor] Remove includes/cache.php from coding guidelinesIgor Wiedler2011-01-131-1/+1
|/ / | | | | | | | | | | It has been refactored to includes/cache/service.php. PHPBB3-9983
* | Merge branch 'develop-olympus' into developNils Adermann2011-01-127-1/+363
|\ \ | |/ | | | | | | | | | | | | | | * develop-olympus: [ticket/9990] Add docs for running slow tests [ticket/9990] Integrate utf normalizer tests into test suite Conflicts: phpunit.xml.dist
| * 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