aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'ticket/cs278/7972' into develop-olympusAndreas Fischer2010-08-201-0/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/7972: [ticket/7972] Copying topics in the MCP now indexes the new topic.
| * | | | | | | [ticket/7972] Copying topics in the MCP now indexes the new topic.Chris Smith2010-08-201-0/+35
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-7972
* | | | | | | Merge branch 'ticket/nickvergessen/9635' into develop-olympusAndreas Fischer2010-08-201-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9635: [ticket/9635] Useless parameter $data['post_time'] in function submit_post.
| * | | | | | | [ticket/9635] Useless parameter $data['post_time'] in function submit_post.Joas Schilling2010-08-191-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | PHPBB3-9635
* | | | | | | Merge branch 'ticket/nickvergessen/9782' into develop-olympusAndreas Fischer2010-08-201-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9782: [ticket/9782] Board disable radio set on when server load high
| * | | | | | | [ticket/9782] Board disable radio set on when server load highJoas Schilling2010-08-201-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-9782
* | | | | | | Merge branch 'ticket/bantu/9780' into develop-olympusChris Smith2010-08-204-1/+106
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9780: [ticket/9780] Adding unit tests for gen_rand_string(). [ticket/9780] Add length check back to gen_rand_string().
| * | | | | | | [ticket/9780] Adding unit tests for gen_rand_string().Andreas Fischer2010-08-203-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9780
| * | | | | | | [ticket/9780] Add length check back to gen_rand_string().Joas Schilling2010-08-201-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-9780
* | | | | | | Merge branch 'ticket/bantu/9777' into develop-olympusChris Smith2010-08-191-0/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9777: [ticket/9777] Print error message in pre-commit hook when php is not installed.
| * | | | | | | [ticket/9777] Print error message in pre-commit hook when php is not installed.Oleg Pudeyev2010-08-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9777
* | | | | | | | Merge branch 'ticket/bantu/9702' into develop-olympusJosh Woody2010-08-191-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9702: [ticket/9702] Take user's timezone settings into account when banning Until ->
| * | | | | | | | [ticket/9702] Take user's timezone settings into account when banning Until ->Andreas Fischer2010-07-231-1/+2
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-9702
* | | | | | | | Merge branch 'ticket/bantu/9599' into develop-olympusJosh Woody2010-08-194-17/+257
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9599: [ticket/9599] Reimplement phpbb_checkdnsrr() function. [ticket/9599] Adding tests for phpbb_checkdnsrr(). [ticket/9599] Adding network function tests.
| * | | | | | | | [ticket/9599] Reimplement phpbb_checkdnsrr() function.Andreas Fischer2010-08-031-17/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gethostbyname(), checkdnsrr(), dns_get_record() or nslookup via exec(). PHPBB3-9599
| * | | | | | | | [ticket/9599] Adding tests for phpbb_checkdnsrr().Andreas Fischer2010-08-032-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests for existing and non-existing records of the types: MX, A, AAAA, NS, CNAME, TXT PHPBB3-9599
| * | | | | | | | [ticket/9599] Adding network function tests.Andreas Fischer2010-08-032-0/+38
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-9599
* | | | | | | | Merge branch 'ticket/bantu/9534' into develop-olympusJosh Woody2010-08-191-9/+26
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9534: [ticket/9534] Update function documentation for user_ipwhois(). [ticket/9534] Adding support for IPv6 addresses in user_ipwhois().
| * | | | | | | [ticket/9534] Update function documentation for user_ipwhois().Andreas Fischer2010-07-111-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9534
| * | | | | | | [ticket/9534] Adding support for IPv6 addresses in user_ipwhois().Andreas Fischer2010-07-111-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whois.arin.net does currently not refer to other servers (using ReferralServer) when queried for an IPv6 address. whois.sixxs.net however works in this case. This also adds '.' to the hostname to make sure we're querying the dns root. PHPBB3-9534
* | | | | | | | Merge branch 'ticket/bantu/9694' into develop-olympusJosh Woody2010-08-191-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9694: [ticket/9694] Call error_reporting() in download/file.php when in avatar mode. [ticket/9694] Make sure string offset 0 exists to avoid E_NOTICE message.
| * | | | | | | | [ticket/9694] Call error_reporting() in download/file.php when in avatar mode.Andreas Fischer2010-07-011-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9694
| * | | | | | | | [ticket/9694] Make sure string offset 0 exists to avoid E_NOTICE message.Andreas Fischer2010-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9694
* | | | | | | | | Merge branch 'ticket/bantu/9167' into develop-olympusJosh Woody2010-08-193-35/+96
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9167: [ticket/9167] Detect and remove any dead left over shadow topics on update. [ticket/9167] Remove shadow topics from remaining forums when deleting a forum Conflicts: phpBB/install/database_update.php
| * | | | | | | | [ticket/9167] Detect and remove any dead left over shadow topics on update.Andreas Fischer2010-06-111-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9167
| * | | | | | | | [ticket/9167] Remove shadow topics from remaining forums when deleting a forumAndreas Fischer2010-06-112-35/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including posts. The function delete_topic_shadows() had to be reimplemented. It was there but it was completly broken and hasn't been used at all. PHPBB3-9167
* | | | | | | | | Merge branch 'ticket/bantu/9612' into develop-olympusJosh Woody2010-08-193-5/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9612: [ticket/9612] Introduce new function gen_rand_string_friendly().
| * | | | | | | | | [ticket/9612] Introduce new function gen_rand_string_friendly().Andreas Fischer2010-05-173-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce new function gen_rand_string_friendly() for user friendly random strings like passwords and captcha codes. Strings generated by gen_rand_string_friendly() will not contain the characters 0 and O. By adding a new function we can increase the entropy of strings generated by gen_rand_string() by putting 0 and O back in. PHPBB3-9612
* | | | | | | | | | Merge branch 'ticket/bantu/9611' into develop-olympusJosh Woody2010-08-194-14/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | * ticket/bantu/9611: [ticket/9611] Make length of activation keys variable between 6 and 10.
| * | | | | | | | [ticket/9611] Make length of activation keys variable between 6 and 10.Andreas Fischer2010-05-174-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9611
* | | | | | | | | Merge branch 'ticket/cs278/9771' into develop-olympusAndreas Fischer2010-08-101-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/9771: [ticket/9771] Remove query string parameters that have no name.
| * | | | | | | | | [ticket/9771] Remove query string parameters that have no name.Chris Smith2010-08-081-0/+5
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9771
* | | | | | | | | Merge branch 'ticket/cs278/9761' into develop-olympusAndreas Fischer2010-08-101-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/9761: [ticket/9761] Reworded quote nesting depth ACP option to match the behaviour
| * | | | | | | | | [ticket/9761] Reworded quote nesting depth ACP option to match the behaviourPatrick W2010-07-121-2/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nesting depth applies per quote block, not per post which the previous label and description indicated. PHPBB3-9761
* | | | | | | | | Merge branch 'ticket/cs278/9760' into develop-olympusAndreas Fischer2010-08-101-1/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/9760: [ticket/9760] Remove unrestricted wildcards from search terms.
| * | | | | | | | | [ticket/9760] Remove unrestricted wildcards from search terms.Chris Smith2010-08-081-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wildcards without any further result restrictions will cause phpBB to search for everything, potentially allowing a DoS attack against the DB server by any user who can use the search system. PHPBB3-9760
* | | | | | | | | | Merge branch 'ticket/nickvergessen/9743' into develop-olympusAndreas Fischer2010-08-101-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9743: [ticket/9743] Fix background of top2-class in prosilver for RTL-languages.
| * | | | | | | | | | [ticket/9743] Fix background of top2-class in prosilver for RTL-languages.Joas Schilling2010-08-021-0/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9743
* | | | | | | | | | Merge branch 'ticket/rxu/6747' into develop-olympusAndreas Fischer2010-08-101-1/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/6747: [ticket/9747] Improve word censor.
| * | | | | | | | | | [ticket/9747] Improve word censor.rxu2010-07-251-1/+8
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better handling of the asterisk inside censor pattern like 'bad*word' etc. PHPBB3-9747
* | | | | | | | | | Merge branch 'task/cs278/git-tools' into develop-olympusAndreas Fischer2010-08-104-1/+299
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * task/cs278/git-tools: [task/git-tools] Ignore git commit message comments [task/git-tools] Adjust the hook to enforce that a ticket is always mentioned [task/git-tools] Vastly expanded commit-msg hook. [task/git-tools] Beginnings of a syntax checking hook. [task/git-tools] Append ticket identifier to commit message prior to editing. [task/git-tools] add install and uninstall scripts for hooks [task/git-tools] move ticket id appending to commit-msg hook [task/git-tools] append ticket id to git log message
| * | | | | | | | [task/git-tools] Ignore git commit message commentsChris Smith2010-08-101-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git commit message comments can be contained anywhere in the message and this change ignores where they appear. PHPBB3-9768
| * | | | | | | | [task/git-tools] Adjust the hook to enforce that a ticket is always mentionedChris Smith2010-08-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9768
| * | | | | | | | [task/git-tools] Vastly expanded commit-msg hook.Chris Smith2010-08-101-5/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updated hook supports validates each line of the commit message confirms to the phpBB standards [1], there are two git config options which adjust the behaviour of the hook. They are: * phpbb.hooks.commit-msg.fatal: Set to false for the hook to allow commits with malformed structure, useful if you'll be squashing or editing the commits later. True is the default value. * phpbb.hooks.commit-msg.debug: Any integer value greater than 0 will increase the debugging verbosity of the hook, the default value is 0. [1] http://wiki.phpbb.com/display/DEV/Git PHPBB3-9768
| * | | | | | | | [task/git-tools] Beginnings of a syntax checking hook.Chris Smith2010-08-101-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently this hook checks line length is less than or equal to 80 characters. PHPBB3-9768
| * | | | | | | | [task/git-tools] Append ticket identifier to commit message prior to editing.Chris Smith2010-08-102-25/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9770
| * | | | | | | | [task/git-tools] add install and uninstall scripts for hooksIgor Wiedler2010-07-122-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9769
| * | | | | | | | [task/git-tools] move ticket id appending to commit-msg hookIgor Wiedler2010-07-122-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9770
| * | | | | | | | [task/git-tools] append ticket id to git log messageIgor Wiedler2010-07-121-0/+7
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-9770
* | | | | | | | Merge branch 'ticket/jellydoughnut/9757' into develop-olympusAndreas Fischer2010-07-313-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9757: [ticket/9757] Fix empty template variable {HISTORY_TITLE}