aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* 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() functionrxu2017-04-271-1/+31
* | | 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] Remove php4 constructorRubén Calvo2017-04-171-8/+0
| | * | [ticket/15150] Remove empty spaceRubén Calvo2017-04-041-1/+1
| | * | [ticket/15150] Use php5 constructorRubén Calvo2017-04-041-2/+20
| | * | [ticket/15150] Use stream_* functions instead of socket_* functionsRubén Calvo2017-04-041-5/+5
| | * | [ticket/15150] Remove default values for argumentsRubén Calvo2017-04-041-1/+1
| | * | [ticket/15150] Hide errors if function stream_socket_client have been disabledRubén Calvo2017-04-021-1/+1
| | * | [ticket/15150] Hide errors if function stream_socket_client have been disabledRubén Calvo2017-04-021-1/+1
| | * | [ticket/15150] Add Jabber SSL context configuration optionsRubén Calvo2017-03-303-15/+47
* | | | 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' eventErwan Nader2017-05-311-0/+1
| | * | | [ticket/15132] Add variable to the 'core.mcp_main_modify_shadow_sql' eventErwan Nader2017-03-181-0/+2
* | | | | 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 variables to the 'core.mcp_main_modify_fork_sql' eventErwan Nader2017-05-311-0/+1
| | * | | | [ticket/15131] Add variables to the 'core.mcp_main_modify_fork_sql' eventErwan Nader2017-03-181-1/+3
| | |/ / /
* | | | | 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 eventRichard McGirr2017-03-071-1/+1
| | * | | | [ticket/15107] Add message_parser to eventRMcGirr832017-03-021-1/+3
| | |/ / /
* | | | | 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
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | 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_after eventJakub Senko2017-02-081-1/+29
* | | | | | 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 eventJakub Senko2017-01-231-0/+11
| | |/ / / /
| * | | | | Merge pull request #4780 from marc1706/ticket/8116Tristan Darricau2017-04-211-11/+103
| |\ \ \ \ \
* | \ \ \ \ \ Merge pull request #4802 from marc1706/ticket/8116-rheaTristan Darricau2017-04-211-9/+101
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ 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
| | * | | | | | [ticket/8116] Improve code and add tests for helper functionsMarc Alexander2017-03-291-36/+18
| | * | | | | | [ticket/8116] Add pagination for IP tables on post infoMarc Alexander2017-03-281-7/+121
| | | |_|_|_|/ | | |/| | | |
* | | | | | | [ticket/15011] Use exception interface for 3.2javiexin2017-04-211-3/+3
|/ / / / / /
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-191-1/+42
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #4657 from marc1706/ticket/7336Tristan Darricau2017-04-191-0/+42
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | [ticket/7336] Index first post when splitting topicsMarc Alexander2017-01-161-0/+42
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-191-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4781 from nomind60s/ticket/15151Tristan Darricau2017-04-191-3/+3
| |\ \ \ \ \
| | * | | | | [ticket/15151] ACP Cookie settings add explanatory text where it was missingnomind60s2017-03-291-3/+3
| * | | | | | Merge pull request #4581 from javiexin/ticket/14919Marc Alexander2017-04-161-62/+62
| |\ \ \ \ \ \
| | * | | | | | [ticket/14919] Do not directly use globals in acp_extensionsjaviexin2016-12-251-1/+1