aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/10240] Reverted a commit which added buggy code.Callum Macrae2011-08-211-3/+0
| | | | | | | | This reverts commit f9dbe33fa7917b6220a85a01ed9f395f3f1bb888. The code which was added also removed new lines and tabs. PHPBB3-10240
* Merge remote-tracking branch 'callumacrae/ticket/9978' into develop-olympusOleg Pudeyev2011-08-201-2/+2
|\ | | | | | | | | * callumacrae/ticket/9978: [ticket/9978] Added semicolons to JavaScript in overall_header.
| * [ticket/9978] Added semicolons to JavaScript in overall_header.Callum Macrae2011-08-201-2/+2
| | | | | | | | | | | | | | | | Semicolons have been added to the anonymous functions in the javascript in overall_header.html. This makes JSLint happier, and also makes the code easier to minify. PHPBB3-9978
* | Merge remote-tracking branch 'github-bantu/ticket/8571' into develop-olympusNils Adermann2011-08-184-5/+5
|\ \ | | | | | | | | | | | | | | | | | | * github-bantu/ticket/8571: [ticket/8571] Show age as 0 in birthday list when birthday is in the future. [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future. [ticket/8571] Also display age on memberlist/viewprofile when age is 0.
| * | [ticket/8571] Show age as 0 in birthday list when birthday is in the future.Andreas Fischer2011-07-201-1/+1
| | | | | | | | | | | | PHPBB3-8571
| * | [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.Andreas Fischer2011-07-201-1/+1
| | | | | | | | | | | | PHPBB3-8571
| * | [ticket/8571] Also display age on memberlist/viewprofile when age is 0.Andreas Fischer2011-07-202-3/+3
| |/ | | | | | | PHPBB3-8571
* | Merge remote-tracking branch 'p/ticket/9976' into develop-olympusAndreas Fischer2011-08-161-3/+11
|\ \ | | | | | | | | | | | | * p/ticket/9976: [ticket/9976] Fix link to post when two posts have the same post_time.
| * | [ticket/9976] Fix link to post when two posts have the same post_time.Joas Schilling2011-07-301-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | When two posts have the same post_time, a link to the first post being on page 1, leads you to the second post with the same timestamp on page two. So in case the post_times are equal, we need to use the post_id to correctly order the posts. PHPBB3-9976
* | | Merge remote-tracking branch 'bantu/ticket/9297' into develop-olympusOleg Pudeyev2011-08-142-11/+107
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/9297: [ticket/9297] Add network to class name of unit tests. [ticket/9297] Fix typo in localhost. [ticket/9297] Rename test class to reflect its contents. [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work. [ticket/9297] Fix markTestSkipped call in setUpBeforeClass. [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails. [ticket/9297] Separate ipv4 and ipv6 tests into separate functions. [ticket/9297] Update copyright year of unit test file. [ticket/9297] Make EPSV unit tests work without IPv6. [ticket/9297] Unit tests for ftp_fsock PASV and EPSV. [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.
| * | | [ticket/9297] Add network to class name of unit tests.Andreas Fischer2011-08-141-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9297
| * | | [ticket/9297] Fix typo in localhost.Andreas Fischer2011-08-141-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9297
| * | | [ticket/9297] Rename test class to reflect its contents.Oleg Pudeyev2011-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | setUpBeforeClass logic makes this test specific to PASV/EPSV tests. PHPBB3-9297
| * | | [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work.Oleg Pudeyev2011-08-141-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like IPv6-encapsulated IPv4 addresses do not actually work if the host has no IPv6 connectivity. PHPBB3-9297
| * | | [ticket/9297] Fix markTestSkipped call in setUpBeforeClass.Oleg Pudeyev2011-08-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Need to use the static version here. PHPBB3-9297
| * | | [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails.Oleg Pudeyev2011-08-141-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible to configure PHP without IPv6, in which case IPv6-encapsulated IPv4 addresses won't be accepted by PHP. Instead of failing the test suite on such setups, skip the offending test. PHPBB3-9297
| * | | [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