1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 04:24:31 +02:00
Commit Graph

10554 Commits

Author SHA1 Message Date
3c7dfc7e19 [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.
PHPBB3-8177
2011-08-21 01:46:47 +02:00
1680b3a2a7 Merge remote-tracking branch 'callumacrae/ticket/9978' into develop-olympus
* callumacrae/ticket/9978:
  [ticket/9978] Added semicolons to JavaScript in overall_header.
2011-08-20 14:17:31 -04:00
b18b3363e9 [ticket/9978] Added semicolons to JavaScript in overall_header.
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
2011-08-20 11:20:30 +01:00
6330153937 Merge remote-tracking branch 'github-bantu/ticket/8571' into develop-olympus
* 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.
2011-08-18 17:43:24 -04:00
a91131c55e Merge remote-tracking branch 'p/ticket/9976' into develop-olympus
* p/ticket/9976:
  [ticket/9976] Fix link to post when two posts have the same post_time.
2011-08-16 18:09:21 +02:00
a6dd3d0c65 Merge remote-tracking branch 'bantu/ticket/9297' into develop-olympus
* 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.
2011-08-14 15:52:01 -04:00
02a8cebd65 [ticket/9297] Add network to class name of unit tests.
PHPBB3-9297
2011-08-14 21:40:02 +02:00
702985c927 [ticket/9297] Fix typo in localhost.
PHPBB3-9297
2011-08-14 20:55:21 +02:00
a7e709d920 [ticket/9297] Rename test class to reflect its contents.
setUpBeforeClass logic makes this test specific to PASV/EPSV tests.

PHPBB3-9297
2011-08-14 14:47:16 -04:00
2a0c9e4026 [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work.
Looks like IPv6-encapsulated IPv4 addresses do not actually work if
the host has no IPv6 connectivity.

PHPBB3-9297
2011-08-14 14:42:53 -04:00
c211492092 [ticket/9297] Fix markTestSkipped call in setUpBeforeClass.
Need to use the static version here.

PHPBB3-9297
2011-08-14 14:33:00 -04:00
2973ccbd48 [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails.
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
2011-08-14 14:11:58 -04:00
386883cda1 [ticket/9297] Separate ipv4 and ipv6 tests into separate functions.
PHPBB3-9297
2011-08-14 13:19:09 -04:00
7a40ab8f7a [ticket/9297] Update copyright year of unit test file.
PHPBB3-9297
2011-08-14 18:17:16 +02:00
83fa6cffc3 [ticket/9297] Make EPSV unit tests work without IPv6.
PHPBB3-9297
2011-08-11 23:15:33 +02:00
18f19b03ab [ticket/9297] Unit tests for ftp_fsock PASV and EPSV.
PHPBB3-9297
2011-08-11 23:15:33 +02:00
66553fb857 [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.
PHPBB3-9297
2011-08-11 23:15:25 +02:00
cad3e4cb45 Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympus
* callumacrae/ticket/10240:
  [ticket/10240] Added code to strip control characters from messages.
2011-08-09 21:30:37 -04:00
f9dbe33fa7 [ticket/10240] Added code to strip control characters from messages.
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
2011-08-08 17:43:28 +01:00
b85cd7a431 Merge branch 'ticket/naderman/10313' into develop-olympus
* ticket/naderman/10313:
  [ticket/10313] Create a separate build task for slow tests.
2011-08-07 21:34:24 -04:00
32e15315a8 [ticket/10313] Create a separate build task for slow tests.
PHPBB3-10313
2011-08-07 21:28:35 -04:00
abc0c336af Merge remote-tracking branch 'github-bantu/ticket/10313' into develop-olympus
* github-bantu/ticket/10313:
  [ticket/10313] Include slow unit tests when running build script.
2011-08-07 19:19:37 -04:00
43fc8142f5 [ticket/10313] Include slow unit tests when running build script.
PHPBB3-10313
2011-08-08 01:11:44 +02:00
04e8468d28 Merge remote-tracking branch 'bantu/ticket/10298' into develop-olympus
* bantu/ticket/10298:
  [ticket/10298] Properly close embed tag for QuickTime in subsilver2.
2011-08-07 16:35:31 -04:00
eb4660f4ef Merge remote-tracking branch 'naderman/ticket/8937' into develop-olympus
* naderman/ticket/8937:
  [ticket/8937] Keep space characters in front of [code] bbcode content
2011-08-07 16:23:26 -04:00
ec3f4db425 Merge remote-tracking branch 'bantu/ticket/10299' into develop-olympus
* bantu/ticket/10299:
  [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
2011-08-04 23:07:06 -04:00
66867b5ac0 Merge remote-tracking branch 'cs278/ticket/10303' into develop-olympus
* cs278/ticket/10303:
  [ticket/10303] Removed HTTP_VERSION code path from send_status_line().
2011-08-04 22:56:20 -04:00
cc87d553d0 [ticket/10303] Removed HTTP_VERSION code path from send_status_line().
PHPBB3-10303
2011-08-05 01:17:57 +01:00
08ca84a3e7 [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
PHPBB3-10299
2011-07-31 15:34:45 +02:00
bb7e8bb424 [ticket/9976] Fix link to post when two posts have the same post_time.
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
2011-07-30 23:46:53 -04:00
edb745e951 Merge remote-tracking branch 'callumacrae/ticket/8173' into develop-olympus
* callumacrae/ticket/8173:
  [ticket/8173] Removed some redundant code in the BBCode JavaScript.

Conflicts:
	phpBB/adm/style/acp_users_signature.html
2011-07-30 19:33:41 -04:00
5653be8e16 Merge remote-tracking branch 'callumacrae/ticket/9645' into develop-olympus
* callumacrae/ticket/9645:
  [ticket/9645] Added code to repair invalid anchor names in acp_php_info.
2011-07-30 18:47:54 -04:00
7ebec68616 Merge remote-tracking branch 'callumacrae/ticket/10293' into develop-olympus
* callumacrae/ticket/10293:
  [ticket/10293] Fixed the JavaScript in the jumpbox.
2011-07-30 18:36:04 -04:00
d59a894cd3 [ticket/10298] Properly close embed tag for QuickTime in subsilver2.
PHPBB3-10298
2011-07-30 16:58:33 +02:00
25902c3bfc Merge remote-tracking branch 'p/ticket/10199' into develop-olympus
* p/ticket/10199:
  [ticket/10199] Delete a useless join in viewtopic.
2011-07-30 16:44:27 +02:00
bd2fd4ec1d Merge remote-tracking branch 'bantu/ticket/10263' into develop-olympus
* bantu/ticket/10263:
  [ticket/10263] Fix comment about return value of phpbb_version_compare().
2011-07-30 16:43:37 +02:00
9c6339fb57 [ticket/8173] Removed some redundant code in the BBCode JavaScript.
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
2011-07-30 08:57:17 +01:00
b960dd4e0d Merge remote-tracking branch 'callumacrae/ticket/10032' into develop-olympus
* callumacrae/ticket/10032:
  [ticket/10032] Fixed typos in bbcode button name.
2011-07-30 00:48:03 -04:00
381ebcf195 [ticket/9645] Added code to repair invalid anchor names in acp_php_info.
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
2011-07-28 16:41:04 +01:00
65ec47abfa [ticket/10263] Fix comment about return value of phpbb_version_compare().
PHPBB3-10263
2011-07-27 00:13:23 +02:00
7e01850a42 [ticket/10293] Fixed the JavaScript in the jumpbox.
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
2011-07-26 13:43:52 +01:00
efc7aa00cd Merge remote-tracking branch 'callumacrae/ticket/10292' into develop-olympus
* callumacrae/ticket/10292:
  [ticket/10292] Fixed a whitespace inconsistency in acp_ranks.
2011-07-25 22:26:44 +02:00
f51b2f8fec [ticket/10292] Fixed a whitespace inconsistency in acp_ranks.
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
2011-07-25 21:08:26 +01:00
0648923b19 [ticket/10199] Delete a useless join in viewtopic.
PHPBB3-10199
2011-07-24 04:39:00 -04:00
49c89023fc [ticket/8571] Show age as 0 in birthday list when birthday is in the future.
PHPBB3-8571
2011-07-20 00:53:28 +02:00
106cf14d27 [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.
PHPBB3-8571
2011-07-20 00:32:00 +02:00
b4949675bf [ticket/8571] Also display age on memberlist/viewprofile when age is 0.
PHPBB3-8571
2011-07-20 00:31:45 +02:00
627e2644a2 [ticket/8937] Keep space characters in front of [code] bbcode content
PHPBB3-8937
2011-07-17 00:44:39 -04:00
13ca659f1f Merge remote-tracking branch 'github-nickvergessen/ticket/6632' into develop-olympus
* github-nickvergessen/ticket/6632:
  [ticket/6632] Better viewing of topics for wide screen displays
2011-07-16 23:08:31 -04:00
afa377d028 Merge remote-tracking branch 'github-bantu/ticket/10257' into develop-olympus
* 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.
2011-07-16 22:48:58 -04:00