aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4700 from DavidIQ/ticket/15089Marc Alexander2017-03-081-1/+1
|\ | | | | | | [ticket/15089] Reverse the order of cookie secure radio buttons
| * [ticket/15089] Reverse the order of cookie secure radio buttonsDavid Colón2017-02-121-1/+1
| |
* | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-02-221-4/+6
|\ \
| * \ Merge remote-tracking branch 'origin/ticket/14927' into 3.1.xMarc Alexander2017-02-221-4/+6
| |\ \
| | * | [ticket/14927] Put vars on one lineMarc Alexander2017-02-211-5/+1
| | | | | | | | | | | | | | | | PHPBB3-14927
| | * | [ticket/14927] Corrected order in docblock of event & target versiondavid632017-02-211-2/+2
| | | | | | | | | | | | | | | | PHPBB3-14927
| | * | [ticket/14927] Add items to core.user_add_modify_datadavid632017-02-211-4/+10
| | | | | | | | | | | | | | | | PHPBB3-14927
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-02-211-6/+21
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge pull request #4604 from rxu/ticket/13344Marc Alexander2017-02-211-6/+21
| |\ \ | | |/ | |/| | | | [ticket/13344] Add core event to acp/info/acp_logs.php
| | * [ticket/13344] Add core event to acp/info/acp_logs.phprxu2017-01-011-6/+20
| | | | | | | | | | | | PHPBB3-13344
* | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-02-118-10/+10
|\ \ \ | |/ /
| * | Merge pull request #4523 from senky/ticket/13429Marc Alexander2017-02-115-5/+5
| |\ \ | | | | | | | | | | | | [ticket/13429] Replace @change with @changed in event docblocks
| | * | [ticket/13429] Replace @change with @changedJakub Senko2017-01-2310-12/+12
| | | | | | | | | | | | | | | | PHPBB3-13429
| | * | [ticket/13429] Fix @change tags without descriptionJakub Senko2016-11-201-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13429
| | * | [ticket/13429] Replace @changed with @change in event docblocksJakub Senko2016-11-205-7/+7
| | | | | | | | | | | | | | | | PHPBB3-13429
| * | | [ticket/14998] Point only to install dir from acp_updateMarc Alexander2017-01-281-1/+1
| | | | | | | | | | | | | | | | PHPBB3-14998
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-01-222-4/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14968] Use earlier version as written in comment [ticket/14968] Update docblock and ensure method returns array [ticket/14968] Display possible upgrade on acp index and update page [ticket/14968] Add method for retrieving updates on current branch
| * | | [ticket/14968] Display possible upgrade on acp index and update pageMarc Alexander2017-01-222-3/+20
| | | | | | | | | | | | | | | | PHPBB3-14968
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-01-151-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/11076] State current and minimum required versions in old PHP notice
| * | | [ticket/11076] State current and minimum required versions in old PHP noticeMarc Alexander2017-01-151-2/+2
| | | | | | | | | | | | | | | | PHPBB3-11076
* | | | Merge pull request #4632 from VSEphpbb/ticket/14989Tristan Darricau2017-01-151-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14989] Allow more admin-configurable schemes in post links * VSEphpbb/ticket/14989: [ticket/14989] Allow more admin-configurable schemes in post links
| * | | | [ticket/14989] Allow more admin-configurable schemes in post linksMatt Friedman2017-01-111-0/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-14989
* | | | | [3.2.x] Update development version to 3.2.1-devMarc Alexander2017-01-071-1/+1
| | | | |
* | | | | [prep-release-3.2.0] Update version numbers and add 3.2.0 migrationMarc Alexander2017-01-071-1/+1
| | | | |
* | | | | Merge pull request #4618 from marc1706/ticket/14961Marc Alexander2017-01-072-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14961] Add cookie notice as enablable feature
| * | | | | [ticket/14961] Add cookie notice as enablable featureMarc Alexander2017-01-062-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses Insites cookieconsent v3.0.3: https://cookieconsent.insites.com PHPBB3-14961
* | | | | | Merge pull request #4608 from marc1706/ticket/14954Marc Alexander2017-01-061-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14954] Properly check if topic has attachments in mcp_queue
| * | | | | | [ticket/14954] Properly check if topic has attachments in mcp_queueMarc Alexander2017-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14954
* | | | | | | [ticket/14945] Parse signature preview with generate_text_for_display()Marc Alexander2017-01-041-7/+2
| |/ / / / / |/| | | | | | | | | | | | | | | | | PHPBB3-14945
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-041-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #4600 from hubaishan/ticket/14549Marc Alexander2017-01-041-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14549] fix mcp page redirect back after topic merge and rised warning
| | * | | | | [ticket/14549] Correcting $redirect var to avoid the bughubaishan2016-12-291-1/+1
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | by this correct $redirect will go to clean mcp page after merge PHPBB3-14549
* | | | | | Merge pull request #4443 from Crizz0/ticket/14780Marc Alexander2017-01-041-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14780] Correction to let group setting overwrite global PM setting
| * | | | | | [ticket/14780] Only use $max_setting in this functionCrizzo2016-09-151-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14780
| * | | | | | [ticket/14780] Correct if sentence to let group setting overwrite globalCrizzo2016-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14780
* | | | | | | Merge pull request #4599 from VSEphpbb/ticket/14945Marc Alexander2017-01-042-2/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | [ticket/14945] Fix bbcode flags in user sig previews
| * | | | | | [ticket/14945] Send bbcode flags in user sig previewsMatt Friedman2016-12-282-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14945
* | | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-01-021-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
| * | | | | | [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql queryMarc Alexander2017-01-021-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | PHPBB3-14953
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-281-1/+21
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4531 from senky/ticket/14817Marc Alexander2016-12-281-1/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/14817] Add core.send_file_to_browser_before
| | * | | | | [ticket/14817] Add core.send_file_to_browser_beforeJakub Senko2016-12-181-1/+21
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | PHPBB3-14817
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-281-1/+15
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | Merge pull request #4525 from senky/ticket/14119Marc Alexander2016-12-281-1/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14119] Add core.user_unban
| | * | | | [ticket/14119] Add core.user_unbanJakub Senko2016-12-171-1/+15
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-14119
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-251-4/+26
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4544 from dsinn/ticket/14882Marc Alexander2016-12-251-4/+26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/14882] Add core event to MCP after move post sync
| | * | | | [ticket/14882] Correct type of topic_id for function_admin's move_posts eventsDaniel Sinn2016-12-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14882
| | * | | | [ticket/14882] Add core event to MCP after move post syncDaniel Sinn2016-11-291-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14882
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2016-12-181-1/+10
|\ \ \ \ \ \ | |/ / / / /