aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2010-11-031-6/+20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results. [task/mssql-db-tests] Split up database tests into SELECT and write operations [task/mssql-db-tests] PHPUnit output got stuck after unterminated ob_start. [task/mssql-db-tests] sql_query_limit must return all results when total = 0 [task/mssql-db-tests] Add support for odbc & sqlsrv PDO test connections [task/mssql-db-tests] Refactored getConnection into multiple smaller parts. [task/mssql-db-tests] Allow test configuration with environment variables. [task/mssql-db-tests] No longer display an error when skipping db tests. [task/mssql-db-tests] Use a simple getter for test case helpers. Conflicts: tests/template/template.php
| * Merge branch 'task/naderman/mssql-db-tests' into develop-olympusAndreas Fischer2010-11-031-6/+20
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * task/naderman/mssql-db-tests: [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results. [task/mssql-db-tests] Split up database tests into SELECT and write operations [task/mssql-db-tests] PHPUnit output got stuck after unterminated ob_start. [task/mssql-db-tests] sql_query_limit must return all results when total = 0 [task/mssql-db-tests] Add support for odbc & sqlsrv PDO test connections [task/mssql-db-tests] Refactored getConnection into multiple smaller parts. [task/mssql-db-tests] Allow test configuration with environment variables. [task/mssql-db-tests] No longer display an error when skipping db tests. [task/mssql-db-tests] Use a simple getter for test case helpers.
| | * [task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results.Nils Adermann2010-10-251-1/+6
| | | | | | | | | | | | PHPBB3-9868
| | * [task/mssql-db-tests] sql_query_limit must return all results when total = 0Nils Adermann2010-10-251-5/+14
| | | | | | | | | | | | PHPBB3-9868
* | | Merge branch 'ticket/rxu/9867' into developAndreas Fischer2010-10-304-12/+12
|\ \ \ | | | | | | | | | | | | | | | | * ticket/rxu/9867: [ticket/9867] Adjust the implementation of error messages localization.
| * | | [ticket/9867] Adjust the implementation of error messages localization.rxu2010-10-264-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | Use array_map instead of preg_replace. PHPBB3-9867
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-10-301-19/+68
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | * develop-olympus: [ticket/9061] Simplify conditional statements by reworking the logic. [ticket/9061] Fixed a race condition in queue locking.
| * | | Merge branch 'ticket/cs278/9061' into develop-olympusAndreas Fischer2010-10-271-19/+68
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/9061: [ticket/9061] Simplify conditional statements by reworking the logic. [ticket/9061] Fixed a race condition in queue locking.
| | * | | [ticket/9061] Simplify conditional statements by reworking the logic.Chris Smith2010-10-271-12/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-9061
| | * | | [ticket/9061] Fixed a race condition in queue locking.Oleg Pudeyev2010-10-271-19/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed queue locking to cover all queue file operations, in particular the check for queue file existince and inclusion of queue file must be done under one lock. Also refactored queue locking and unlocking into separate methods. PHPBB3-9061
* | | | | Merge branch 'ticket/bantu/9627' into developIgor Wiedler2010-10-252-2/+170
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9627: [ticket/9627] Prefix function names with 'phpbb_'. [ticket/9627] Adding unit tests for http_byte_range(). [ticket/9627] Adding download unit tests. [ticket/9627] Split http_range_request() into several functions. [ticket/9627] Make sure range request reads till the end of the file. [ticket/9627] Make use of 'static' since the function is called more than once [ticket/9627] Make sure the database record for the filesize is correct. [ticket/9627] Do not increase download counter if file is requested partially. [ticket/9627] Support for HTTP range requests in download/file.php
| * | | | | [ticket/9627] Prefix function names with 'phpbb_'.Andreas Fischer2010-10-232-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9627
| * | | | | [ticket/9627] Split http_range_request() into several functions.Andreas Fischer2010-10-231-31/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split http_range_request() into several functions for better reusability and to allow some unit testing. PHPBB3-9627
| * | | | | [ticket/9627] Make sure range request reads till the end of the file.Andreas Fischer2010-10-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9627
| * | | | | [ticket/9627] Make use of 'static' since the function is called more than onceAndreas Fischer2010-10-231-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9627
| * | | | | [ticket/9627] Make sure the database record for the filesize is correct.Andreas Fischer2010-10-231-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9627
| * | | | | [ticket/9627] Do not increase download counter if file is requested partially.Andreas Fischer2010-10-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9627
| * | | | | [ticket/9627] Support for HTTP range requests in download/file.phpAndreas Fischer2010-10-231-0/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial draft of "resume support" for attachments. This should allow users to resume partially downloaded attachments. PHPBB3-9627
* | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2010-10-259-29/+74
|\ \ \ \ \ \ | | |/ / / / | |/| | / / | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9478] Validate maximum number of allowed recipients per PM value. [ticket/9686] Fix mssqlnative database data export [ticket/9595] List min/max characters indexed by search for mysql_fulltext. [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN. [ticket/9853] Change recaptcha theme from default to 'clean'.
| | | | |
| | \ \ \
| | \ \ \
| | \ \ \
| *---. \ \ \ Merge branches 'ticket/bantu/9101', 'ticket/bantu/9595' and ↵Igor Wiedler2010-10-255-1/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ticket/bantu/9853' into develop-olympus * ticket/bantu/9101: [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN. * ticket/bantu/9595: [ticket/9595] List min/max characters indexed by search for mysql_fulltext. * ticket/bantu/9853: [ticket/9853] Change recaptcha theme from default to 'clean'.
| | | | * | | | [ticket/9853] Change recaptcha theme from default to 'clean'.Andreas Fischer2010-10-182-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change recaptcha theme to 'clean' to better coordinate with the color schemes of prosilver and subsilver2. The default red theme doesn't really fit prosilver and subsilver2. PHPBB3-9853
| | | * | | | | [ticket/9595] List min/max characters indexed by search for mysql_fulltext.Andreas Fischer2010-10-212-0/+10
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | PHPBB3-9595
| | * | | | | [ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN.Andreas Fischer2010-10-181-1/+1
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove misleading 'below' from RECAPTCHA_EXPLAIN because recaptcha is actually displayed to the side. PHPBB3-9101
| * | | | | Merge branch 'ticket/naderman/9686' into develop-olympusAndreas Fischer2010-10-252-28/+46
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/naderman/9686: [ticket/9686] Fix mssqlnative database data export
| | * | | | | [ticket/9686] Fix mssqlnative database data exportNils Adermann2010-10-252-28/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We require version 1.1 of the sqlsrv extension anyway so the regular sqlsrv_num_rows can be used instead of buffering the result. The result buffer (class result_mssqlnative) should never automatically free the resource it receives - we consistently close resources using sql_freeresult(). PHPBB3-9686
| * | | | | | Merge branch 'ticket/rxu/9478' into develop-olympusAndreas Fischer2010-10-252-0/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/9478: [ticket/9478] Validate maximum number of allowed recipients per PM value.
| | * | | | | | [ticket/9478] Validate maximum number of allowed recipients per PM value.rxu2010-10-252-0/+15
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allow to enter the value larger than it's allowed by MySQL mediumnt(8). PHPBB3-9478
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2010-10-232-1/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | | | | | | * develop-olympus: [ticket/9807] Update existing module permissions in database [ticket/9807] Hide avatar tab in UCP when avatars are disabled
| * | | | | Merge branch 'ticket/igorw/9807' into develop-olympusNils Adermann2010-10-232-1/+9
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9807: [ticket/9807] Update existing module permissions in database [ticket/9807] Hide avatar tab in UCP when avatars are disabled
| | * | | | [ticket/9807] Update existing module permissions in databaseIgor Wiedler2010-10-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9807
| | * | | | [ticket/9807] Hide avatar tab in UCP when avatars are disabledIgor Wiedler2010-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9807
* | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2010-10-193-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9857] Remove visible $Id$ from phpBB/docs files.
| * | | | | Merge branch 'ticket/bantu/9857' into develop-olympusIgor Wiedler2010-10-193-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9857: [ticket/9857] Remove visible $Id$ from phpBB/docs files.
| | * | | | | [ticket/9857] Remove visible $Id$ from phpBB/docs files.Andreas Fischer2010-10-193-3/+3
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-9857
* | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2010-10-195-7/+52
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9509] Remove section 8 from index [ticket/9509] Close anchor tag in coding guidelines [ticket/9854] Revise docs/auth_api.html to add more methods [ticket/9509] The VCS is now git [ticket/9840] Display view unread posts link for guests. Conflicts: phpBB/docs/coding-guidelines.html
| * | | | | Merge branch 'ticket/igorw/9509' into develop-olympusIgor Wiedler2010-10-191-109/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9509: [ticket/9509] Remove section 8 from index [ticket/9509] Close anchor tag in coding guidelines [ticket/9509] The VCS is now git
| | * | | | | [ticket/9509] Remove section 8 from indexIgor Wiedler2010-10-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks Andreas. PHPBB3-9509
| | * | | | | [ticket/9509] Close anchor tag in coding guidelinesIgor Wiedler2010-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks Andreas. PHPBB3-9509
| | * | | | | [ticket/9509] The VCS is now gitNils Adermann2010-10-181-108/+15
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially cherry-picked from 163a0974. PHPBB3-9509
| * | | | | [ticket/9854] Revise docs/auth_api.html to add more methodsJosh Woody2010-10-191-1/+47
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Notably, the auth_admin class is still missing documentation. PHPBB3-9854
| * | | | Merge branch 'ticket/rxu/9840' into develop-olympusAndreas Fischer2010-10-183-4/+4
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * ticket/rxu/9840: [ticket/9840] Display view unread posts link for guests.
| | * | | [ticket/9840] Display view unread posts link for guests.rxu2010-10-163-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display view unread posts link for guests if applicable. PHPBB3-9840
* | | | | Merge branch 'develop-olympus' into developIgor Wiedler2010-10-1719-24/+85
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/7332] Fix post details expand link rendering on Webkit. [ticket/9162] Prevent notice on unset poll title [ticket/7417] Also focus search keywords and username in subsilver2. [ticket/7417] Focus username field when prosilver login page is loaded. [ticket/7417] Focus search keywords field when prosilver search page is loaded. [ticket/9841] Change "Save" to "Save draft", "Load" to "Load draft". [ticket/9664] Resolve conflict with accesskey="t", change addlitsitem to "y". [ticket/7538] Limit user_login_attempts to prevent SQL errors. [ticket/9848] Add avatars, attachments and store files to .gitignore. [ticket/9822] Correct some style related ACP explain statements. [ticket/9698] Add .htaccess to the includes subdirectory. [ticket/9830] Redirect to install directly when config.php does not exist. [ticket/9816] Remove config.php from repository [ticket/9810] Hide "Select All" of code bbcode on print page
| * | | | Merge branch 'ticket/bantu/9841' into develop-olympusIgor Wiedler2010-10-172-6/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9841: [ticket/9841] Change "Save" to "Save draft", "Load" to "Load draft".
| | * | | | [ticket/9841] Change "Save" to "Save draft", "Load" to "Load draft".Andreas Fischer2010-10-152-6/+6
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has confused people that are less familiar with phpBB or web applications in general. "Save draft" should make it clear that a draft is being saved, but it is still short enough to be used in a button. PHPBB3-9841
| * | | | Merge branch 'ticket/bantu/9822' into develop-olympusIgor Wiedler2010-10-171-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9822: [ticket/9822] Correct some style related ACP explain statements.
| | * | | | [ticket/9822] Correct some style related ACP explain statements.Andreas Fischer2010-10-151-4/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "Additionally, if you have permission you can elect to remove the set from the filesystem." because that functionality is not implemented. Also remove unnecessary "When the imageset is deleted it is gone for good." statement, "It is recommended that you first export your set for possible future use." should be clear enough. PHPBB3-9822
| * | | | Merge branch 'ticket/bantu/9698' into develop-olympusIgor Wiedler2010-10-171-0/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9698: [ticket/9698] Add .htaccess to the includes subdirectory.
| | * | | | [ticket/9698] Add .htaccess to the includes subdirectory.Andreas Fischer2010-10-151-0/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add .htaccess to the includes folder to prevent full path disclosure when running PHP 5.3. When the error_reporting setting in php.ini contains the E_DEPRECATED error level, the PHP parser throws an error message containing the local filesystem path when accessing one of the captcha plugins directly. This is because the captcha plugins return explicit references for PHP 4 compatibility. PHPBB3-9698
| * | | | Merge branch 'ticket/bantu/9664' into develop-olympusIgor Wiedler2010-10-173-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9664: [ticket/9664] Resolve conflict with accesskey="t", change addlitsitem to "y".