aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | | [ticket/9091] Extract IPv4 address from addresses mapped into IPv6.Andreas Fischer2010-07-233-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9091
* | | | | | Merge branch 'ticket/bantu/9825' into develop-olympusIgor Wiedler2010-09-162-12/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9825: [ticket/9825] Add unit test config and db to gitignore [ticket/9825] Unit tests: Use sqlite when possible and no test_config exists.
| * | | | | | [ticket/9825] Add unit test config and db to gitignoreIgor Wiedler2010-09-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9825
| * | | | | | [ticket/9825] Unit tests: Use sqlite when possible and no test_config exists.Andreas Fischer2010-09-161-11/+26
| | |_|/ / / | |/| | | | | | | | | | | | | | | | PHPBB3-9825
* | | | | | Merge branch 'ticket/bantu/9644' into develop-olympusIgor Wiedler2010-09-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9644: [ticket/9644] Check $mode before calling user_notification() from submit_post()
| * | | | | | [ticket/9644] Check $mode before calling user_notification() from submit_post()Andreas Fischer2010-07-231-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-9644
* | | | | | Merge branch 'ticket/bantu/9613' into develop-olympusIgor Wiedler2010-09-169-5/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9613: [ticket/9613] Slightly update language strings. [ticket/9613] Fix missing database part for unread posts search load switch. [ticket/9613] Implement a load switch for unread posts search feature.
| * | | | | | [ticket/9613] Slightly update language strings.Andreas Fischer2010-08-293-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9613
| * | | | | | [ticket/9613] Fix missing database part for unread posts search load switch.rxu2010-08-292-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A record for load_unreads_search parameter had to be added to CONFIG_TABLE. PHPBB3-9613
| * | | | | | [ticket/9613] Implement a load switch for unread posts search feature.rxu2010-08-297-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since unread posts search can produce a high server load in certain circumstances, we implement a switch for ACP "Load settings" to have an option to disable this type of search. PHPBB3-9613
* | | | | | | Merge branch 'ticket/bantu/9785' into develop-olympusIgor Wiedler2010-09-161-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9785: [ticket/9785] Allow users to request new passwords when board is disabled.
| * | | | | | | [ticket/9785] Allow users to request new passwords when board is disabled.Andreas Fischer2010-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9785
* | | | | | | | Merge branch 'ticket/bantu/9609' into develop-olympusIgor Wiedler2010-09-163-13/+14
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9609: [ticket/9609] Change header() calls setting HTTP status to send_status_line().
| * | | | | | | [ticket/9609] Change header() calls setting HTTP status to send_status_line().Andreas Fischer2010-09-113-13/+14
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-9609
* | | | | | | Merge branch 'ticket/evil3/9592' into develop-olympusAndreas Fischer2010-09-152-15/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/evil3/9592: [ticket/9592] Slight adjustments to simplify db test cases [ticket/9592] Remove test cases for empty IN() [ticket/9592] Test suite does not run on SQlite
| * | | | | | | [ticket/9592] Slight adjustments to simplify db test casesIgor Wiedler2010-09-151-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9592
| * | | | | | | [ticket/9592] Remove test cases for empty IN()Igor Wiedler2010-09-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They failed under SQLite because SQLite accepts empty IN() syntax. PHPBB3-9592
| * | | | | | | [ticket/9592] Test suite does not run on SQliteIgor Wiedler2010-09-111-11/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9592
* | | | | | | | Merge branch 'ticket/nickvergessen/9162' into develop-olympusAndreas Fischer2010-09-141-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9162: [ticket/9162] BBCode in poll options is broken, when posting without question.
| * | | | | | | | [ticket/9162] BBCode in poll options is broken, when posting without question.Joas Schilling2010-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9162
* | | | | | | | | Merge branch 'ticket/nickvergessen/9820' into develop-olympusAndreas Fischer2010-09-141-9/+12
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9820: [ticket/9820] phpBB Debug Error when trying to post a new topic.
| * | | | | | | | [ticket/9820] phpBB Debug Error when trying to post a new topic.Joas Schilling2010-09-141-9/+12
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from aa4519fb44f4ff83e923c6cc4d5bde3f20082340 PHPBB3-9820 PHPBB3-7260
* | | | | | | | Merge branch 'ticket/bantu/9804' into develop-olympusIgor Wiedler2010-09-121-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9804: [ticket/9804] Update docs/AUTHORS. Move DavidMJ, add evil<3.
| * | | | | | | | [ticket/9804] Update docs/AUTHORS. Move DavidMJ, add evil<3.Andreas Fischer2010-09-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9804
* | | | | | | | | Merge branch 'ticket/bantu/9748' into develop-olympusIgor Wiedler2010-09-121-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9748: [ticket/9748] Replace <br /> before converting < and > to their entities.