mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-18 01:08:52 +00:00
* develop: (157 commits) [ticket/10316] Resolve inconsistent move topic behavior [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/9608] Remove use of references in topic_review [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. [feature/template-engine] Delete _get_locator function. [feature/template-engine] Clean up template locator usage in bbcode. [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/10312] Un-check the shadow option while moving. [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. ... Conflicts: phpBB/includes/functions.php |
||
---|---|---|
.. | ||
adm | ||
cache | ||
develop | ||
docs | ||
download | ||
files | ||
images | ||
includes | ||
install | ||
language | ||
store | ||
styles | ||
.htaccess | ||
common.php | ||
cron.php | ||
faq.php | ||
feed.php | ||
index.php | ||
mcp.php | ||
memberlist.php | ||
posting.php | ||
report.php | ||
search.php | ||
style.php | ||
ucp.php | ||
viewforum.php | ||
viewonline.php | ||
viewtopic.php | ||
web.config |