aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'prep-release-3.1.11' into 3.1.xMarc Alexander2017-07-162-0/+12
|\
| * [prep-release-3.1.11] Update version numbers to 3.1.11Marc Alexander2017-07-161-1/+1
| |
| * Merge pull request #32 from phpbb/ticket/security-203Marc Alexander2017-07-161-0/+5
| |\ | | | | | | | | | [ticket/security-203] Fully validate version check data in version helper
| | * [ticket/security-203] Fully validate version check data in version helperMarc Alexander2016-12-261-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | This will also take care of SECURITY-204 as it's the same underlying issue. Admins still need to ensure they don't visit malicious sites for URLs provided by extensions. SECURITY-203
| * | Merge pull request #37 from phpbb/ticket/security/208Marc Alexander2017-07-161-0/+7
| |\ \ | | | | | | | | | | | | [ticket/security/208] Add form key to password reset form
| | * | [ticket/security/208] Add form key to password reset formMarc Alexander2017-06-181-0/+7
| | | | | | | | | | | | | | | | SECURITY-208
* | | | [3.1.x] Update version number to 3.1.12-devMarc Alexander2017-07-111-1/+1
|/ / /
* | | Merge branch '3.1.x' into prep-release-3.1.11Marc Alexander2017-06-251-5/+43
|\ \ \
| * \ \ Merge pull request #4804 from rxu/ticket/15186Marc Alexander2017-06-251-5/+43
| |\ \ \ | | | | | | | | | | | | | | | [ticket/15186] Fully implement the force_delete_allowed feature
| | * | | [ticket/15186] Fully implement the force_delete_allowed featurerxu2017-04-191-5/+43
| | | | | | | | | | | | | | | | | | | | PHPBB3-15186
* | | | | [prep-release-3.1.11] Update version numbers to 3.1.11-RC1Marc Alexander2017-06-251-1/+1
|/ / / /
* | | | [ticket/15250] Add core event to MCP at the end of merge_postsDaniel Sinn2017-06-201-1/+15
| |/ / |/| | | | | | | | PHPBB3-15250
* | | Merge pull request #4840 from rmcgirr83/ticket_15237Marc Alexander2017-06-052-2/+8
|\ \ \ | | | | | | | | | | | | [ticket/15237] Fix unguarded includes to functions_user
| * | | [ticket/15237] Fix unguarded includes to functions_userRMcGirr832017-05-242-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-15237 PHPBB3-15237
* | | | Merge pull request #4810 from rxu/ticket/15199Marc Alexander2017-06-051-1/+31
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/15199] Add core event to the messenger send() function
| * | | | [ticket/15199] Add core event to the messenger send() functionrxu2017-04-271-1/+31
| | | | | | | | | | | | | | | | | | | | PHPBB3-15199
* | | | | Merge pull request #4784 from rubencm/ticket/15150Marc Alexander2017-06-053-21/+63
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15150] Add Jabber SSL context configuration options
| * | | | | [ticket/15150] Remove php4 constructorRubén Calvo2017-04-171-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB-15150
| * | | | | [ticket/15150] Remove empty spaceRubén Calvo2017-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15150
| * | | | | [ticket/15150] Use php5 constructorRubén Calvo2017-04-041-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15150
| * | | | | [ticket/15150] Use stream_* functions instead of socket_* functionsRubén Calvo2017-04-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15150
| * | | | | [ticket/15150] Remove default values for argumentsRubén Calvo2017-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15150
| * | | | | [ticket/15150] Hide errors if function stream_socket_client have been disabledRubén Calvo2017-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15150
| * | | | | [ticket/15150] Hide errors if function stream_socket_client have been disabledRubén Calvo2017-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15150
| * | | | | [ticket/15150] Add Jabber SSL context configuration optionsRubén Calvo2017-03-303-15/+47
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15150
* | | | | | Merge pull request #4747 from ErnadoO/ticket/15132Marc Alexander2017-06-031-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/15132] Add variable to the 'core.mcp_main_modify_shadow_sql' event
| * | | | | | [ticket/15132] Add variable to the 'core.mcp_main_modify_shadow_sql' eventErwan Nader2017-05-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15132
| * | | | | | [ticket/15132] Add variable to the 'core.mcp_main_modify_shadow_sql' eventErwan Nader2017-03-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15132
* | | | | | | Merge pull request #4746 from ErnadoO/ticket/15131Marc Alexander2017-06-031-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15131] Add variable to the 'core.mcp_main_modify_fork_sql' event
| * | | | | | | [ticket/15131] Add variables to the 'core.mcp_main_modify_fork_sql' eventErwan Nader2017-05-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15131
| * | | | | | | [ticket/15131] Add variables to the 'core.mcp_main_modify_fork_sql' eventErwan Nader2017-03-181-1/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-15131
* | | | | | | Merge pull request #4717 from rmcgirr83/ticket/15107Marc Alexander2017-05-251-1/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | [ticket/15107] Add message_parser to event
| * | | | | | [ticket/15107] Add message_parser to eventRichard McGirr2017-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-15107 PHPBB3-15107
| * | | | | | [ticket/15107] Add message_parser to eventRMcGirr832017-03-021-1/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-15107 PHPBB3-15107
* | | | | | [ticket/15187] Use $this->template propertykasimi2017-04-291-1/+1
| | | | | |
* | | | | | [ticket/15187] Add ACP style after enabling an extensionkasimi2017-04-291-0/+9
| | | | | |
* | | | | | Merge pull request #4657 from marc1706/ticket/7336Tristan Darricau2017-04-281-0/+42
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/7336] Index first post when splitting topics * github.com:phpbb/phpbb: [ticket/7336] Index first post when splitting topics [ticket/7336] Add tests for indexing first post after splitting topics
| * | | | | [ticket/7336] Index first post when splitting topicsMarc Alexander2017-01-161-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-7336
* | | | | | Merge pull request #4674 from senky/ticket/13730Marc Alexander2017-04-261-1/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13730] Add core.delete_post_end event
| * | | | | | [ticket/13730] Add core.delete_post_after eventJakub Senko2017-02-081-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13730
* | | | | | | Merge pull request #4671 from senky/ticket/13605Marc Alexander2017-04-261-0/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13605] Add core.ucp_pm_compose_predefined_message event
| * | | | | | | [ticket/13605] Add core.ucp_pm_compose_predefined_message eventJakub Senko2017-01-231-0/+11
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13605
* | | | | | | Merge pull request #4780 from marc1706/ticket/8116Tristan Darricau2017-04-211-11/+103
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/8116] Add pagination for IP tables and post info * github.com:phpbb/phpbb: [ticket/8116] Add missing new line [ticket/8116] Correctly get other users who posted under IP [ticket/8116] Improve code and add tests for helper functions [ticket/8116] Add pagination for IP tables on post info
| * | | | | | | [ticket/8116] Correctly get other users who posted under IPMarc Alexander2017-04-181-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8116
| * | | | | | | [ticket/8116] Improve code and add tests for helper functionsMarc Alexander2017-03-291-36/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-8116
| * | | | | | | [ticket/8116] Add pagination for IP tables on post infoMarc Alexander2017-03-281-7/+121
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff from previous patch by nickvergessen. PHPBB3-8116
* | | | | | | Merge pull request #4781 from nomind60s/ticket/15151Tristan Darricau2017-04-191-3/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15151] ACP Cookie settings add explanatory text * github.com:phpbb/phpbb: [ticket/15151] Use redirected link for consistency [ticket/15151] ACP Cookie settings explanatory text [ticket/15151] ACP Cookie settings add explanatory text where it was missing
| * | | | | | [ticket/15151] ACP Cookie settings add explanatory text where it was missingnomind60s2017-03-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the lead section to include a link to the phpBB.com Knowledge Base and add explanation text for the Cookie domain, Cookie name and Cookie path fields. PHPBB3-15151
* | | | | | | Merge pull request #4581 from javiexin/ticket/14919Marc Alexander2017-04-161-62/+62
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14919] Do not directly use globals in acp_extensions
| * | | | | | | [ticket/14919] Do not directly use globals in acp_extensionsjaviexin2016-12-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Declare all used variables (u_action, tpl_name, page_title). Fix typo. PHPBB3-14919