aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2010-09-021-2/+3
|\
| * Merge branch 'ticket/bantu/9615' into develop-olympusChris Smith2010-08-301-2/+3
| |\
| | * [ticket/9615] magic_quotes_gpc: call stripslashes() before utf8_basename()Andreas Fischer2010-08-041-2/+3
* | | Merge branch 'develop-olympus' into developAndreas Fischer2010-08-2814-29/+49
|\ \ \ | |/ /
| * | Merge branch 'ticket/cs278/7369' into develop-olympusAndreas Fischer2010-08-281-2/+3
| |\ \
| | * | [ticket/7369] CPF date should always render the users selection.Chris Smith2010-08-231-2/+3
| * | | Merge branch 'ticket/nickvergessen/7296' into develop-olympusAndreas Fischer2010-08-282-5/+6
| |\ \ \
| | * | | [ticket/7296] Exporting styles to tar creates corrupted archives.Joas Schilling2010-08-222-5/+6
| * | | | Merge branch 'ticket/nickvergessen/9519' into develop-olympusAndreas Fischer2010-08-2811-21/+39
| |\ \ \ \
| | * | | | [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-192-0/+18
| | * | | | [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-131-3/+3
| | * | | | [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-131-3/+3
| | * | | | [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-109-15/+15
| * | | | | Merge branch 'ticket/jellydoughnut/9772' into develop-olympusAndreas Fischer2010-08-281-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/9772] Unify permissions for sending email when board_email_form is offJosh Woody2010-08-281-1/+1
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-08-221-2/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'ticket/jellydoughnut/9646' into develop-olympusAndreas Fischer2010-08-221-2/+10
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | [ticket/9646] Honor CSS comments in @import statementsJosh Woody2010-08-201-2/+10
| | |/ / / /
* | | | | | Merge branch 'ticket/p/6855' into developAndreas Fischer2010-08-222-10/+10
|\ \ \ \ \ \
| * | | | | | [ticket/6855] Changed 'seperator' to 'separator'. [Igor Wiedler]Oleg Pudeyev2010-07-062-10/+10
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2010-08-2124-113/+367
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'ticket/nickvergessen/7716' into develop-olympusAndreas Fischer2010-08-211-0/+3
| |\ \ \ \ \ \
| | * | | | | | [ticket/7716] Data too long for column 'message_subject'Joas Schilling2010-08-211-0/+3
| | | |/ / / / | | |/| | | |
| * | | | | | Revert "[ticket/7716] Data too long for column 'message_subject'"Andreas Fischer2010-08-211-4/+0
| * | | | | | Merge branch 'ticket/nickvergessen/7716' into develop-olympusAndreas Fischer2010-08-211-0/+4
| |\ \ \ \ \ \
| | * | | | | | [ticket/7716] Data too long for column 'message_subject'Joas Schilling2010-08-191-0/+4
| | |/ / / / /
| * | | | | | Merge branch 'ticket/cs278/7332' into develop-olympusAndreas Fischer2010-08-211-1/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/7332] Redirect users back to post details when performing actions.Chris Smith2010-08-081-1/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'ticket/cs278/7972' into develop-olympusAndreas Fischer2010-08-201-0/+35
| |\ \ \ \ \ \
| | * | | | | | [ticket/7972] Copying topics in the MCP now indexes the new topic.Chris Smith2010-08-201-0/+35
| | |/ / / / /
| * | | | | | Merge branch 'ticket/nickvergessen/9635' into develop-olympusAndreas Fischer2010-08-201-1/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/9635] Useless parameter $data['post_time'] in function submit_post.Joas Schilling2010-08-191-1/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'ticket/nickvergessen/9782' into develop-olympusAndreas Fischer2010-08-201-1/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/9782] Board disable radio set on when server load highJoas Schilling2010-08-201-1/+1
| | |/ / / / /
| * | | | | | [ticket/9780] Add length check back to gen_rand_string().Joas Schilling2010-08-201-1/+1
| * | | | | | Merge branch 'ticket/bantu/9702' into develop-olympusJosh Woody2010-08-191-1/+2
| |\ \ \ \ \ \
| | * | | | | | [ticket/9702] Take user's timezone settings into account when banning Until ->Andreas Fischer2010-07-231-1/+2
| * | | | | | | Merge branch 'ticket/bantu/9599' into develop-olympusJosh Woody2010-08-191-17/+152
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/9599] Reimplement phpbb_checkdnsrr() function.Andreas Fischer2010-08-031-17/+152
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'ticket/bantu/9534' into develop-olympusJosh Woody2010-08-191-9/+26
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/9534] Update function documentation for user_ipwhois().Andreas Fischer2010-07-111-2/+6
| | * | | | | | | [ticket/9534] Adding support for IPv6 addresses in user_ipwhois().Andreas Fischer2010-07-111-7/+20
| * | | | | | | | Merge branch 'ticket/bantu/9167' into develop-olympusJosh Woody2010-08-192-35/+50
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | [ticket/9167] Remove shadow topics from remaining forums when deleting a forumAndreas Fischer2010-06-112-35/+50
| * | | | | | | | Merge branch 'ticket/bantu/9612' into develop-olympusJosh Woody2010-08-193-5/+22
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/9612] Introduce new function gen_rand_string_friendly().Andreas Fischer2010-05-173-5/+22
| * | | | | | | | | Merge branch 'ticket/bantu/9611' into develop-olympusJosh Woody2010-08-194-14/+4
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | [ticket/9611] Make length of activation keys variable between 6 and 10.Andreas Fischer2010-05-174-14/+4
| * | | | | | | | Merge branch 'ticket/cs278/9771' into develop-olympusAndreas Fischer2010-08-101-0/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/9771] Remove query string parameters that have no name.Chris Smith2010-08-081-0/+5
| | | |_|_|/ / / / | | |/| | | | | |