aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9664] Resolve conflict with accesskey="t", change addlitsitem to "y".Andreas Fischer2010-10-153-3/+3
| | | | PHPBB3-9664
* 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.
| * | | | | | | [ticket/9748] Replace <br /> before converting < and > to their entities.Richard Foote2010-07-241-1/+1
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | PHPBB3-9748
* | | | | | | Merge branch 'ticket/bantu/9503' into develop-olympusIgor Wiedler2010-09-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9503: [ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.
| * | | | | | | [ticket/9503] Show 'No subject specified' in 'Posts awaiting approval'.Andreas Fischer2010-07-231-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show 'No subject specified' in 'Posts awaiting approval' if post subject is empty. PHPBB3-9503
* | | | | | | Merge branch 'ticket/bantu/9754' into develop-olympusIgor Wiedler2010-09-121-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | * ticket/bantu/9754: [ticket/9754] Populate S_USER_POSTED variable with correct value in search.php
| * | | | | | [ticket/9754] Populate S_USER_POSTED variable with correct value in search.phpAndreas Fischer2010-07-261-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-9754
* | | | | | Merge branch 'ticket/cs278/8935' into develop-olympusIgor Wiedler2010-09-101-0/+14
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | * ticket/cs278/8935: [ticket/8935] Prevent setting maximum avatar dimensions less than the minimums.
| * | | | | [ticket/8935] Prevent setting maximum avatar dimensions less than the minimums.Chris Smith2010-09-091-0/+14
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change actually applies to any configruation setting that is a pair of values one representing the maximum and one minimum. This change enforces that the maximum value cannot be less than the minimum value. PHPBB3-8935
* | | | | Merge branch 'task/cs278/git-tools' into develop-olympusIgor Wiedler2010-09-091-4/+5
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | * task/cs278/git-tools: [task/git-tools] Change the GNU --lines argument to the POSIX -l [task/git-tools] Solve dependency on the GNU wc --max-line-length option
| * | | | [task/git-tools] Change the GNU --lines argument to the POSIX -lChris Smith2010-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed to awk which handles the formatting differences between the two versions of wc -- BSD version prefixes the output with spaces, the GNU version does not. PHPBB3-9808
| * | | | [task/git-tools] Solve dependency on the GNU wc --max-line-length optionChris Smith2010-09-071-3/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-9808
* | | | | Merge branch 'ticket/evil3/8944' into develop-olympusChris Smith2010-09-052-3/+35
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/evil3/8944: [ticket/8944] Patch db_tools to support index length for MySQL4 [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_update
| * | | | | [ticket/8944] Patch db_tools to support index length for MySQL4Igor Wiedler2010-09-051-1/+17
| | | | | |
| * | | | | [ticket/8944] Add index length to CREATE INDEX for MySQL4 in database_updateIgor Wiedler2010-09-031-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes following SQL error when updating the database to 3.0.6. BLOB column 'post_username' used in key specification without a key length PHPBB3-8944