makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-23 03:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
14815 commits 18 branches 192 tags 207 MiB
Commit graph

14815 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Igor Wiedler
749ab6547d [ticket/9608] Remove use of references in topic_review 
PHPBB3-9608
 2011-08-14 20:22:28 +02: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
Nils Adermann
6fa83ba876 Merge remote-tracking branch 'github-p/feature/template-engine' into develop 
* github-p/feature/template-engine: (87 commits)
  [feature/template-engine] Delete _get_locator function.
  [feature/template-engine] Clean up template locator usage in bbcode.
  [feature/template-engine] Need to call set_template on template.
  [feature/template-engine] Update installer for template engine changes.
  [feature/template-engine] Dependency inject locator into template.
  [feature/template-engine] Delete useless code from set_template.
  [feature/template-engine] Delete no longer used $template_filename property.
  [feature/template-engine] Delete useless $template globalization.
  [feature/template-engine] Use template engine class in bbcode class.
  [feature/template-engine] Corrected an error message in template locator.
  [feature/template-engine] Remaining documentation.
  [feature/template-engine] More documentation for template class.
  [feature/template-engine] Create load_and_render to reduce code duplication.
  [feature/template-engine] Get rid of orig_tpl_* in template engine.
  [feature/template-engine] Delete $style_name param from locator's set_custom_template.
  [feature/template-engine] Add constructor to template locator.
  [feature/template-engine] Factor template locator out of template class.
  [feature/template-engine] Delete $files_template property.
  [feature/template-engine] Rename is_absolute to phpbb_is_absolute.
  [feature/template-engine] Test template DEFINE statements across files
  ...

Conflicts:
	.gitignore
	phpBB/includes/template.php
 2011-08-13 23:59:15 -04:00
Oleg Pudeyev
41de09e408 [feature/template-engine] Delete _get_locator function. 
It is no longer needed as locator is injected into template.

PHPBB3-9726
 2011-08-13 23:49:54 -04:00
Oleg Pudeyev
7cfd4052c5 [feature/template-engine] Clean up template locator usage in bbcode. 
PHPBB3-9726
 2011-08-13 23:49:54 -04: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
Erik Frèrejean
e9c4370444 [ticket/10312] Un-check the shadow option while moving. 
Don't create a shadow topic by default when moving a topic
the user should have the option to do this but it shouldn't
be done by default.

PHPBB3-10312
 2011-08-10 14:42:05 +02:00
Oleg Pudeyev
fb8a1d999f [feature/template-engine] Need to call set_template on template. 
PHPBB3-9726
 2011-08-09 23:33:47 -04:00
Oleg Pudeyev
60372b43c2 [feature/template-engine] Update installer for template engine changes. 
PHPBB3-9726
 2011-08-09 23:28:56 -04:00
Oleg Pudeyev
acb767f14d [feature/template-engine] Dependency inject locator into template. 
PHPBB3-9726
 2011-08-09 23:28:40 -04:00
Oleg Pudeyev
66232035aa [feature/template-engine] Delete useless code from set_template. 
set_custom_template performs these calls, repeating them in
set_template is not needed.

PHPBB3-9726
 2011-08-09 23:20:54 -04:00
Oleg Pudeyev
4bb56cddb3 [feature/template-engine] Delete no longer used $template_filename property. 
PHPBB3-9726
 2011-08-09 23:18:58 -04:00
Oleg Pudeyev
035a8d7154 [feature/template-engine] Delete useless $template globalization. 
PHPBB3-9726
 2011-08-09 23:18:37 -04:00
Oleg Pudeyev
4754e11d67 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10240] Added code to strip control characters from messages.
 2011-08-09 21:33:36 -04: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
Igor Wiedler
11d20e0ec4 [ticket/9608] Revert changes to normalizer 
They were breaking the tests.

PHPBB3-9608
 2011-08-08 08:58:52 +02:00
Nils Adermann
55e4dfd3bd Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10313] Create a separate build task for slow tests.
 2011-08-07 21:34:46 -04: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
Chris Smith
35b0badcf3 Merge branch 'task/naderman/whitelist-code-coverage' into develop 
* task/naderman/whitelist-code-coverage:
  [task/whitelist-code-coverage] Load all of includes/ into code coverage report
 2011-08-08 01:34:07 +01:00
Nils Adermann
c24249ae55 [task/whitelist-code-coverage] Load all of includes/ into code coverage report 
PHPBB3-10314
 2011-08-07 20:14:53 -04:00
Oleg Pudeyev
df46a576e9 [feature/template-engine] Use template engine class in bbcode class. 
PHPBB3-9726
 2011-08-07 19:26:28 -04:00
Nils Adermann
4c8c76171f Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10313] Include slow unit tests when running build script.
 2011-08-07 19:19:47 -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
Oleg Pudeyev
db257956aa [feature/template-engine] Corrected an error message in template locator. 
PHPBB3-9726
 2011-08-07 19:17:22 -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
f3befa4b29 [feature/template-engine] Remaining documentation. 
PHPBB3-9726
 2011-08-07 19:07:27 -04:00
Oleg Pudeyev
c7115a2f01 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10298] Properly close embed tag for QuickTime in subsilver2.
 2011-08-07 16:40:56 -04: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
e81c7a788a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8937] Keep space characters in front of [code] bbcode content
 2011-08-07 16:30:32 -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
02fc533066 [feature/template-engine] More documentation for template class. 
PHPBB3-9726
 2011-08-07 15:42:04 -04:00
Oleg Pudeyev
0b381516a0 [feature/template-engine] Create load_and_render to reduce code duplication. 
PHPBB3-9726
 2011-08-07 15:35:35 -04:00
Igor Wiedler
24e9fb24d1 [feature/request-class] Make server() use the $html_encode parameter 
$request->server() should not auto html-escape values. header() however should.
Also introduce some tests for this behaviour.

Thanks to nn- for catching this.

PHPBB3-9716
 2011-08-06 19:47:12 +02:00
Oleg Pudeyev
88eb822126 Merge branch 'ticket/imkingdavid/10290' into develop 
* ticket/imkingdavid/10290:
  [ticket/10290] Fixed malformed SQL query in viewonline.php
 2011-08-04 23:16:59 -04:00
David King
554ec1cbd4 [ticket/10290] Fixed malformed SQL query in viewonline.php 
As per Oleg's suggestion, the offending equals sign was removed
so that the query did not return an error.

PHPBB3-10290
 2011-08-04 23:16:23 -04:00
Oleg Pudeyev
22389d4324 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10299] Fix typo in comment about $max_store_length in truncate_string()
 2011-08-04 23:11:16 -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