aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merge pull request #4657 from marc1706/ticket/7336Tristan Darricau2017-04-191-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
| | * | | | [ticket/7336] Index first post when splitting topicsMarc Alexander2017-01-161-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-7336
* | | | | | Merge branch '3.1.x' into 3.2.xTristan Darricau2017-04-191-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/15151] Use redirected link for consistency [ticket/15151] ACP Cookie settings explanatory text [ticket/15151] ACP Cookie settings add explanatory text where it was missing
| * | | | | Merge pull request #4781 from nomind60s/ticket/15151Tristan Darricau2017-04-191-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15151] ACP Cookie settings add explanatory text * github.com:phpbb/phpbb: [ticket/15151] Use redirected link for consistency [ticket/15151] ACP Cookie settings explanatory text [ticket/15151] ACP Cookie settings add explanatory text where it was missing
| | * | | | | [ticket/15151] ACP Cookie settings add explanatory text where it was missingnomind60s2017-03-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the lead section to include a link to the phpBB.com Knowledge Base and add explanation text for the Cookie domain, Cookie name and Cookie path fields. PHPBB3-15151
| * | | | | | Merge pull request #4581 from javiexin/ticket/14919Marc Alexander2017-04-161-62/+62
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/14919] Do not directly use globals in acp_extensions
| | * | | | | | [ticket/14919] Do not directly use globals in acp_extensionsjaviexin2016-12-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Declare all used variables (u_action, tpl_name, page_title). Fix typo. PHPBB3-14919
| | * | | | | | [ticket/14919] Do not directly use globals in acp_extensionsjaviexin2016-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Declare all used variables (u_action, tpl_name, page_title). PHPBB3-14919
| | * | | | | | [ticket/14919] Do not directly use globals in acp_extensionsjaviexin2016-12-171-66/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14919
| * | | | | | | Merge pull request #4761 from VSEphpbb/ticket/15142Marc Alexander2017-04-111-6/+3
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | [ticket/15142] Check extension updates on current branch
* | | | | | | | Merge pull request #4705 from nomind60s/ticket/15097Tristan Darricau2017-04-181-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15097] Add PHP version to Board statistics * github.com:phpbb/phpbb: [ticket/15097] New 'Installed software' lead section [ticket/15097] Resolve travis-ci error [ticket/15097] Resolve travis-ci error [ticket/15097] Add PHP version to Board statistics [ticket/15097] Add PHP version to Board statistics
| * | | | | | | | [ticket/15097] Resolve travis-ci errornomind60s2017-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure indentation is using tabs not spaces per code guidelines PHPBB3-15097
| * | | | | | | | [ticket/15097] Add PHP version to Board statisticsnomind60s2017-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rework commit message per DavidIQ's guidance and change variable name to avoid confusion PHPBB3-15907
| * | | | | | | | [ticket/15097] Add PHP version to Board statisticsnomind60s2017-02-171-0/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ACP main page shows the phpBB version and the database version, but didn't show the PHP version. With this change the PHP version is displayed as part of the Board statistics. PHPBB3-15097
* | | | | | | | [ticket/14990] Move dispatcher object to the front of the options arrayrxu2017-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14990
* | | | | | | | [ticket/14990] Fix event name, email parsing, installer and dispatcher callsrxu2017-04-161-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-14990
* | | | | | | | Merge pull request #4698 from javiexin/ticket/15087Marc Alexander2017-04-161-70/+105
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/15087] Optimize creation of metadata objects by caching
| * | | | | | | | [ticket/15087] Optimize creation of metadata objects by cachingjaviexin2017-02-121-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caching is done in ext_manager, and metadata_manager is further simplified by reducing the number of parameters needed. Also, move template output function from metadata_manager to acp_extensions, where it belongs. PHPBB3-15087
| * | | | | | | | [ticket/15087] Optimize creation of metadata objects by cachingjaviexin2017-02-121-73/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code for [ticket/14919] Do not directly use globals in acp_extensions for phpbb 3.2. PHPBB3-15087
* | | | | | | | | [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