aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | Merge branch 'ticket/security-203' into ticket/security-203-rheaMarc Alexander2016-12-281-0/+5
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | [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
* | | | | | | | [3.2.x] Update version numbers for 3.2.2-devMarc Alexander2017-07-111-1/+1
|/ / / / / / /
* | | | | | | [prep-release-3.2.1] Update version numbers for 3.2.1-RC1Marc Alexander2017-06-251-1/+1
| | | | | | |
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc 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
* | | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-06-251-1/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [ticket/15250] Add core event to MCP at the end of merge_postsDaniel Sinn2017-06-201-1/+15
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | PHPBB3-15250
* | | | | | Merge pull request #4794 from lr94/ticket/15176Marc Alexander2017-06-242-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/15176] Add setting for user activity display limit.
| * | | | | | [ticket/15176] Add setting for user activity display limit.lr942017-04-162-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up to phpBB 3.2 the maximum number of posts a user must have to have his activity shown is 5000. This limit is hardcoded in functions_display.php. It would be useful if board administrators could choose to disable the limit or to set an higher value. PHPBB3-15176
* | | | | | | 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