| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
PHPBB3-13455
|
|
|
|
|
|
|
|
| |
* develop-olympus:
[ticket/13414] Set Content-Length header only if status is not 304
Conflicts:
phpBB/download/file.php
|
|
|
|
| |
PHPBB3-13125
|
|
|
|
| |
PHPBB3-13045
|
|
|
|
|
|
| |
Note that there are more uses of "\G\M\T" in vendor files.
PHPBB3-13044
|
|
|
|
| |
PHPBB3-13044
|
|
|
|
| |
PHPBB3-13044
|
|
|
|
| |
PHPBB3-12938
|
|
|
|
| |
PHPBB3-12594
|
|
|
|
| |
PHPBB3-12282
|
|
|
|
| |
PHPBB3-12171
|
|
|
|
| |
PHPBB3-12171
|
|
|
|
| |
PHPBB3-11700
|
|
|
|
|
|
|
|
| |
* ticket/10820:
[ticket/10820] fix if condition to check for IE
Conflicts:
phpBB/download/file.php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
# By Dhruv (13) and riadhchtara (1)
* ticket/10820:
[ticket/10820] Add additional check for IE in condition
[ticket/10820] Fix function docblock
[ticket/10820] Inject IE version in function
[ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7
[ticket/10820] remove unnecessary parentheses
[ticket/10820] fix docblock
[ticket/10820] add param and return to function
[ticket/10820] simplify regex and escape dot
[ticket/10820] Use singular return
[ticket/10820] remove unnecessary condition checks
[ticket/10820] add function docblock
[ticket/10820] fix IE check function
[ticket/10820] proper usage of global and local variable browser
[ticket/10820] Image downloader recognize new version of ie When a user download image attachement using ie8, the file is displayed. However, when he uses ie version greater than 8, the image is download. A changes are made to phpbb/download/file.php to solve the problem. We check now if the ie version is greater or equal to 8 and not only equal to 8
Conflicts:
phpBB/download/file.php
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# By Joas Schilling (146) and others
# Via Andreas Fischer (50) and others
* develop: (356 commits)
[ticket/11599] Copy the forums into a static array for later reuse
[ticket/11602] Do not call localize_errors() if avatars are disabled
[ticket/11601] Add protected method for database sync and call it
[ticket/11601] Split post_setup_synchronisation logic from xml parsing
[ticket/11550] Specify a valid path so it's clearer that it must be a path
[ticket/11550] Move comments to correct function
[ticket/11550] We use a different fixture set for extension_acp_test.php
[ticket/11550] Fixtures should only be directories not files
[ticket/11550] Use new functionality from the test case helpers
[ticket/11550] Move functionality for copying/restoring to test case helpers
[ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php
[ticket/11543] Add more users so #hidden <> #normal
[ticket/11590] Close database connections when tearDown() is called
[ticket/develop/11543] Use plurals in develop
[ticket/11543] Use correct IP addresses and inject time for correct values
[ticket/11543] Add unit tests for obtain_users_online_string()
[ticket/11543] Add unit tests for obtain_users_online() with empty forum
[ticket/11543] Add unit tests for obtain_users_online()
[ticket/11543] Add unit tests for obtain_guest_count()
[ticket/11481] Move prepended slash from calls into function
...
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/11144] Add missing {FORUM_NAME} variable
[ticket/11144] Add missing {FORUM_NAME} variable
Conflicts:
phpBB/download/file.php
phpBB/styles/prosilver/template/login_forum.html
|
| |
| |
| |
| |
| |
| |
| |
| | |
* ticket/10820:
[ticket/10820] Fix function docblock
Conflicts:
phpBB/download/file.php
|
| |
| |
| |
| |
| |
| |
| |
| | |
* ticket/10820:
[ticket/10820] Inject IE version in function
Conflicts:
phpBB/download/file.php
|
| |
| |
| |
| |
| |
| |
| |
| | |
* ticket/10820:
[ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7
Conflicts:
phpBB/download/file.php
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
ticket/10820-develop
* dhruvgoel92/ticket/10820:
[ticket/10820] remove unnecessary parentheses
[ticket/10820] fix docblock
[ticket/10820] add param and return to function
[ticket/10820] simplify regex and escape dot
[ticket/10820] Use singular return
[ticket/10820] remove unnecessary condition checks
[ticket/10820] add function docblock
[ticket/10820] fix IE check function
[ticket/10820] proper usage of global and local variable browser
[ticket/10820] Image downloader recognize new version of ie
Conflicts:
phpBB/download/file.php
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* upstream/develop: (196 commits)
[ticket/11219] Coding guidelines and naming consistency changes
[ticket/10841] Revert more whitespace changes.
[ticket/10841] Revert whitespace changes.
[ticket/10841] adding space after if
[ticket/10841] removing unnecessary spacing
[ticket/10841] changing affectedrows check to COUNT in sql
[ticket/10841] Modifying style and language selectors in UCP
[ticket/11247] Fix wrong property reference in flock class.
[ticket/10602] Avoid a race condition.
[ticket/10602] Use last_queue_run for its intended purpose.
[ticket/10716] Collect standard error from executed php process.
[ticket/10716] Skip test if php is not in PATH.
[ticket/10716] Exclude our dependencies from linting.
[ticket/10103] New and improved wording.
[ticket/10716] Only lint on php 5.3+.
[ticket/10103] Assert with messages.
[ticket/10103] assertLessThan/assertGreaterThan.
[ticket/10103] Inline assignment is bad?
[ticket/10103] $rv had too few characters.
[ticket/10103] Correct flock class documentation.
...
Conflicts:
phpBB/includes/functions.php
tests/cache/cache_test.php
|
| |
| |
| |
| | |
PHPBB3-11227
|
|/
|
|
| |
PHPBB3-11015
|
|
|
|
| |
PHPBB3-11042
|
|
|
|
| |
PHPBB3-11042
|
|
|
|
| |
PHPBB3-11042
|
|
|
|
| |
PHPBB3-11042
|
|
|
|
| |
PHPBB3-11042
|
|
|
|
| |
PHPBB3-11042
|
|
|
|
| |
PHPBB3-11042
|
|
|
|
| |
PHPBB3-11042
|
|
|
|
| |
PHPBB3-11042
|
|
|
|
| |
PHPBB3-11042
|
|
|
|
| |
PHPBB3-11042
|
|
|
|
| |
PHPBB3-11042
|
|
|
|
| |
PHPBB3-11042
|
|
|
|
| |
PHPBB3-11042
|
|
|
|
|
|
|
|
| |
* develop-olympus:
[ticket/10633] Stop leaking filename of attachments when thumbnail is requested
Conflicts:
phpBB/download/file.php
|
|
|
|
| |
PHPBB3-9916
|
|
|
|
| |
PHPBB3-9716
|
|
|
|
| |
PHPBB3-9716
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| |
| |
| |
| |
| |
| |
| | |
This allows knowing the charset when saving web pages to disk. Also, this is
supported by all browsers.
PHPBB3-10258
|
| |
| |
| |
| |
| |
| |
| | |
The charset tag is useless, because if a charset content-type header is
present it takes precedence. And phpBB always sends such a header.
PHPBB3-10258
|
| |
| |
| |
| |
| |
| | |
These meta tags are IE specific and do not validate as HTML5.
PHPBB3-10258
|
| |
| |
| |
| | |
PHPBB3-10258
|
|/
|
|
|
|
|
|
|
|
|
|
| |
Extend the request class with helpers for reading server vars (server())
and HTTP request headers (header()). Refactor the existing code base
to make use of these helpers, make $_SERVER a deactivated super global.
Also introduce an is_ajax() method, which checks the X-Requested-With
header for the value 'XMLHttpRequest', which is sent by JavaScript
libraries, such as jQuery.
PHPBB3-9716
|
|
|
|
|
|
|
|
|
| |
* develop-olympus:
[ticket/10056] Corrected a typo in Firebird name.
[ticket/10041] Use send_status_line more in download/file.php
Conflicts:
phpBB/download/file.php
|
|
|
|
| |
PHPBB3-9790
|