aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'ticket/bantu/10038' into develop-olympusIgor Wiedler2011-02-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/10038: [ticket/10038] Use request_var() in the avatar code path of download/file.php
| * | | | | | [ticket/10038] Use request_var() in the avatar code path of download/file.phpAndreas Fischer2011-02-121-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason not to use request_var() here because it is available anyway since 3afd2c6948e777fde2f43f00bff1659f2691f4d8. This change especially prevents submitting an array which might then throw an error in one of the string functions substr() or strpos() later on. PHPBB3-10038
* | | | | | Merge branch 'ticket/bantu/9805' into develop-olympusIgor Wiedler2011-02-121-0/+215
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9805: [ticket/9805] Setup security repository for developers. [ticket/9805] Move check lower down. [ticket/9805] Better support for already existing repositories. [ticket/9805] Add dry-run option. [ticket/9805] Use getopt(), add a few options, extend show_usage(). [ticket/9805] Script for easily cloning a whole github network.
| * | | | | | [ticket/9805] Setup security repository for developers.Andreas Fischer2011-02-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9805
| * | | | | | [ticket/9805] Move check lower down.Andreas Fischer2011-02-031-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9805
| * | | | | | [ticket/9805] Better support for already existing repositories.Andreas Fischer2011-02-031-17/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9805
| * | | | | | [ticket/9805] Add dry-run option.Andreas Fischer2011-02-031-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9805
| * | | | | | [ticket/9805] Use getopt(), add a few options, extend show_usage().Andreas Fischer2011-02-031-18/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9805
| * | | | | | [ticket/9805] Script for easily cloning a whole github network.Andreas Fischer2011-01-151-0/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9805
* | | | | | | Merge branch 'ticket/p/10029' into develop-olympusAndreas Fischer2011-02-101-1/+7
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | * ticket/p/10029: [ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version.
| * | | | | | [ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version.Oleg Pudeyev2011-02-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10029
* | | | | | | Merge branch 'ticket/nickvergessen/9949' into develop-olympusAndreas Fischer2011-02-072-0/+59
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9949: [ticket/9949] Unit tests for user::lang() [ticket/9949] $user->lang() uses last int-value to get the key not first
| * | | | | | | [ticket/9949] Unit tests for user::lang()Andreas Fischer2011-02-071-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9949
| * | | | | | | [ticket/9949] $user->lang() uses last int-value to get the key not firstJoas Schilling2011-01-291-0/+1
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment in the code says: "We now get the first number passed and will select the key based upon this number". But the loop over the arguments is not left and therefore it uses the last int-value not the first one. PHPBB3-9949
* | | | | | | Merge branch 'ticket/nickvergessen/9966' into develop-olympusAndreas Fischer2011-02-041-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9966: [ticket/9966] Language download in ACP creates index.html and misses captcha_*
| * | | | | | | [ticket/9966] Language download in ACP creates index.html and misses captcha_*Joas Schilling2011-01-291-6/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The language pack download page includes index.html files instead of index.htm. It also does not include the new captcha_*.php files which are included since 3.0.6. PHPBB3-9966
* | | | | | | Merge branch 'ticket/p/10020' into develop-olympusAndreas Fischer2011-02-041-1/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/10020: [ticket/10020] Fix 32-bit php braindamage around INT_MIN. [ticket/10020] Replaced (int) 0x80000000 with portable equivalent.
| * | | | | | [ticket/10020] Fix 32-bit php braindamage around INT_MIN.Oleg Pudeyev2011-02-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On 32-bit php, -2147483648, despite fitting in the int type, is for some reason made into a floating-point value. Use an explicit cast to make it an integer. PHPBB3-10020
| * | | | | | [ticket/10020] Replaced (int) 0x80000000 with portable equivalent.Oleg Pudeyev2011-02-041-1/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-10020
* | | | | | Merge branch 'ticket/p/10014' into develop-olympusAndreas Fischer2011-02-011-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/10014: [ticket/10014] Clearly indicate fatal errors in file acm.
| * | | | | | [ticket/10014] Clearly indicate fatal errors in file acm.Oleg Pudeyev2011-01-281-2/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If acm_file cannot open the cache file for writing, it prints a message to that effect and calls die(). The message itself does not indicate that it is a fatal error, and someone seeing the message might expect that inability to write to cache is not fatal. Make it clear that the error is fatal by printing the word "Fatal" before the message. PHPBB3-10014
* | | | | | Merge branch 'ticket/erikfrerejean/10011' into develop-olympusAndreas Fischer2011-01-3118-33/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/erikfrerejean/10011: [ticket/10011] Tests don't work on PHP < 5.3
| * | | | | | [ticket/10011] Tests don't work on PHP < 5.3Erik Frèrejean2011-01-3118-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the usage of `__DIR__` for the file includes the tests can't be ran on systems with PHP < 5.3. Replace all occurances of `__DIR__` with `dirname(__FILE__)`. PHPBB3-10011
* | | | | | | 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 '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 '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