aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-052-2/+8
|\
| * 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 #4833 from javiexin/ticket/15227Marc Alexander2017-06-051-78/+5
|\ \ \ | | | | | | | | | | | | [ticket/15227] Check PHP version and remove old unused code
| * | | [ticket/15227] Remove function deregister_globals, not neededjaviexin2017-05-211-58/+0
| | | | | | | | | | | | | | | | PHPBB3-15227
| * | | [ticket/15227] Remove STRIP, as always falsejaviexin2017-05-211-5/+1
| | | | | | | | | | | | | | | | PHPBB3-15227
| * | | [ticket/15227] Check PHP version and remove old unused codejaviexin2017-05-121-21/+10
| | | | | | | | | | | | | | | | PHPBB3-15227
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-051-1/+31
|\ \ \ \ | | |/ / | |/| |
| * | | 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 branch '3.1.x' into 3.2.xMarc Alexander2017-06-053-21/+63
|\ \ \ \ \ | |/ / / /
| * | | | 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 branch '3.1.x' into 3.2.xMarc Alexander2017-06-031-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 branch '3.1.x' into 3.2.xMarc Alexander2017-06-031-1/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 branch '3.1.x' into 3.2.xMarc Alexander2017-05-251-1/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-05-021-0/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [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
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-04-261-1/+29
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 branch '3.1.x' into 3.2.xMarc Alexander2017-04-261-0/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
* | \ \ \ \ \ \ Merge pull request #4802 from marc1706/ticket/8116-rheaTristan Darricau2017-04-211-9/+101
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/8116] Add pagination for IP tables and post info -- Rhea version * 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
| * \ \ \ \ \ \ \ Merge branch 'ticket/8116' into ticket/8116-rheaMarc Alexander2017-04-191-9/+101
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | [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
* | | | | | | [ticket/15011] Use exception interface for 3.2javiexin2017-04-211-3/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the mentioned ticket to 3.2 by using exception_inteface instead of the actual exception class. Also, use adm_back_link consistently. PHPBB3-15011
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-191-1/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/7336] Index first post when splitting topics [ticket/7336] Add tests for indexing first post after splitting topics