aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [task/mssql-db-tests] sql_query_limit must return all results when total = 0Nils Adermann2010-10-251-5/+14
| | | | PHPBB3-9868
* [task/mssql-db-tests] Add support for odbc & sqlsrv PDO test connectionsNils Adermann2010-10-251-6/+94
| | | | PHPBB3-9868
* [task/mssql-db-tests] Refactored getConnection into multiple smaller parts.Nils Adermann2010-10-251-51/+84
| | | | | | | This is a first step to simplify the extraction of database specific code parts into separate classes. PHPBB3-9868
* [task/mssql-db-tests] Allow test configuration with environment variables.Nils Adermann2010-10-252-2/+19
| | | | | | | | | To allow execution of the tests with different configurations without having to use the test_config.php file, environment variables of the form PHPBB_TEST_<name> can now be used, e.g. PHPBB_TEST_DBMS to set the variables otherwise expected in test_config.php PHPBB3-9868
* [task/mssql-db-tests] No longer display an error when skipping db tests.Nils Adermann2010-10-253-76/+70
| | | | | | | | | | | | | Tests are run with sqlite by default now anyway, so in the majority of cases the error message explaining how to set up database test running will not be displayed anyway. Database tests are now generally simply skipped if no configuration can be found. The RUNNING_TESTS.txt file explains how to set them up however, and more info is available on the wiki. The get_database_config method was moved from test_case_helpers to database_test_case because it has no general purpose. PHPBB3-9868
* [task/mssql-db-tests] Use a simple getter for test case helpers.Nils Adermann2010-10-252-10/+10
| | | | | | | | Calling initialisation to then use the member directly seems more complicated than just having a method that returns the instance or creates it if necessary. PHPBB3-9868
* 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 '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
* | Merge branch 'ticket/jellydoughnut/9854' into develop-olympusAndreas Fischer2010-10-191-1/+47
|\ \ | |/ |/| | | | | * ticket/jellydoughnut/9854: [ticket/9854] Revise docs/auth_api.html to add more methods
| * [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 'ticket/naderman/9855' into develop-olympusIgor Wiedler2010-10-172-3/+14
|\ \ | | | | | | | | | | | | | | | * ticket/naderman/9855: [ticket/9855] Do not include the PHPUnit Framework manually on 3.5+. [ticket/9855] Make tests run under PHPUnit 3.5.
| * | [ticket/9855] Do not include the PHPUnit Framework manually on 3.5+.Nils Adermann2010-10-171-2/+6
| | | | | | | | | | | | PHPBB3-9855
| * | [ticket/9855] Make tests run under PHPUnit 3.5.Nils Adermann2010-10-171-1/+8
| | | | | | | | | | | | PHPBB3-9855
* | | Merge branch 'ticket/bantu/9848' into develop-olympusIgor Wiedler2010-10-171-0/+3
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9848: [ticket/9848] Add avatars, attachments and store files to .gitignore.
| * | | [ticket/9848] Add avatars, attachments and store files to .gitignore.Andreas Fischer2010-10-151-0/+3
| | |/ | |/| | | | | | | PHPBB3-9848
* | | 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".
| * | | [ticket/9664] Resolve conflict with accesskey="t", change addlitsitem to "y".Andreas Fischer2010-10-153-3/+3
| |/ / | | | | | | | | | PHPBB3-9664
* | | Merge branch 'ticket/bantu/7538' into develop-olympusIgor Wiedler2010-10-172-2/+8
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/7538: [ticket/7538] Limit user_login_attempts to prevent SQL errors.
| * | | [ticket/7538] Limit user_login_attempts to prevent SQL errors.Andreas Fischer2010-10-152-2/+8
| |/ / | | | | | | | | | PHPBB3-7538
* | | Merge branch 'ticket/bantu/7417' into develop-olympusIgor Wiedler2010-10-174-3/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/7417: [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/7417] Also focus search keywords and username in subsilver2.Oleg Pudeyev2010-10-162-2/+36
| | | | | | | | | | | | | | | | PHPBB3-7417
| * | | [ticket/7417] Focus username field when prosilver login page is loaded.Oleg Pudeyev2010-10-161-0/+6
| | | | | | | | | | | | | | | | PHPBB3-7417
| * | | [ticket/7417] Focus search keywords field when prosilver search page is loaded.Oleg Pudeyev2010-10-161-1/+7
| |/ / | | | | | | | | | PHPBB3-7417
* | | Merge branch 'ticket/cs278/7332' into develop-olympusAndreas Fischer2010-10-172-1/+6
|\ \ \ | | | | | | | | | | | | | | | | * ticket/cs278/7332: [ticket/7332] Fix post details expand link rendering on Webkit.
| * | | [ticket/7332] Fix post details expand link rendering on Webkit.Chris Smith2010-10-172-1/+6
| | | | | | | | | | | | | | | | PHPBB3-7332
* | | | Merge branch 'ticket/igorw/9162' into develop-olympusAndreas Fischer2010-10-171-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | * ticket/igorw/9162: [ticket/9162] Prevent notice on unset poll title
| * | | [ticket/9162] Prevent notice on unset poll titleIgor Wiedler2010-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Regression from a81c857c96ee1a2a9be559ff3c9b71ca9514287e PHPBB3-9162
* | | | Merge branch 'ticket/igorw/9816' into develop-olympusAndreas Fischer2010-10-152-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/igorw/9816: [ticket/9816] Remove config.php from repository Conflicts: .gitignore
| * | | | [ticket/9816] Remove config.php from repositoryIgor Wiedler2010-09-122-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-9816
* | | | | Merge branch 'ticket/igorw/9830' into develop-olympusAndreas Fischer2010-10-151-4/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * ticket/igorw/9830: [ticket/9830] Redirect to install directly when config.php does not exist.
| * | | | [ticket/9830] Redirect to install directly when config.php does not exist.Igor Wiedler2010-09-161-4/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9830
* | | | | Merge branch 'ticket/marc1706/9810' into develop-olympusIgor Wiedler2010-10-041-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/marc1706/9810: [ticket/9810] Hide "Select All" of code bbcode on print page
| * | | | | [ticket/9810] Hide "Select All" of code bbcode on print pageMarc Alexander2010-09-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9810
* | | | | | Merge branch 'ticket/bantu/9829' into develop-olympusIgor Wiedler2010-10-041-4/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9829: [ticket/9829] Fix error in recaptcha validation.
| * | | | | | [ticket/9829] Fix error in recaptcha validation.Cristian Rodriguez2010-09-191-4/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recaptcha plugin falsely accepted error responses by recaptcha as valid solutions. PHPBB3-9829
* | | | | | Merge branch 'ticket/igorw/9804' into develop-olympusAndreas Fischer2010-09-241-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | * ticket/igorw/9804: [ticket/9804] Account evil3 renamed to igorw, adjust AUTHORS
| * | | | | [ticket/9804] Account evil3 renamed to igorw, adjust AUTHORSIgor Wiedler2010-09-211-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-9804
* | | | | Merge branch 'ticket/bantu/9091' into develop-olympusIgor Wiedler2010-09-163-0/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9091: [ticket/9091] Extract IPv4 address from addresses mapped into IPv6.