mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-12 03:34:15 +01:00
Code Issues Releases Wiki Activity
10,568 Commits 17 Branches 190 Tags
Commit Graph

10568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Callum Macrae
03da3c7c4c [ticket/10240] Added optionset to mock_user in the tests. 
Also made optionset use the value set by optionset. We're not checking
whether the option is set or not, because we would just throw an error
if it wasn't set, and it throws an error anyway.

PHPBB3-10240
 2011-08-23 13:28:42 +01:00
Callum Macrae
d4f1b92479 [ticket/10240] Fixed copyright year in censor_text_test.php. 
PHPBB3-10240
 2011-08-23 11:38:59 +01:00
Callum Macrae
0d104b00c8 [ticket/10240] Fixed censor_text test assetEquals param order. 
Before, expected and input were the wrong way round.

PHPBB3-10240
 2011-08-23 11:32:35 +01:00
Callum Macrae
e7ab7f5f7a [ticket/10240] Added censor_text tests for special characters. 
PHPBB3-10240
 2011-08-23 11:30:32 +01:00
Callum Macrae
fa5c7f6440 [ticket/10240] Added censor_text tests. 
PHPBB-10240
 2011-08-22 19:02:27 +01:00
Andreas Fischer
540ca1a8d8 Merge remote-tracking branch 'nickvergessen/ticket/8177' into develop-olympus 
* nickvergessen/ticket/8177:
  [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.
 2011-08-21 15:17:51 +02:00
Andreas Fischer
91b415dd01 Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympus 
* callumacrae/ticket/10240:
  [ticket/10240] Reverted a commit which added buggy code.
 2011-08-21 14:26:24 +02:00
Callum Macrae
4592076366 [ticket/10240] Reverted a commit which added buggy code. 
This reverts commit f9dbe33fa7917b6220a85a01ed9f395f3f1bb888.

The code which was added also removed new lines and tabs.

PHPBB3-10240
 2011-08-21 13:16:50 +01:00
Andreas Fischer
9f9e4ad3d8 Merge remote-tracking branch 'p/ticket/10309' into develop-olympus 
* p/ticket/10309:
  [ticket/10309] Update .gitignore and move .gitkeep.
 2011-08-21 14:11:10 +02:00
Andreas Fischer
15d0fe7d9f Merge branch 'develop-olympus' of git://github.com/phpbb/phpbb3 into develop-olympus 
* 'develop-olympus' of git://github.com/phpbb/phpbb3:
  [ticket/9978] Added semicolons to JavaScript in overall_header.
  [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-21 14:11:06 +02:00
Joas Schilling
3c7dfc7e19 [ticket/8177] Display birthdays of 29th february on 28th in non-leap years. 
PHPBB3-8177
 2011-08-21 01:46:47 +02:00
Oleg Pudeyev
57accade85 [ticket/10309] Update .gitignore and move .gitkeep. 
PHPBB3-10309
 2011-08-20 14:34:02 -04:00
Oleg Pudeyev
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
Callum Macrae
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
Nils Adermann
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
Andreas Fischer
106cec9a92 Merge remote-tracking branch 'p/ticket/10309' into develop-olympus 
* p/ticket/10309:
  [ticket/10309] Coding guidelines fix.
  [ticket/10309] Write unicode data to tests/tmp.
 2011-08-16 18:39:59 +02:00
Andreas Fischer
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
Oleg Pudeyev
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
Andreas Fischer
02a8cebd65 [ticket/9297] Add network to class name of unit tests. 
PHPBB3-9297
 2011-08-14 21:40:02 +02:00
Andreas Fischer
702985c927 [ticket/9297] Fix typo in localhost. 
PHPBB3-9297
 2011-08-14 20:55:21 +02:00
Oleg Pudeyev
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
Oleg Pudeyev
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
Oleg Pudeyev
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
Oleg Pudeyev
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
Oleg Pudeyev
386883cda1 [ticket/9297] Separate ipv4 and ipv6 tests into separate functions. 
PHPBB3-9297
 2011-08-14 13:19:09 -04:00
Andreas Fischer
7a40ab8f7a [ticket/9297] Update copyright year of unit test file. 
PHPBB3-9297
 2011-08-14 18:17:16 +02:00
Andreas Fischer
83fa6cffc3 [ticket/9297] Make EPSV unit tests work without IPv6. 
PHPBB3-9297
 2011-08-11 23:15:33 +02:00
Andreas Fischer
18f19b03ab [ticket/9297] Unit tests for ftp_fsock PASV and EPSV. 
PHPBB3-9297
 2011-08-11 23:15:33 +02:00
Andreas Fischer
66553fb857 [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class. 
PHPBB3-9297
 2011-08-11 23:15:25 +02:00
Oleg Pudeyev
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
Oleg Pudeyev
3df8b214cc [ticket/10309] Coding guidelines fix. 
PHPBB3-10309
 2011-08-09 21:16:38 -04:00
Callum Macrae
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
Nils Adermann
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
Nils Adermann
32e15315a8 [ticket/10313] Create a separate build task for slow tests. 
PHPBB3-10313
 2011-08-07 21:28:35 -04:00
Nils Adermann
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
Andreas Fischer
43fc8142f5 [ticket/10313] Include slow unit tests when running build script. 
PHPBB3-10313
 2011-08-08 01:11:44 +02:00
Oleg Pudeyev
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
Oleg Pudeyev
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
Oleg Pudeyev
f997199679 [ticket/10309] Write unicode data to tests/tmp. 
When the tests are run by a different user than the one which owns
phpbb source tree, writes will go into a single, known directory.

PHPBB3-10309
 2011-08-07 16:17:20 -04:00
Oleg Pudeyev
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
Oleg Pudeyev
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
Chris Smith
cc87d553d0 [ticket/10303] Removed HTTP_VERSION code path from send_status_line(). 
PHPBB3-10303
 2011-08-05 01:17:57 +01:00
Andreas Fischer
08ca84a3e7 [ticket/10299] Fix typo in comment about $max_store_length in truncate_string() 
PHPBB3-10299
 2011-07-31 15:34:45 +02:00
Joas Schilling
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
Oleg Pudeyev
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
Oleg Pudeyev
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
Oleg Pudeyev
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
Andreas Fischer
d59a894cd3 [ticket/10298] Properly close embed tag for QuickTime in subsilver2. 
PHPBB3-10298
 2011-07-30 16:58:33 +02:00
Andreas Fischer
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
Andreas Fischer
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