aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [task/phing-build] Added a build.xml configuration for phing.Nils Adermann2010-10-173-311/+158
| | | | | | | | | The current state of the phing build script allowed the removal of some code from the old packaging process written entirely in PHP. Further simplifcations of the PHP code and additions to the phing build file will follow. PHPBB3-9849
* 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
* | | | | | Merge branch 'ticket/evil3/9800' into develop-olympusChris Smith2010-09-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/evil3/9800: [ticket/9800] Update tracker URL in docs/README.html
| * | | | | | [ticket/9800] Update tracker URL in docs/README.htmlIgor Wiedler2010-09-021-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-9800
* | | | | | Merge branch 'ticket/evil3/9039' into develop-olympusChris Smith2010-09-051-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/evil3/9039: [ticket/9039] Make mssqlnative.php non-executable
| * | | | | | [ticket/9039] Make mssqlnative.php non-executableIgor Wiedler2010-09-031-0/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-9039
* | | | | | Merge branch 'ticket/jellydoughnut/9662' into develop-olympusAndreas Fischer2010-09-021-2/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9662: [ticket/9662] Search flood interval no longer applies to non-keyword searches
| * | | | | [ticket/9662] Search flood interval no longer applies to non-keyword searchesJosh Woody2010-08-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The search interval was not consistently applied to "special" searches like "unread posts" and "view your topics." Now the special searches are always exempt from the flood interval. PHPBB3-9662
* | | | | | Merge branch 'ticket/bantu/9615' into develop-olympusChris Smith2010-08-301-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9615: [ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()
| * | | | | | [ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()Andreas Fischer2010-08-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When magic_quotes_gpc is 'On' it also affects the $_FILES array and a filename like 'bantu"s testfile.txt' will be returned as 'bantu\"s testfile.txt'. Because utf8_basename() also strips off anything before the last backslash the filename was returned as '"s testfile.txt'. Calling stripslashes() before utf8_basename() solves the problem. PHPBB3-9615
* | | | | | | Merge branch 'ticket/bantu/9793' into develop-olympusNils Adermann2010-08-301-0/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | * ticket/bantu/9793: [ticket/9793] Make sure send_status_line() is defined when in avatar mode.
| * | | | | | [ticket/9793] Make sure send_status_line() is defined when in avatar mode.Andreas Fischer2010-08-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When download/file.php is in avatar mode set_modified_headers() can be called, which then calls send_status_line() which is not available because includes/functions.php is not included in avatar mode. We also load includes/functions.php in the bootstrap now to solve this problem. Regression from c1a4cb1d01dc19650219566b60671abc767af662. PHPBB3-9793 PHPBB3-7782