aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/15142] Merge branch 'ticket/15142' into 32xMatt Friedman2017-04-101-4/+1
|\ | | | | | | PHPBB3-15142
| * [ticket/15142] Check extension updates on current branchMatt Friedman2017-03-241-6/+3
| | | | | | | | PHPBB3-15142
* | Merge pull request #4762 from Nicofuma/ticket/15137Marc Alexander2017-03-251-2/+2
|\ \ | | | | | | | | | [ticket/15137] Global Announcements shouldn't always be never ending
| * | [ticket/15137] Global Announcements shouldn't always be never endingTristan Darricau2017-03-251-2/+2
| | | | | | | | | | | | PHPBB3-15137
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-241-4/+1
|\ \ \ | |/ / |/| | | | | | | | * 3.1.x: [ticket/15143] Fix display of version update in ACP
| * | [ticket/15143] Fix display of version update in ACPMatt Friedman2017-03-221-4/+1
| |/ | | | | | | PHPBB3-15143
* | [ticket/15135] Correctly pass exception arguments and add back link againMarc Alexander2017-03-231-2/+3
| | | | | | | | PHPBB3-15135
* | [ticket/15135] Parse language files in acp_extensions instead of md managerMarc Alexander2017-03-191-1/+2
| | | | | | | | PHPBB3-15135
* | Merge pull request #4711 from javiexin/ticket/15102Tristan Darricau2017-03-191-1/+1
|\ \ | | | | | | | | | | | | | | | | | | [ticket/15102] Missing parameter calling version_check * github.com:phpbb/phpbb: [ticket/15102] Missing parameter calling version_check
| * | [ticket/15102] Missing parameter calling version_checkjaviexin2017-02-241-1/+1
| | | | | | | | | | | | PHPBB3-15102
* | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-191-2/+2
|\ \ \ | | |/ | |/| | | | | | | * 3.1.x: [ticket/14806] Fix ACP test emails authentication failure
| * | Merge pull request #4734 from rxu/ticket/14806Tristan Darricau2017-03-191-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14806] Fix ACP test emails authentication failure * github.com:phpbb/phpbb: [ticket/14806] Fix ACP test emails authentication failure
| | * | [ticket/14806] Fix ACP test emails authentication failurerxu2017-03-111-2/+2
| | | | | | | | | | | | | | | | PHPBB3-14806
* | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-03-192-1/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13558] Change options prefix and add settings precautions. [ticket/13558] Make SSL context specific options more SMTP general [ticket/13558] Add smtp SSL context configuration options
| * | | Merge pull request #4745 from rxu/ticket/13558Tristan Darricau2017-03-192-1/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13558] Add smtp SSL context configuration options * rxu/ticket/13558: [ticket/13558] Change options prefix and add settings precautions. [ticket/13558] Make SSL context specific options more SMTP general [ticket/13558] Add smtp SSL context configuration options
| | * | | [ticket/13558] Change options prefix and add settings precautions.rxu2017-03-192-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-13558
| | * | | [ticket/13558] Make SSL context specific options more SMTP generalrxu2017-03-181-12/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-13558
| | * | | [ticket/13558] Add smtp SSL context configuration optionsrxu2017-03-172-0/+14
| | |/ / | | | | | | | | | | | | PHPBB3-13558
* | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-03-191-15/+47
|\ \ \ \ | |/ / /
| * | | Merge pull request #4578 from javiexin/ticket/14849Marc Alexander2017-03-191-15/+47
| |\ \ \ | | | | | | | | | | | | | | | [ticket/14849] Add core.acp_extensions_run_action
| | * | | [ticket/14849] Add core.acp_extensions_run_actionjaviexin2017-02-191-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename event to core.acp_extensions_run_action_before PHPBB-14849
| | * | | [ticket/14849] Add core.acp_extensions_run_actionjaviexin2016-12-301-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the event to a slightly modified position. Added an extra variable to the event. Additional event to be run after the execution of the action in ACP. Added a new action to allow for extension execution control. PHPBB-14849
| | * | | [ticket/14849] Add core.acp_extensions_run_action_afterjaviexin2016-12-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional event to be run after the execution of the action in ACP. Adding missing var as input to event. PHPBB-14849
| | * | | [ticket/14849] Add core.acp_extensions_run_action_afterjaviexin2016-12-161-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional event to be run after the execution of the action in ACP PHPBB-14849
| | * | | [ticket/14849] Add core.acp_extensions_run_actionjaviexin2016-12-111-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the event to a slightly modified position to perform common checks before calling the event, added an extra variable to allow execution control, honor the extension modified value of u_action (if any) PHPBB-14849
* | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-03-191-10/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #4703 from javiexin/ticket/15011Marc Alexander2017-03-191-10/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/15011] All errors on metadata throw exceptions
| | * \ \ \ Merge branch '3.1.x' into ticket/15011javiexin2017-02-1514-34/+248
| | |\ \ \ \
| | * | | | | [ticket/15011] All errors on metadata throw exceptionsjaviexin2017-02-151-10/+8
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is inconsistency in the way error are treated in metadata_manager. Some method return false on error, others throw exception. With this, the usage is homogeneus, and the uses of these are also adapted. Using same ticket as it is the same issue, solved in a different way. PHPBB3-15011
* | | | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-03-191-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #4743 from rubencm/ticket/14820Marc Alexander2017-03-191-0/+4
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | [ticket/14820] Add style version in ACP
| | * | | | [ticket/14820] Add style version in ACPRubén Calvo2017-03-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14820
* | | | | | 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