aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | [ticket/9297] Separate ipv4 and ipv6 tests into separate functions.Oleg Pudeyev2011-08-141-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9297
| * | | | | | | | | [ticket/9297] Update copyright year of unit test file.Andreas Fischer2011-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9297
| * | | | | | | | | [ticket/9297] Make EPSV unit tests work without IPv6.Andreas Fischer2011-08-111-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9297
| * | | | | | | | | [ticket/9297] Unit tests for ftp_fsock PASV and EPSV.Andreas Fischer2011-08-111-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9297
| * | | | | | | | | [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.Andreas Fischer2011-08-111-11/+44
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9297
* | | | | | | | | Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympusOleg Pudeyev2011-08-091-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10240: [ticket/10240] Added code to strip control characters from messages.
| * | | | | | | | | [ticket/10240] Added code to strip control characters from messages.Callum Macrae2011-08-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible to evade the word filter using control characters. Seeing as control characters have no practical application in a bulletin board software, it doesn't do any harm to remove them entirely. That is what this commit does. PHPBB3-10240
* | | | | | | | | | Merge branch 'ticket/naderman/10313' into develop-olympusNils Adermann2011-08-071-13/+9
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/naderman/10313: [ticket/10313] Create a separate build task for slow tests.
| * | | | | | | | | [ticket/10313] Create a separate build task for slow tests.Nils Adermann2011-08-071-13/+9
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10313
* | | | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10313' into develop-olympusNils Adermann2011-08-071-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10313: [ticket/10313] Include slow unit tests when running build script.
| * | | | | | | | | [ticket/10313] Include slow unit tests when running build script.Andreas Fischer2011-08-081-0/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10313
* | | | | | | | | Merge remote-tracking branch 'bantu/ticket/10298' into develop-olympusOleg Pudeyev2011-08-071-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10298: [ticket/10298] Properly close embed tag for QuickTime in subsilver2.
| * | | | | | | | | [ticket/10298] Properly close embed tag for QuickTime in subsilver2.Andreas Fischer2011-07-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10298
* | | | | | | | | | Merge remote-tracking branch 'naderman/ticket/8937' into develop-olympusOleg Pudeyev2011-08-071-0/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/8937: [ticket/8937] Keep space characters in front of [code] bbcode content
| * | | | | | | | | [ticket/8937] Keep space characters in front of [code] bbcode contentNils Adermann2011-07-171-0/+7
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8937
* | | | | | | | | Merge remote-tracking branch 'bantu/ticket/10299' into develop-olympusOleg Pudeyev2011-08-041-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10299: [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
| * | | | | | | | | [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()Andreas Fischer2011-07-311-1/+1
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10299
* | | | | | | | | Merge remote-tracking branch 'cs278/ticket/10303' into develop-olympusOleg Pudeyev2011-08-041-6/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * cs278/ticket/10303: [ticket/10303] Removed HTTP_VERSION code path from send_status_line().
| * | | | | | | | [ticket/10303] Removed HTTP_VERSION code path from send_status_line().Chris Smith2011-08-051-6/+0
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10303
* | | | | | | | Merge remote-tracking branch 'callumacrae/ticket/8173' into develop-olympusOleg Pudeyev2011-07-304-8/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/8173: [ticket/8173] Removed some redundant code in the BBCode JavaScript. Conflicts: phpBB/adm/style/acp_users_signature.html
| * | | | | | | | [ticket/8173] Removed some redundant code in the BBCode JavaScript.Callum Macrae2011-07-304-8/+6
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following code can be found in the ACP, when changing a user's signature: t: '{ BBCODE_T_HELP }', The code that uses it and the code that produces it were changed or removed a while ago, but this code remained. In 2c4c1f9, the accesskey for the list item button was changed to y from t, explaining the origin of the redundant code - although it wasn't being used then, either. This commit also changes the helpline code of "[*]" to y, as the access key is y, so this makes it more consistent. PHPBB3-8173
* | | | | | | | Merge remote-tracking branch 'callumacrae/ticket/9645' into develop-olympusOleg Pudeyev2011-07-301-0/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/9645: [ticket/9645] Added code to repair invalid anchor names in acp_php_info.
| * | | | | | | | [ticket/9645] Added code to repair invalid anchor names in acp_php_info.Callum Macrae2011-07-281-0/+8
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the anchor tags produced by php_info had names like "module_Zend Optimizer", which is obviously invalid. This commit adds some code that repairs the names by replacing all spaces found in the names with underscores. PHPBB3-9645
* | | | | | | | Merge remote-tracking branch 'callumacrae/ticket/10293' into develop-olympusOleg Pudeyev2011-07-301-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10293: [ticket/10293] Fixed the JavaScript in the jumpbox.
| * | | | | | | [ticket/10293] Fixed the JavaScript in the jumpbox.Callum Macrae2011-07-261-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current code is invalid, and results in an critical error which aborts the script before it gets to return false, thus allowing the form to submit with an invalid forum ID. This commit fixes that by referencing "this" instead of "document.jumpbox", which didn't exist because the form had no name. PHPBB3-10293
* | | | | | | Merge remote-tracking branch 'p/ticket/10199' into develop-olympusAndreas Fischer2011-07-301-7/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10199: [ticket/10199] Delete a useless join in viewtopic.
| * | | | | | | [ticket/10199] Delete a useless join in viewtopic.Oleg Pudeyev2011-07-241-7/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-10199
* | | | | | | Merge remote-tracking branch 'bantu/ticket/10263' into develop-olympusAndreas Fischer2011-07-301-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10263: [ticket/10263] Fix comment about return value of phpbb_version_compare().
| * | | | | | | [ticket/10263] Fix comment about return value of phpbb_version_compare().Andreas Fischer2011-07-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10263
* | | | | | | | Merge remote-tracking branch 'callumacrae/ticket/10032' into develop-olympusOleg Pudeyev2011-07-303-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10032: [ticket/10032] Fixed typos in bbcode button name.
| * | | | | | | [ticket/10032] Fixed typos in bbcode button name.Callum Macrae2011-07-143-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | addlistitem was addlitsitem. PHPBB3-10032
* | | | | | | | Merge remote-tracking branch 'callumacrae/ticket/10292' into develop-olympusAndreas Fischer2011-07-251-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10292: [ticket/10292] Fixed a whitespace inconsistency in acp_ranks.
| * | | | | | | [ticket/10292] Fixed a whitespace inconsistency in acp_ranks.Callum Macrae2011-07-251-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no space between the first radio button and "Yes", while there is a space between the second radio button and "No". This commit fixes that. PHPBB3-10292
* | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/6632' into ↵Nils Adermann2011-07-163-9/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/6632: [ticket/6632] Better viewing of topics for wide screen displays
| * | | | | | | [ticket/6632] Better viewing of topics for wide screen displaysJoas Schilling2011-07-143-9/+15
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes PHPBB3-6458 "Width of Topics and Posts columns in Board Index is causing problems with language packs" by increasing the size to 90px instead of the ~70 it was like. Also tested on RTL languages. PHPBB3-6458 PHPBB3-6632
* | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10257' into develop-olympusNils Adermann2011-07-161-1/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10257: [ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003. [ticket/10257] Fix AAAA record parsing for old versions of Windows [ticket/10257] Add missing break statement after CNAME block.
| * | | | | | | [ticket/10257] Slightly adjust comments about AAAA records on Windows XP/2003.Andreas Fischer2011-07-131-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10257
| * | | | | | | [ticket/10257] Fix AAAA record parsing for old versions of WindowsPatrick Webster2011-07-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older versions of Windows use a different output format for AAAA records. PHPBB3-10257
| * | | | | | | [ticket/10257] Add missing break statement after CNAME block.Andreas Fischer2011-07-131-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-10257
* | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10274' into develop-olympusNils Adermann2011-07-161-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10274: [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE on acp_main
| * | | | | | | [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE on acp_mainAndreas Fischer2011-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10274
* | | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/10266' into ↵Nils Adermann2011-07-161-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-nickvergessen/ticket/10266: [ticket/10266] Add "Return to forum" link after reporting a post
| * | | | | | | | [ticket/10266] Add "Return to forum" link after reporting a postJoas Schilling2011-07-141-0/+7
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-10266
* | | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10265' into develop-olympusNils Adermann2011-07-161-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10265: [ticket/10265] Move mt_rand.php to wrapper folder and add _test suffix.
| * | | | | | | | [ticket/10265] Move mt_rand.php to wrapper folder and add _test suffix.Andreas Fischer2011-07-131-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10265
* | | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10263' into develop-olympusNils Adermann2011-07-164-9/+161
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10263: [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.php [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.php [ticket/10263] Adding unit tests for phpbb_version_compare(). [ticket/10263] Add wrapper for version_compare() that allows the use of A and B
| * | | | | | | [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.phpAndreas Fischer2011-07-141-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10263
| * | | | | | | [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.phpAndreas Fischer2011-07-141-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10263
| * | | | | | | [ticket/10263] Adding unit tests for phpbb_version_compare().Andreas Fischer2011-07-131-0/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10263
| * | | | | | | [ticket/10263] Add wrapper for version_compare() that allows the use of A and BAndreas Fischer2011-07-131-0/+28
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add wrapper function for version_compare() that allows using uppercase A and B for alpha and beta release version strings. PHPBB3-10263